[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-22'
Tag 'suse-4.0-22' created by Andras Timar at 2014-01-13 07:55 -0800 suse-4.0-22 Changes since libreoffice-4.0.2.2-10: --- 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/suse-4.0-22'
Tag 'suse-4.0-22' created by Andras Timar at 2014-01-13 07:55 -0800 suse-4.0-22 Changes since suse-4.0-21-1: --- 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/suse-4.0-22'
Tag 'suse-4.0-22' created by Andras Timar at 2014-01-13 07:55 -0800 suse-4.0-22 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 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/suse-4.0-22'
Tag 'suse-4.0-22' created by Andras Timar at 2014-01-13 07:55 -0800 suse-4.0-22 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.0-22'
Tag 'cp-4.0-22' created by Andras Timar at 2014-01-13 07:53 -0800 cp-4.0-22 Changes since libreoffice-4.0.2.2-4: --- 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-4.0-22'
Tag 'cp-4.0-22' created by Andras Timar at 2014-01-13 07:53 -0800 cp-4.0-22 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.0-22'
Tag 'cp-4.0-22' created by Andras Timar at 2014-01-13 07:53 -0800 cp-4.0-22 Changes since cp-4.0-20-1-33: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.0-22'
Tag 'cp-4.0-22' created by Andras Timar at 2014-01-13 07:53 -0800 cp-4.0-22 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-01-13
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + fdo#73247: Code fixed for Shape rotation not preserved in RT in https://gerrit.libreoffice.org/7367 from Yogesh Bharate about module oox, sw, writerfilter + Translated German comments in vcl/source/filter/igif in https://gerrit.libreoffice.org/7397 from Luc Castermans about module vcl End of freshness * Merged changes on master for project core changed in the last 25 hours: None * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#72804 Add firebird.msg to install. in https://gerrit.libreoffice.org/7254 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + remove BluetoothOperator wrapper in https://gerrit.libreoffice.org/7092 from Christian Lohmaier + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard + CID#736173: Out-of-bound read in https://gerrit.libreoffice.org/6973 from Julien Nabet + move from ActionBarSherlock to corresponding android support lib in https://gerrit.libreoffice.org/7082 from Christian Lohmaier + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + fix Bluetooth lifecycle problems and respect UI guidelines in https://gerrit.libreoffice.org/7083 from Christian Lohmaier + Double toolbar icon size for HiDPI screens. in https://gerrit.libreoffice.org/6994 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: data streams in 4.2
sorry, that was accidental partial send: Hi, https://wiki.documentfoundation.org/ReleaseNotes/4.2 1. I tried to use Data Streams in the latest release. a) I enabled Data stream b) entered URL : http://finance.yahoo.com/q?s=JPM&ql=0 c) value1,value2...: A2:A12 d) limit to : 10 the OK button is not enabled 2. Once I get this working, I am hoping to get some pointers so I can plug in an extension to feed data to it. thanks Neeraj On Sun, Jan 12, 2014 at 9:51 PM, Neeraj Rai wrote: > Hi, > > https://wiki.documentfoundation.org/ReleaseNotes/4.2 > 1. I tried to use Data Streams in the latest release. > a) I enabled Data stream > b) entered URL : http://finance.yahoo.com/q?s=JPM&ql=0 > c) value1,value2...: A2:A12 > > > > -- > = > Intuition - is the inability to figure out the facts on which we based the > decision. > -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
data streams in 4.2
Hi, https://wiki.documentfoundation.org/ReleaseNotes/4.2 1. I tried to use Data Streams in the latest release. a) I enabled Data stream b) entered URL : http://finance.yahoo.com/q?s=JPM&ql=0 c) value1,value2...: A2:A12 -- = Intuition - is the inability to figure out the facts on which we based the decision. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |4 chart2/source/view/main/OpenGLRender.hxx |4 2 files changed, 8 deletions(-) New commits: commit b7f42c2acd834f2326f80a8de9da03fcd9192c4b Author: Markus Mohrhard Date: Mon Jan 13 01:15:52 2014 +0100 another two unused variables Change-Id: Ib6fdcd8a541f98e3e7a3e1cb7407bb497a104914 diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 33d1754..9559498 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -909,10 +909,6 @@ void OpenGLRender::Release() glDeleteRenderbuffers(1, &m_RboID); #if defined( WNT ) wglMakeCurrent(NULL, NULL); -if (!m_iExternRC) -wglDeleteContext(glWin.hRC); -if (!m_iExternDC) -ReleaseDC(glWin.hWnd, glWin.hDC); #elif defined( UNX ) glXMakeCurrent(glWin.dpy, None, NULL); diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 4e7de03..5a28644 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -248,10 +248,6 @@ private: GLWindow glWin; -int m_iExternDC; - -int m_iExternRC; - Line2DPointList m_Line2DPointList; float m_fLineWidth; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 21 -
chart2/source/view/main/OpenGLRender.hxx |8
2 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit 473f9ccf6871ac95ef541845f445c5321893bd47
Author: Markus Mohrhard
Date: Mon Jan 13 00:59:59 2014 +0100
remove unused variables
Change-Id: I52be4e3a6539392bbe030e1a77fcbb61960eeab8
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 70e8ac3..33d1754 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -974,16 +974,6 @@ void OpenGLRender::SetHeight(int height)
m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight),
-4.f, 3.f);
}
-int OpenGLRender::GetWidth()
-{
-return m_iWidth;
-}
-
-int OpenGLRender::GetHeight()
-{
-return m_iHeight;
-}
-
int OpenGLRender::CreateBMPHeader(sal_uInt8 *bmpHeader, int xsize, int ysize)
{
unsigned char header[BMP_HEADER_LEN] = {
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 48eae6c..4e7de03 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -144,8 +144,6 @@ public:
int MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale);
void SetWidth(int width);
void SetHeight(int height);
-int GetWidth();
-int GetHeight();
void Release();
int CreateBMPHeader(sal_uInt8 *bmpHeader, int xsize, int ysize);
int CreateBMPHeaderRGBA(sal_uInt8 *bmpHeader, int xsize, int ysize);
commit 473bd0ecc5f8f7cbc96cc365165240bfa4054d69
Author: Markus Mohrhard
Date: Mon Jan 13 00:58:17 2014 +0100
make a few variables local, no need for member variables
Change-Id: I2559756acf655f73c782db023b7502f969346171
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index ceaa07e..70e8ac3 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -865,10 +865,10 @@ int OpenGLRender::CreateRenderObj(int width, int height)
int OpenGLRender::MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale)
{
-m_TranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y, trans.z));
-m_ScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z));
-m_RotationMatrix = glm::eulerAngleYXZ(angle.y, angle.x, angle.z);
-m_Model = m_TranslationMatrix * m_RotationMatrix * m_ScaleMatrix;
+glm::mat4 aTranslationMatrix = glm::translate(glm::vec3(trans.x, trans.y,
trans.z));
+glm::mat4 aScaleMatrix = glm::scale(glm::vec3(scale.x, scale.y, scale.z));
+glm::mat4 aRotationMatrix = glm::eulerAngleYXZ(angle.y, angle.x, angle.z);
+m_Model = aTranslationMatrix * aRotationMatrix * aScaleMatrix;
return 0;
}
@@ -928,9 +928,6 @@ void OpenGLRender::Release()
OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
m_Model(glm::mat4(1.0f)),
-m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))),
-m_RotationMatrix(glm::eulerAngleYXZ(0.0f, 0.0f, 0.0f)),
-m_ScaleMatrix(glm::scale(m_Model, glm::vec3(1.0f, 1.0f, 1.0f))),
m_Line2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
m_TextureObj(0),
m_FboID(0),
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 875f6fa..48eae6c 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -208,12 +208,6 @@ private:
// Our ModelViewProjection : multiplication of our 3 matrices
glm::mat4 m_MVP;
-glm::mat4 m_TranslationMatrix;
-
-glm::mat4 m_RotationMatrix;
-
-glm::mat4 m_ScaleMatrix;
-
GLint m_RenderProID;
glm::vec4 m_Line2DColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c82c568f0f622b68f0dd916a37e3b9c3b630210
Author: Markus Mohrhard
Date: Mon Jan 13 00:54:57 2014 +0100
disable my debug code
Change-Id: Iea6824c08ee88334bc0acb4b2bee9323c8995520
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 7accdae..875f6fa 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -53,7 +53,7 @@ namespace unx
#include "glm/gtx/quaternion.hpp"
#define OPENGL_SCALE_VALUE 20
-#define DEBUG_POSITIONING 1
+#define DEBUG_POSITIONING 0
typedef struct PosVeci3
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 28
chart2/source/view/main/OpenGLRender.hxx |9 -
2 files changed, 37 deletions(-)
New commits:
commit e664b984380fff16649973eeea8d62c469d680e1
Author: Markus Mohrhard
Date: Mon Jan 13 00:53:11 2014 +0100
remove unused variables
Change-Id: Ic6a1ce2ac9e45d28cc0c9186859988c5085d44cd
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index b736b93..ceaa07e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -581,11 +581,6 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y,
int listLength)
m_Line2DPointList.push_back(actualY);
m_Line2DPointList.push_back(0);
-m_fPicLeft = std::min(m_fPicLeft, actualX);
-m_fPicRight = std::max(m_fPicRight, actualX);
-m_fPicBottom = std::min(m_fPicBottom, actualY);
-m_fPicTop = std::max(m_fPicTop, actualY);
-
if (m_Line2DPointList.size() == size_t(listLength * 3))
{
m_Line2DShapePointList.push_back(m_Line2DPointList);
@@ -1300,11 +1295,6 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y,
float directionX, float d
m_Bubble2DPointList.xScale = directionX / OPENGL_SCALE_VALUE;
m_Bubble2DPointList.yScale = directionY / OPENGL_SCALE_VALUE;
-m_fPicLeft = std::min(m_fPicLeft, actualX);
-m_fPicRight = std::max(m_fPicRight, actualX);
-m_fPicBottom = std::min(m_fPicBottom, actualY);
-m_fPicTop = std::max(m_fPicTop, actualY);
-
m_Bubble2DShapePointList.push_back(m_Bubble2DPointList);
return 0;
}
@@ -1380,11 +1370,6 @@ int OpenGLRender::RectangleShapePoint(float x, float y,
float directionX, float
m_RectangleList.xScale = directionX / OPENGL_SCALE_VALUE;
m_RectangleList.yScale = directionY / OPENGL_SCALE_VALUE;
-m_fPicLeft = std::min(m_fPicLeft, actualX);
-m_fPicRight = std::max(m_fPicRight, actualX);
-m_fPicBottom = std::min(m_fPicBottom, actualY);
-m_fPicTop = std::max(m_fPicTop, actualY);
-
m_RectangleShapePointList.push_back(m_RectangleList);
return 0;
}
@@ -1512,15 +1497,7 @@ int OpenGLRender::CreateTextTexture(::rtl::OUString
textValue, sal_uInt32 color,
m_TextInfo.vertex[6] = (float)(-aSize.Width / 2) / OPENGL_SCALE_VALUE;
m_TextInfo.vertex[7] = (float)(aSize.Height / 2) / OPENGL_SCALE_VALUE;
-m_fPicLeft = (m_TextInfo.x + m_TextInfo.vertex[0])< m_fPicLeft ?
(m_TextInfo.x + m_TextInfo.vertex[0]) : m_fPicLeft;
-
-m_fPicRight = (m_TextInfo.x + m_TextInfo.vertex[2]) > m_fPicRight ?
(m_TextInfo.x + m_TextInfo.vertex[2]) : m_fPicRight;
-
-m_fPicBottom = (m_TextInfo.y + m_TextInfo.vertex[1]) < m_fPicBottom ?
(m_TextInfo.y + m_TextInfo.vertex[1]) : m_fPicBottom;
-
-m_fPicTop = (m_TextInfo.y + m_TextInfo.vertex[5]) > m_fPicTop ?
(m_TextInfo.y + m_TextInfo.vertex[5]) : m_fPicTop;
//if has ratotion, we must re caculate the central pos
-
if (rotation)
{
//use left top
@@ -1658,11 +1635,6 @@ int OpenGLRender::SetArea2DShapePoint(float x, float y,
int listLength)
m_Area2DPointList.push_back(actualY);
m_Area2DPointList.push_back(m_fZStep);
-m_fPicLeft = std::min(m_fPicLeft, actualX);
-m_fPicRight = std::max(m_fPicRight, actualX);
-m_fPicBottom = std::min(m_fPicBottom, actualY);
-m_fPicTop = std::max(m_fPicTop, actualY);
-
if (m_Area2DPointList.size() == size_t(listLength * 3))
{
m_Area2DShapePointList.push_back(m_Area2DPointList);
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index fd8013a..7accdae 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -277,14 +277,6 @@ private:
GLuint m_renderBufferColorMS;
GLuint m_renderBufferDepthMS;
-float m_fPicRight;
-
-float m_fPicLeft;
-
-float m_fPicBottom;
-
-float m_fPicTop;
-
Bubble2DCircle m_Bubble2DCircle;
Bubble2DPointList m_Bubble2DPointList;
@@ -294,7 +286,6 @@ private:
GLint m_2DVertexID;
GLint m_2DColorID;
-
float m_fZStep;
float m_fAlpha;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit cc47e75fc2fdb09130809836fe24eb360e8fa3ad Author: Markus Mohrhard Date: Mon Jan 13 00:51:02 2014 +0100 fix the line color again still was set to my debug values Change-Id: I1b993450fee7be75a0a9e98fb99ffdea0c23baca diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index e6d2393..b736b93 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -616,8 +616,7 @@ int OpenGLRender::RenderLine2FBO(int) glUseProgram(m_CommonProID); CHECK_GL_ERROR(); -glm::vec4 aColor(1.0,0.5,0.5,0.5); -glUniform4fv(m_2DColorID, 1, &aColor[0]); +glUniform4fv(m_2DColorID, 1, &m_Line2DColor[0]); CHECK_GL_ERROR(); glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]); //CHECK_GL_ERROR(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/debug-opengl' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sc/source
sc/source/core/data/column.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9dca1cab9deb35ff59fd003e1777eb466946a8b7
Author: Laurent Godard
Date: Sat Jan 11 10:15:12 2014 +0100
correct loops in UpdateNoteCaptions for notes
Change-Id: Icec072eea61a194d72ce00c58dfbd85b1ec85abb
Reviewed-on: https://gerrit.libreoffice.org/7390
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
(cherry picked from commit 20ecc5b59d757307fbc9c3222af2a34ab8fb5bde)
Reviewed-on: https://gerrit.libreoffice.org/7391
(cherry picked from commit 81c4f9c4f957a08eeaed3967260e3d700320f5de)
Reviewed-on: https://gerrit.libreoffice.org/7392
Reviewed-by: Kohei Yoshida
Reviewed-by: Julien Nabet
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index e852e1f..145f61a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2175,14 +2175,14 @@ void ScColumn::UpdateNoteCaptions()
sc::cellnote_block::const_iterator itData, itDataEnd;
SCROW curRow = 0;
-for (;itBlk==itBlkEnd;++itBlk)
+for (;itBlk!=itBlkEnd;++itBlk)
{
if (itBlk->data)
{
// non empty block
itData = sc::cellnote_block::begin(*itBlk->data);
itDataEnd = sc::cellnote_block::end(*itBlk->data);
-for(;itData==itDataEnd; ++itData)
+for(;itData!=itDataEnd; ++itData)
{
ScPostIt* pNote = *itData;
pNote->UpdateCaptionPos(ScAddress(nCol, curRow, nTab));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 4.2.0 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.2.0. The upcoming 4.2.0 will bring new features and lots of bugfixes. Check out https://wiki.documentfoundation.org/ReleaseNotes/4.2 for an (incomplete and work-in-progress) list of the new features. Please be aware that LibreOffice 4.2.0 RC2 is not been flagged as ready for production use yet, you should continue to use LibreOffice 4.1.4 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ LibreOffice 4.2.0 RC2 is also available in a 64bit version for Mac OS X 10.8 (or newer) Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details). Beginning with RC2, the debug symbols are also source-indexed. Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.0 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.0/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 2 commits - chart2/source
chart2/source/view/inc/AbstractShapeFactory.hxx |2 ++
chart2/source/view/inc/DummyXShape.hxx |4 +++-
chart2/source/view/inc/OpenglShapeFactory.hxx |1 +
chart2/source/view/inc/ShapeFactory.hxx |2 ++
chart2/source/view/main/ChartView.cxx |1 +
chart2/source/view/main/DummyXShape.cxx |8
chart2/source/view/main/OpenGLRender.cxx|2 +-
chart2/source/view/main/OpenglShapeFactory.cxx |7 +++
8 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 0ef43bfca80697a19ba88926f9299ec7cbedacf0
Author: Markus Mohrhard
Date: Sun Jan 12 22:53:19 2014 +0100
fix missing clearing of rendering area
Now there are no artifacts left from earlier renderings.
Change-Id: I48e6585d838cdf9547c150e1484a967fc9b69329
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 7efc30e..76d996f 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -241,6 +241,8 @@ public:
*/
virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) = 0;
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) = 0;
+
static ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >
getChartRootShape( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage>& xPage );
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 91ec6d4..42eec30 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -426,7 +426,7 @@ public:
// normal methods
virtual void render();
-private:
+protected:
std::vector > maUNOShapes;
std::vector maShapes;
};
@@ -443,6 +443,8 @@ public:
virtual void render() SAL_OVERRIDE;
+void clear();
+
private:
GLWindow GLWin;/// Holds the information of our new child window
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index c7eb7a4..bb52da4 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -185,6 +185,7 @@ public:
virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
};
}
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index 259e923..99d8837 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -200,6 +200,8 @@ public:
*/
virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
+
private:
ShapeFactory();
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index b0d6768..556d1f0 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2412,6 +2412,7 @@ void ChartView::createShapes()
OSL_FAIL("could not set page size correctly");
}
pShapeFactory->setPageSize(mxRootShape, aPageSize);
+pShapeFactory->clearPage(mxRootShape);
{
SolarMutexGuard aSolarGuard;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index daa468a..596c0c4 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1226,6 +1226,12 @@ void DummyChart::render()
m_GLRender.renderToBitmap();
}
+void DummyChart::clear()
+{
+maUNOShapes.clear();
+maShapes.clear();
+}
+
}
}
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index 8bb327e..dce9695 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -433,6 +433,13 @@ void OpenglShapeFactory::render(uno::Reference<
drawing::XShapes > xRootShape)
pChart->render();
}
+void OpenglShapeFactory::clearPage(uno::Reference< drawing::XShapes >
xRootShape)
+{
+dummy::DummyChart* pChart =
dynamic_cast(xRootShape.get());
+assert(pChart);
+pChart->clear();
+}
+
} //namespace dummy
} //namespace chart
commit 3d712fef9d67a879b0ebcd03e65750e90e0ed351
Author: Markus Mohrhard
Date: Sun Jan 12 22:50:47 2014 +0100
fix rectangle rendering
I had to disable it at the same time as it renders a white space over
the whole chart right now. Before the fix it was just the top left
quadrant.
Change-Id: I499767bcc302e6d6c824
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 4 commits - configure.ac instsetoo_native/util setup_native/source solenv/bin
configure.ac |4 ++--
instsetoo_native/util/openoffice.lst.in |2 +-
setup_native/source/packinfo/finals_instsetoo.txt |1 +
solenv/bin/modules/installer.pm |2 +-
solenv/bin/modules/installer/globals.pm |2 +-
solenv/bin/modules/installer/windows/msp.pm |4 +++-
6 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 843cc47f8b983baebb94fb4627763fbeb4be4173
Author: Andras Timar
Date: Sun Jan 12 13:43:56 2014 -0800
Bump version to 4.1-4
Change-Id: I538e6006794ef69c8009845e3206212e160c7a6f
diff --git a/configure.ac b/configure.ac
index a2f03da..4432d37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.1.10.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.4],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
commit 4944ecae46d7a6ac071d323ab706033d7dbea8af
Author: Andras Timar
Date: Sun Jan 12 13:01:18 2014 -0800
change PYTHON_VERSION back to old value
because MSP patch cannot rename directories, and MSP installed over
the older base would result in immediate crash if Python cannot find
its libs. Version number is hard coded in PYTHONPATH.
Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d
diff --git a/configure.ac b/configure.ac
index 0788024..a2f03da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7572,7 +7572,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
commit 4ff025fc8455e7d74224954facc05dbe2cbf2571
Author: Andras Timar
Date: Sun Jan 12 11:04:41 2014 -0800
fixes related to MSP digital signature
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 614df9a..8a06414 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1670,7 +1670,7 @@ sub run {
if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) {
$$downloadname = installer::download::set_download_filename($languagestringref,
$allvariableshashref); }
else { $$downloadname =
installer::download::resolve_variables_in_downloadname($allvariableshashref,
$$downloadname, $languagestringref); }
installer::systemactions::rename_one_file( $finalinstalldir .
$installer::globals::separator . $installer::globals::shortmsidatabasename,
$finalinstalldir . $installer::globals::separator . $$downloadname . ".msi" );
-if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
+if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') && (
$allvariableshashref->{'CREATE_MSP_INSTALLSET'} eq '0'))
{
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f
$ENV{'PFXFILE'} "; }
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 7c7fcb9..bdb3367 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1208,12 +1208,14 @@ sub create_msp_patch
# Sign .msp file
if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
{
+my $localmspfilename = $mspfilename;
+$localmspfilename =~ s/\\//g;
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'}
"; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p
$ENV{'PFXPASSWORD'} "; }
if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
$systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " .
$allvariables->{'PRODUCTVERSION'} . " Patch " .
$allvariables->{'WINDOWSPATCHLEVEL'} . "\" ";
-$systemcall .= $mspfilename;
+$systemcall .= $localmspfilename;
installer::logger::print_message( "... code signing and timestamping
with signtool.exe ...\n" );
my $returnvalue = system($systemcall);
commit f80fadd7cac3ba4db5a126b52caa3e7dcbef47da
Author: Andras Timar
Date: Sun Jan 12 13:41:18 2014 -0800
enable MSP creation
Change-Id: I3d28cae66d8658505e2339d22304c1b38
[Libreoffice-commits] core.git: basegfx/source chart2/source sw/source
basegfx/source/polygon/b2dtrapezoid.cxx |3 +--
chart2/source/tools/DiagramHelper.cxx |6 ++
sw/source/core/access/acccell.cxx |3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit a14b4d2dfdadf25ed1fa1b75f959e8817036a86e
Author: Julien Nabet
Date: Sun Jan 12 22:26:20 2014 +0100
cppcheck: fix some redundantAssignment
Change-Id: I9ea73bada743b195d778b17038137e9089d03404
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx
b/basegfx/source/polygon/b2dtrapezoid.cxx
index dc36587..6c98959 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -406,10 +406,9 @@ namespace basegfx
B2DPoint* pNewPoint = bAIsLonger
? maNewPoints.allocatePoint(aEdgeA.getStart() + (fCutA
* aDeltaA))
: maNewPoints.allocatePoint(aEdgeB.getStart() + (fCutB
* aDeltaB));
-bool bRetval = false;
// try to split both edges
-bRetval = splitEdgeAtGivenPoint(aEdgeA, *pNewPoint,
aCurrent);
+bool bRetval = splitEdgeAtGivenPoint(aEdgeA, *pNewPoint,
aCurrent);
bRetval |= splitEdgeAtGivenPoint(aEdgeB, *pNewPoint,
aCurrent);
if(!bRetval)
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index 6685fe5..e434ad8 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1437,10 +1437,9 @@ bool DiagramHelper::isSeriesMoveable(
const Reference< XDataSeries >& xGivenDataSeries,
bool bForward )
{
-bool bIsMoveable = false;
const bool bDoMove = false;
-bIsMoveable = lcl_moveSeriesOrCheckIfMoveIsAllowed(
+bool bIsMoveable = lcl_moveSeriesOrCheckIfMoveIsAllowed(
xDiagram, xGivenDataSeries, bForward, bDoMove );
return bIsMoveable;
@@ -1448,10 +1447,9 @@ bool DiagramHelper::isSeriesMoveable(
bool DiagramHelper::moveSeries( const Reference< XDiagram >& xDiagram, const
Reference< XDataSeries >& xGivenDataSeries, bool bForward )
{
-bool bMoved = false;
const bool bDoMove = true;
-bMoved = lcl_moveSeriesOrCheckIfMoveIsAllowed(
+bool bMoved = lcl_moveSeriesOrCheckIfMoveIsAllowed(
xDiagram, xGivenDataSeries, bForward, bDoMove );
return bMoved;
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index 84c3347..4cdf3ab 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -398,8 +398,7 @@ uno::Any SwAccessibleCell::getMinimumValue( )
static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar,
OUString replaceStr)
{
-int iReplace = -1;
-iReplace = oldOUString.lastIndexOf(replacedChar);
+int iReplace = oldOUString.lastIndexOf(replacedChar);
if (iReplace > -1)
{
for(;iReplace>-1;)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - configure.ac instsetoo_native/util solenv/inc
configure.ac |2 +-
instsetoo_native/util/openoffice.lst | 24
solenv/inc/minor.mk |4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f2fa51c49bebd9ca0af5d61827b663c99a4ac5c3
Author: Andras Timar
Date: Sun Jan 12 13:17:54 2014 -0800
Bump for 4.0-22
Change-Id: Ie1e528f6a203237818432b182da8e929ccf2e45e
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 18f1728..d17ecb8 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 21
+WINDOWSPATCHLEVEL 22
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 2d69399..87b14c5 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:321)
-BUILD=321
+RSCREVISION=400m1(Build:322)
+BUILD=322
LAST_MINOR=m0
SOURCEVERSION=OOO400
commit a1dd29fb04c9f340f8b435f4587592b4f4f7e9ea
Author: Andras Timar
Date: Sun Jan 12 13:01:18 2014 -0800
change PYTHON_VERSION back to old value
because MSP patch cannot rename directories, and MSP installed over
the older base would result in immediate crash if Python cannot find
its libs. Version number is hard coded in PYTHO
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 24
solenv/inc/minor.mk |4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d4e7dcdb6fd44248eaf2c7feae23b461c5abbb11
Author: Andras Timar
Date: Sun Jan 12 13:17:54 2014 -0800
Bump for 4.0-22
Change-Id: Ie1e528f6a203237818432b182da8e929ccf2e45e
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 18f1728..d17ecb8 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 21
+WINDOWSPATCHLEVEL 22
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
PRODUCTVERSION 4.0
PACKAGEVERSION 4.0
PACKAGEREVISION 1
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
{
PRODUCTNAME OxygenOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -21
+PRODUCTEXTENSION -22
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-322
BASEPRODUCTVERSION 4.0
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 2d69399..87b14c5 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=400
-RSCREVISION=400m1(Build:321)
-BUILD=321
+RSCREVISION=400m1(Build:322)
+BUILD=322
LAST_MINOR=m0
SOURCEVERSION=OOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - chart2/source
chart2/source/view/main/OpenGLRender.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 85d1c9ca2b15730040d24b0137c4931eff5ff698 Author: Markus Mohrhard Date: Sun Jan 12 22:15:40 2014 +0100 fix bubble rendering Change-Id: Ice371673554a88b69866179b6b16944d6171e45d diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 7203745..053a8bc 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -1294,12 +1294,12 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, float directionX, float d Create2DCircle(100); } -float actualX = (x / 10.0f); -float actualY = (y / 10.0f); +float actualX = (x / OPENGL_SCALE_VALUE); +float actualY = (y / OPENGL_SCALE_VALUE); m_Bubble2DPointList.x = actualX; m_Bubble2DPointList.y = actualY; -m_Bubble2DPointList.xScale = directionX / 10.0f; -m_Bubble2DPointList.yScale = directionY / 10.0f; +m_Bubble2DPointList.xScale = directionX / OPENGL_SCALE_VALUE; +m_Bubble2DPointList.yScale = directionY / OPENGL_SCALE_VALUE; m_fPicLeft = std::min(m_fPicLeft, actualX); m_fPicRight = std::max(m_fPicRight, actualX); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/config/test/test.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit df1005452c32482e4fa4c312b9dcb9418519f63f
Author: Julien Nabet
Date: Sun Jan 12 22:08:00 2014 +0100
cppcheck: Add missing right parenthesis
Change-Id: I960ac0348bda310652edf36c0acc08f26c328946
diff --git a/svtools/source/config/test/test.cxx
b/svtools/source/config/test/test.cxx
index f66c42d..86ed9a8 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -137,18 +137,18 @@ void TestApplication::impl_testDynamicMenuOptions()
if( lNewMenu.getLength() < 1 )
{
-aCFG.AppendItem( E_NEWMENU, "private:factory/swriter", "new writer",
"icon_writer", "_blank";
-aCFG.AppendItem( E_NEWMENU, "private:factory/scalc", "new calc",
"icon_calc", "_blank";
-aCFG.AppendItem( E_NEWMENU, "private:factory/sdraw", "new draw",
"icon_draw", "_blank";
+aCFG.AppendItem( E_NEWMENU, "private:factory/swriter", "new writer",
"icon_writer", "_blank");
+aCFG.AppendItem( E_NEWMENU, "private:factory/scalc", "new calc",
"icon_calc", "_blank");
+aCFG.AppendItem( E_NEWMENU, "private:factory/sdraw", "new draw",
"icon_draw", "_blank");
lNewMenu = aCFG.GetMenu( E_NEWMENU );
}
if( lWizardMenu.getLength() < 1 )
{
-aCFG.AppendItem( E_WIZARDMENU, "file://a", "system file", "icon_file",
"_self";
-aCFG.AppendItem( E_WIZARDMENU, "ftp://b";, "ftp host","icon_ftp",
"_self";
-aCFG.AppendItem( E_WIZARDMENU, "http://c";, "www", "icon_www",
"_self";
+aCFG.AppendItem( E_WIZARDMENU, "file://a", "system file", "icon_file",
"_self");
+aCFG.AppendItem( E_WIZARDMENU, "ftp://b";, "ftp host","icon_ftp",
"_self");
+aCFG.AppendItem( E_WIZARDMENU, "http://c";, "www", "icon_www",
"_self");
lWizardMenu = aCFG.GetMenu( E_WIZARDMENU );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 752cf6e270e2138380ebfc3b1ee4b99a5ca9a8a5
Author: Andras Timar
Date: Sun Jan 12 13:01:18 2014 -0800
change PYTHON_VERSION back to old value
because MSP patch cannot rename directories, and MSP installed over
the older base would result in immediate crash if Python cannot find
its libs. Version number is hard coded in PYTHONPATH.
Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d
diff --git a/configure.ac b/configure.ac
index 43b877d..a88cb6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7556,7 +7556,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - chart2/source
chart2/source/view/main/DummyXShape.cxx |4 +
chart2/source/view/main/OpenGLRender.cxx | 91 ++-
chart2/source/view/main/OpenGLRender.hxx | 15 -
3 files changed, 94 insertions(+), 16 deletions(-)
New commits:
commit f921eefcacfaa7720ea6bedb64ee7ef3d3d63dfd
Author: Markus Mohrhard
Date: Sun Jan 12 21:59:27 2014 +0100
fix the remaining projection issues
Change-Id: I3d6b7126b8c23e5cd1e60d49fa8cd6ebb0c9a6d1
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index b55183e..b4baa57 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1216,7 +1216,11 @@ void DummyChart::render()
{
SAL_WARN("chart2.opengl", "render chart");
m_GLRender.prepareToRender();
+#if 0
+m_GLRender.renderDebug();
+#else
DummyXShapes::render();
+#endif
m_GLRender.renderToBitmap();
}
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index e7de497..7203745 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -63,6 +63,34 @@ using namespace std;
//begin shaders
+#if DEBUG_POSITIONING
+
+const char* DebugVertexShader = OPENGL_SHADER (
+
+attribute vec3 vPosition;
+uniform vec4 vColor;
+varying vec4 fragmentColor;
+
+void main()
+{
+gl_Position = vec4(vPosition, 1);
+}
+
+);
+
+const char* DebugFragmentShader = OPENGL_SHADER (
+
+varying vec4 fragmentColor;
+
+void main()
+{
+gl_FragColor = vec4(1.0, 1.0, 0.0, 0.5);
+}
+
+);
+
+#endif
+
const char *CommonFragmemtShader = OPENGL_SHADER (
varying vec4 fragmentColor;
@@ -442,6 +470,13 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition");
m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
+CHECK_GL_ERROR();
+
+#if DEBUG_POSITIONING
+m_DebugProID = LoadShaders(DebugVertexShader, DebugFragmentShader);
+m_DebugVertexID = glGetAttribLocation(m_DebugProID, "vPosition");
+#endif
+CHECK_GL_ERROR();
m_BackgroundProID = LoadShaders(BackgroundVertexShader,
BackgroundFragmemtShader);
m_BackgroundMatrixID = glGetUniformLocation(m_BackgroundProID, "MVP");
@@ -520,7 +555,7 @@ BitmapEx OpenGLRender::GetAsBitmap()
#if DEBUG_PNG // debug PNG writing
static int nIdx = 0;
-OUString aName = OUString( "file://c/temp/image" ) + OUString::number(
nIdx++ ) + ".png";
+OUString aName = OUString( "file:///home/moggi/Documents/work/" ) +
OUString::number( nIdx++ ) + ".png";
try {
vcl::PNGWriter aWriter( aBmp );
SvFileStream sOutput( aName, STREAM_WRITE );
@@ -544,7 +579,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int
listLength)
float actualY = (y / OPENGL_SCALE_VALUE);
m_Line2DPointList.push_back(actualX);
m_Line2DPointList.push_back(actualY);
-m_Line2DPointList.push_back(m_fZStep);
+m_Line2DPointList.push_back(0);
m_fPicLeft = std::min(m_fPicLeft, actualX);
m_fPicRight = std::max(m_fPicRight, actualX);
@@ -568,7 +603,6 @@ int OpenGLRender::RenderLine2FBO(int)
PosVecf3 angle = {0.0f, 0.0f, 0.0f};
PosVecf3 scale = {1.0f, 1.0f, 1.0f};
MoveModelf(trans, angle, scale);
-m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight),
-1.f, 1.f);
m_MVP = m_Projection * m_View * m_Model;
for (size_t i = 0; i < listNum; i++)
{
@@ -582,15 +616,13 @@ int OpenGLRender::RenderLine2FBO(int)
glUseProgram(m_CommonProID);
CHECK_GL_ERROR();
-glUniform4fv(m_2DColorID, 1, &m_Line2DColor[0]);
+glm::vec4 aColor(1.0,0.5,0.5,0.5);
+glUniform4fv(m_2DColorID, 1, &aColor[0]);
CHECK_GL_ERROR();
glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]);
-CHECK_GL_ERROR();
+//CHECK_GL_ERROR();
// 1rst attribute buffer : vertices
-glEnableVertexAttribArray(m_2DVertexID);
-CHECK_GL_ERROR();
-glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR();
glVertexAttribPointer(
m_2DVertexID,
@@ -600,11 +632,11 @@ int OpenGLRender::RenderLine2FBO(int)
0, // stride
(void*)0// array buffer offset
);
+glEnableVertexAttribArray(m_2DVertexID);
glDrawArrays(GL_LINE_STRIP, 0, pointList.size()/3); // 12*3 indices
starting at 0 -> 12 triangles
CHECK_GL_ERROR();
-glDisableVertexAttribArray(m_2DVertexID);
-CHECK_GL_ERROR();
glUseProgram(0);
+glDisableVertexAttribArray(m_2DVertexID);
CHECK_GL_ERROR();
m_Line2DShapePointList.pop_front();
}
@@ -614,6 +646,35 @@ int OpenGLRender::RenderLine2FBO(int)
return 0;
}
+#if DEBUG_POSITIONING
+void OpenGLRender::renderDebug()
+{
+CHEC
Re: OpenGL on Linux
Well, can't say I understand much of this, but can't hurt: name of display: :0.0 display: :0 screen: 0 direct rendering: Yes server glx vendor string: SGI server glx version string: 1.4 server glx extensions: GLX_ARB_multisample, GLX_EXT_import_context, GLX_EXT_texture_from_pixmap, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_copy_sub_buffer, GLX_OML_swap_method, GLX_SGI_swap_control, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_visual_select_group, GLX_INTEL_swap_event client glx vendor string: Mesa Project and SGI client glx version string: 1.4 client glx extensions: GLX_ARB_create_context, GLX_ARB_create_context_profile, GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_import_context, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_EXT_framebuffer_sRGB, GLX_EXT_create_context_es2_profile, GLX_MESA_copy_sub_buffer, GLX_MESA_multithread_makecurrent, GLX_MESA_swap_control, GLX_OML_swap_method, GLX_OML_sync_control, GLX_SGI_make_current_read, GLX_SGI_swap_control, GLX_SGI_video_sync, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_visual_select_group, GLX_EXT_texture_from_pixmap, GLX_INTEL_swap_event GLX version: 1.4 GLX extensions: GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_import_context, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_copy_sub_buffer, GLX_MESA_multithread_makecurrent, GLX_MESA_swap_control, GLX_OML_swap_method, GLX_OML_sync_control, GLX_SGI_make_current_read, GLX_SGI_swap_control, GLX_SGI_video_sync, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_visual_select_group, GLX_EXT_texture_from_pixmap OpenGL vendor string: Tungsten Graphics, Inc OpenGL renderer string: Mesa DRI Mobile Intel® GM45 Express Chipset x86/MMX/SSE2 OpenGL version string: 2.1 Mesa 8.0.5 OpenGL shading language version string: 1.20 OpenGL extensions: GL_ARB_multisample, GL_EXT_abgr, GL_EXT_bgra, GL_EXT_blend_color, GL_EXT_blend_minmax, GL_EXT_blend_subtract, GL_EXT_copy_texture, GL_EXT_polygon_offset, GL_EXT_subtexture, GL_EXT_texture_object, GL_EXT_vertex_array, GL_EXT_compiled_vertex_array, GL_EXT_texture, GL_EXT_texture3D, GL_IBM_rasterpos_clip, GL_ARB_point_parameters, GL_EXT_draw_range_elements, GL_EXT_packed_pixels, GL_EXT_point_parameters, GL_EXT_rescale_normal, GL_EXT_separate_specular_color, GL_EXT_texture_edge_clamp, GL_SGIS_generate_mipmap, GL_SGIS_texture_border_clamp, GL_SGIS_texture_edge_clamp, GL_SGIS_texture_lod, GL_ARB_framebuffer_sRGB, GL_ARB_multitexture, GL_EXT_framebuffer_sRGB, GL_IBM_multimode_draw_arrays, GL_IBM_texture_mirrored_repeat, GL_3DFX_texture_compression_FXT1, GL_ARB_texture_cube_map, GL_ARB_texture_env_add, GL_ARB_transpose_matrix, GL_EXT_blend_func_separate, GL_EXT_fog_coord, GL_EXT_multi_draw_arrays, GL_EXT_secondary_color, GL_EXT_texture_env_add, GL_EXT_texture_filter_anisotropic, GL_EXT_texture_lod_bias, GL_INGR_blend_func_separate, GL_NV_blend_square, GL_NV_light_max_exponent, GL_NV_texgen_reflection, GL_NV_texture_env_combine4, GL_SUN_multi_draw_arrays, GL_ARB_texture_border_clamp, GL_ARB_texture_compression, GL_EXT_framebuffer_object, GL_EXT_texture_env_combine, GL_EXT_texture_env_dot3, GL_MESA_window_pos, GL_NV_packed_depth_stencil, GL_NV_texture_rectangle, GL_NV_vertex_program, GL_ARB_depth_texture, GL_ARB_occlusion_query, GL_ARB_shadow, GL_ARB_texture_env_combine, GL_ARB_texture_env_crossbar, GL_ARB_texture_env_dot3, GL_ARB_texture_mirrored_repeat, GL_ARB_window_pos, GL_ATI_envmap_bumpmap, GL_EXT_stencil_two_side, GL_EXT_texture_cube_map, GL_NV_depth_clamp, GL_NV_vertex_program1_1, GL_APPLE_packed_pixels, GL_APPLE_vertex_array_object, GL_ARB_draw_buffers, GL_ARB_fragment_program, GL_ARB_fragment_shader, GL_ARB_shader_objects, GL_ARB_vertex_program, GL_ARB_vertex_shader, GL_ATI_draw_buffers, GL_ATI_texture_env_combine3, GL_ATI_texture_float, GL_EXT_shadow_funcs, GL_EXT_stencil_wrap, GL_MESA_pack_invert, GL_MESA_ycbcr_texture, GL_ARB_depth_clamp, GL_ARB_fragment_program_shadow, GL_ARB_half_float_pixel, GL_ARB_point_sprite, GL_ARB_shading_language_100, GL_ARB_sync, GL_ARB_texture_non_power_of_two, GL_ARB_vertex_buffer_object, GL_ATI_blend_equation_separate, GL_EXT_blend_equation_separate, GL_OES_read_format, GL_ARB_color_buffer_float, GL_ARB_pixel_buffer_object, GL_ARB_texture_compression_rgtc, GL_ARB_texture_float, GL_ARB_texture_rectangle, GL_EXT_packed_float, GL_EXT_pixel_buffer_object, GL_EXT_texture_compression_rgtc, GL_EXT_texture_rectangle, GL_EXT_texture_sRGB, GL_EXT_texture_shared_exponent, GL_ARB_framebuffer_object, GL_EXT_framebuffer_blit, GL_EXT_framebuffer_multisample, GL_EXT_packed_depth_stencil, GL_APPLE_object_purgeable, GL_ARB_vertex_array_object, GL_ATI_separate_stencil, GL_EXT_dra
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8c/ae5708c761ba10a87f3616a669df03e6ba0039
8c/ae5708c761ba10a87f3616a669df03e6ba0039 |1 + 1 file changed, 1 insertion(+) New commits: commit cb8e2a7543ee9b117ffaa736dd5bf8e0df5995e5 Author: Caolán McNamara Date: Sun Jan 12 20:19:41 2014 + Notes added by 'git notes add' diff --git a/8c/ae5708c761ba10a87f3616a669df03e6ba0039 b/8c/ae5708c761ba10a87f3616a669df03e6ba0039 new file mode 100644 index 000..323bb9a --- /dev/null +++ b/8c/ae5708c761ba10a87f3616a669df03e6ba0039 @@ -0,0 +1 @@ +prefer: 06c73497580c32f77f2848a6f57feb037516695e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - include/vcl vcl/source
include/vcl/cmdevt.hxx | 40 +++
include/vcl/edit.hxx |4 +--
vcl/source/control/edit.cxx | 44 +--
vcl/source/window/cmdevt.cxx | 11 +++---
4 files changed, 48 insertions(+), 51 deletions(-)
New commits:
commit 69a945d0dbc58c150cbede8d35a189eefe8f2367
Author: Caolán McNamara
Date: Sun Jan 12 11:31:23 2014 +
longparas: these 0x are STRING_LEN
Change-Id: I9501efae520a994baaf675f70f3570d9ba3233aa
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f3bd838..48d5dc7 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1437,7 +1437,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
mbClickedInSelection = sal_False;
if ( rMEvt.GetClicks() == 3 )
{
-ImplSetSelection( Selection( 0, 0x ) );
+ImplSetSelection( Selection( 0, STRING_LEN ) );
ImplCopyToSelectionClipboard();
}
@@ -1713,7 +1713,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
}
else if ( bGoEnd )
{
-aSel.Max() = 0x;
+aSel.Max() = STRING_LEN;
}
if ( !bSelect )
commit f042e84e63d14fca4252235d7b9a68b1cb1074b4
Author: Caolán McNamara
Date: Sun Jan 12 11:20:39 2014 +
longparas: nStart and nEnd are always overwritten
so simplify to the reality, which conveniently removes some
hard-coded 0x and STRING_LEN uses
Change-Id: I4fc014a972f6a157c18f8194c410b7cbff03de4a
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 6df0714..6fc7917 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -93,8 +93,8 @@ private:
SAL_DLLPRIVATE voidImplInitEditData();
SAL_DLLPRIVATE voidImplModified();
SAL_DLLPRIVATE OUStringImplGetText() const;
-SAL_DLLPRIVATE voidImplRepaint( sal_Int32 nStart = 0, sal_Int32
nEnd = STRING_LEN, bool bLayout = false );
-SAL_DLLPRIVATE voidImplInvalidateOrRepaint( sal_Int32 nStart = 0,
sal_Int32 nEnd = STRING_LEN );
+SAL_DLLPRIVATE voidImplRepaint(bool bLayout = false);
+SAL_DLLPRIVATE voidImplInvalidateOrRepaint();
SAL_DLLPRIVATE voidImplDelete( const Selection& rSelection,
sal_uInt8 nDirection, sal_uInt8 nMode );
SAL_DLLPRIVATE voidImplSetText( const OUString& rStr, const
Selection* pNewSelection = 0 );
SAL_DLLPRIVATE voidImplInsertText( const OUString& rStr, const
Selection* pNewSelection = 0, sal_Bool bIsUserInput = sal_False );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f7c2415..f3bd838 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -496,7 +496,7 @@ OUString Edit::ImplGetText() const
// ---
-void Edit::ImplInvalidateOrRepaint( sal_Int32 nStart, sal_Int32 nEnd )
+void Edit::ImplInvalidateOrRepaint()
{
if( IsPaintTransparent() )
{
@@ -506,7 +506,7 @@ void Edit::ImplInvalidateOrRepaint( sal_Int32 nStart,
sal_Int32 nEnd )
Update();
}
else
-ImplRepaint( nStart, nEnd );
+ImplRepaint();
}
// ---
@@ -522,14 +522,14 @@ long Edit::ImplGetTextYPosition() const
// ---
-void Edit::ImplRepaint( sal_Int32 nStart, sal_Int32 nEnd, bool bLayout )
+void Edit::ImplRepaint(bool bLayout)
{
if ( !IsReallyVisible() )
return;
OUString aText = ImplGetText();
-nStart = 0;
-nEnd = aText.getLength();
+sal_Int32 nStart = 0;
+sal_Int32 nEnd = aText.getLength();
sal_Int32 nDXBuffer[256];
sal_Int32* pDXBuffer = NULL;
@@ -1275,7 +1275,7 @@ void Edit::ImplAlign()
void Edit::ImplAlignAndPaint()
{
ImplAlign();
-ImplInvalidateOrRepaint( 0, STRING_LEN );
+ImplInvalidateOrRepaint();
ImplShowCursor();
}
@@ -1861,7 +1861,7 @@ void Edit::KeyInput( const KeyEvent& rKEvt )
void Edit::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
-const_cast(this)->ImplRepaint( 0, STRING_LEN, true );
+const_cast(this)->ImplRepaint(true);
}
// ---
@@ -2343,7 +2343,7 @@ void Edit::StateChanged( StateChangedType nType )
if ( !mpSubEdit )
{
// change text color only
-ImplInvalidateOrRepaint( 0, 0x );
+ImplInvalidateOrRepaint();
}
}
else if ( nType == STATE_CHANGE_STYLE || nType == STATE_CHANGE_MIRRORING )
@@ -2648,7 +2648,7 @@ void Edit::ImplSetSelection( const Selection& rSelection,
sal_
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 2 commits - instsetoo_native/util setup_native/source solenv/bin solenv/inc
instsetoo_native/util/openoffice.lst | 26 +++---
setup_native/source/packinfo/finals_instsetoo.txt |2 -
solenv/bin/modules/installer.pm |2 -
solenv/bin/modules/installer/globals.pm |2 -
solenv/bin/modules/installer/windows/msp.pm |4 ++-
solenv/inc/minor.mk |6 ++---
6 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 845322cec73b84262375446436e65298c7fada7b
Author: Andras Timar
Date: Sun Jan 12 11:04:41 2014 -0800
fixes related to MSP digital signature
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 00f1c51..3fe1485 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1741,7 +1741,7 @@ sub run {
if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) {
$$downloadname = installer::download::set_download_filename($languagestringref,
$allvariableshashref); }
else { $$downloadname =
installer::download::resolve_variables_in_downloadname($allvariableshashref,
$$downloadname, $languagestringref); }
installer::systemactions::rename_one_file( $finalinstalldir .
$installer::globals::separator . $installer::globals::shortmsidatabasename,
$finalinstalldir . $installer::globals::separator . $$downloadname . ".msi" );
-if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
+if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') && (
$allvariableshashref->{'CREATE_MSP_INSTALLSET'} eq '0'))
{
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f
$ENV{'PFXFILE'} "; }
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index e321745..a19420b 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -1217,12 +1217,14 @@ sub create_msp_patch
# Sign .msp file
if ( defined($ENV{'WINDOWS_BUILD_SIGNING'}) &&
($ENV{'WINDOWS_BUILD_SIGNING'} eq 'TRUE') )
{
+my $localmspfilename = $mspfilename;
+$localmspfilename =~ s/\\//g;
my $systemcall = "signtool.exe sign ";
if ( defined($ENV{'PFXFILE'}) ) { $systemcall .= "-f $ENV{'PFXFILE'}
"; }
if ( defined($ENV{'PFXPASSWORD'}) ) { $systemcall .= "-p
$ENV{'PFXPASSWORD'} "; }
if ( defined($ENV{'TIMESTAMPURL'}) ) { $systemcall .= "-t
$ENV{'TIMESTAMPURL'} "; } else { $systemcall .= "-t
http://timestamp.globalsign.com/scripts/timestamp.dll "; }
$systemcall .= "-d \"" . $allvariables->{'PRODUCTNAME'} . " " .
$allvariables->{'PRODUCTVERSION'} . " Patch " .
$allvariables->{'WINDOWSPATCHLEVEL'} . "\" ";
-$systemcall .= $mspfilename;
+$systemcall .= $localmspfilename;
installer::logger::print_message( "... code signing and timestamping
with signtool.exe ...\n" );
my $returnvalue = system($systemcall);
commit a120424f2b801f25df29d49c047f6b5fa2fb8291
Author: Andras Timar
Date: Sun Jan 12 00:35:18 2014 -0800
enable MSP creation and bump version number for 1st PTF
Change-Id: I69268d78c13299ddba6867dc599295ef9dcd3fe3
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 25672e0..18f1728 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -30,10 +30,10 @@ Globals
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
+CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 20
+WINDOWSPATCHLEVEL 21
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -20
+PRODUCTEXTENSION -21
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-320
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-321
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION -20
+PRODUCTEXTENSION -21
UNIXBASISROOTNAME lodev4.0
RE: OpenGL on Linux
System: OpenSUSE 13.1 64 Bit, Core 2 Duo, Nvidia GS 8300: glxinfo: http://pastebin.ca/2534039 Regards Sophia S. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 5 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 27 +--
chart2/source/view/main/OpenGLRender.hxx |2 --
2 files changed, 13 insertions(+), 16 deletions(-)
New commits:
commit 66efa731ff32d4ccd0769bf2a0e1345d5addea18
Author: Markus Mohrhard
Date: Sun Jan 12 18:23:35 2014 +0100
try to use orthographic projection
Change-Id: I6e0baf23cea7d1883ca910ee13819ea58bbf7695
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index e57666c..e7de497 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -424,7 +424,7 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//Init the Projection matrix
-m_Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.0f);
+m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight),
-1.f, 1.f);
m_View = glm::lookAt(glm::vec3(0,0,1), // Camera is at (4,3,-3), in
World Space
glm::vec3(0,0,0), // and looks at the origin
glm::vec3(0,1,0) // Head is up (set to 0,-1,0
to look upside-down)
@@ -540,8 +540,8 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int
listLength)
{
m_Line2DPointList.reserve(listLength*3);
}
-float actualX = (x / OPENGL_SCALE_VALUE) - ((float)m_iWidth / 2);
-float actualY = (y / OPENGL_SCALE_VALUE) - ((float)m_iHeight / 2);
+float actualX = (x / OPENGL_SCALE_VALUE);
+float actualY = (y / OPENGL_SCALE_VALUE);
m_Line2DPointList.push_back(actualX);
m_Line2DPointList.push_back(actualY);
m_Line2DPointList.push_back(m_fZStep);
@@ -568,6 +568,7 @@ int OpenGLRender::RenderLine2FBO(int)
PosVecf3 angle = {0.0f, 0.0f, 0.0f};
PosVecf3 scale = {1.0f, 1.0f, 1.0f};
MoveModelf(trans, angle, scale);
+m_Projection = glm::ortho(0.f, float(m_iWidth), 0.f, float(m_iHeight),
-1.f, 1.f);
m_MVP = m_Projection * m_View * m_Model;
for (size_t i = 0; i < listNum; i++)
{
commit 695908337e5063bf02e213668a10adac50e9b8d3
Author: Markus Mohrhard
Date: Sun Jan 12 18:22:16 2014 +0100
only use one variable for alpha
It was confusing and in some places we already used the wrong variable.
Change-Id: Ib3a0f0e500530be0b502301233e5e853abe9f889
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 963ef2b..e57666c 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -881,7 +881,6 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape
> xTarget):
m_RboID(0),
m_iWidth(0),
m_iHeight(0),
-m_fLineAlpha(1.0),
mxRenderTarget(xTarget),
mbArbMultisampleSupported(false),
m_TextVertexID(0),
@@ -963,7 +962,7 @@ int OpenGLRender::CreateBMPHeader(sal_uInt8 *bmpHeader, int
xsize, int ysize)
void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b)
{
-m_Line2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b /
255.0f, m_fLineAlpha);
+m_Line2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b /
255.0f, m_fAlpha);
}
void OpenGLRender::SetLine2DWidth(int width)
@@ -1180,7 +1179,7 @@ void OpenGLRender::SetColor(sal_uInt32 color)
sal_uInt8 r = (color & 0x00FF) >> 16;
sal_uInt8 g = (color & 0xFF00) >> 8;
sal_uInt8 b = (color & 0x00FF);
-m_2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b /
255.0f, m_fLineAlpha);
+m_2DColor = glm::vec4((float)r / 255.0f, (float)g / 255.0f, (float)b /
255.0f, m_fAlpha);
}
int OpenGLRender::CreateMultiSampleFrameBufObj()
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 65c0b91..9dd0777 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -259,8 +259,6 @@ private:
float m_fLineWidth;
-float m_fLineAlpha;
-
std::list m_Line2DShapePointList;
com::sun::star::uno::Reference< com::sun::star::drawing::XShape >
mxRenderTarget;
commit 378f64064ca522cebe554c82ba723293dba410b9
Author: Markus Mohrhard
Date: Sun Jan 12 18:21:32 2014 +0100
a bit more clean-up
Change-Id: Ib6a3ef54fdd7b0582b691ae5e4d2ff998bd17b54
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 4814b7c..963ef2b 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -538,7 +538,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int
listLength)
{
if (m_Line2DPointList.empty())
{
-m_Line2DPointList.reserve(listLength);
+m_Line2DPointList.reserve(listLength*3);
}
float actualX = (x / OPENGL_SCALE_VALUE) - ((float)m_iWidth / 2);
float actualY = (y / OPENGL_SCALE_VALUE) - ((
[Libreoffice-commits] core.git: Branch 'private/tml/iculess' - 2 commits - i18npool/inc i18npool/source iculess/README include/iculess
i18npool/inc/collator_apple.hxx | 71 +++
i18npool/source/collator/collator_apple.cxx | 258
iculess/README |6
include/iculess/unicode/utypes.h| 17 +
4 files changed, 349 insertions(+), 3 deletions(-)
New commits:
commit 9dba1697c0ce259a2962e583fb93c544847bb077
Author: Tor Lillqvist
Date: Sun Jan 12 18:36:22 2014 +0200
Typo
Change-Id: Iab10199ab87feb516f665c81e980ec21f3d5554d
diff --git a/iculess/README b/iculess/README
index 7ed063a..4675b74 100644
--- a/iculess/README
+++ b/iculess/README
@@ -1,5 +1,5 @@
Implementations of a "fake" partial ICU API
-We would like to avoid buindling the huge ICU with LibreOffice-based
-apps on iOS and Android. I am experimenting with replacing ICU
-functionality with system-dependent APIs.
+We would like to avoid bundling the huge ICU code, and especialy data,
+with LibreOffice-based apps on iOS and Android. I am experimenting
+with replacing ICU functionality with system-dependent APIs.
commit 02951d378be59f905bace0a56dd855ab1c61365f
Author: Tor Lillqvist
Date: Sun Jan 12 18:34:47 2014 +0200
Forgot to add these (unfinished) files
Change-Id: I42a721d3827c61e879d40a44f605481e6d24bd5e
diff --git a/i18npool/inc/collator_apple.hxx b/i18npool/inc/collator_apple.hxx
new file mode 100644
index 000..afab4a6
--- /dev/null
+++ b/i18npool/inc/collator_apple.hxx
@@ -0,0 +1,71 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_I18NPOOL_INC_COLLATOR_APPLE_HXX
+#define INCLUDED_I18NPOOL_INC_COLLATOR_APPLE_HXX
+
+#include
+#include
+#include
+#include
+
+namespace com { namespace sun { namespace star { namespace i18n {
+
+class Collator_Apple : public cppu::WeakImplHelper2 < XCollator,
com::sun::star::lang::XServiceInfo >
+{
+public:
+// Constructors
+Collator_Apple();
+// Destructor
+~Collator_Apple();
+
+sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1,
sal_Int32 len1,
+const OUString& s2, sal_Int32 off2, sal_Int32 len2)
throw(com::sun::star::uno::RuntimeException);
+
+sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
+throw(com::sun::star::uno::RuntimeException);
+
+sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const
lang::Locale& rLocale,
+sal_Int32 collatorOptions)
throw(com::sun::star::uno::RuntimeException);
+
+
+// following 4 methods are implemented in collatorImpl.
+sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32)
+throw(com::sun::star::uno::RuntimeException) {throw
com::sun::star::uno::RuntimeException();}
+void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&,
const lang::Locale&,
+const com::sun::star::uno::Sequence< sal_Int32 >&)
throw(com::sun::star::uno::RuntimeException) {throw
com::sun::star::uno::RuntimeException();}
+com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(
const lang::Locale&)
+throw(com::sun::star::uno::RuntimeException) {throw
com::sun::star::uno::RuntimeException();}
+com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(
const OUString& )
+throw(com::sun::star::uno::RuntimeException) {throw
com::sun::star::uno::RuntimeException();}
+
+//XServiceInfo
+virtual OUString SAL_CALL getImplementationName() throw(
com::sun::star::uno::RuntimeException );
+virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
throw( com::sun::star::uno::RuntimeException );
+virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException );
+
+protected:
+const sal_Char *implementationName;
+};
+
+} } } }
+
+#endif // INCLUDED_I18NPOOL_INC_COLLATOR_APPLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/collator/collator_apple.cxx
b/i18npool/source/collator/collator_apple.cxx
new file mode 100644
index 000..8166ac5
--- /dev/null
+++ b/i18npool/source/collator/c
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 2 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx |7 ---
chart2/source/view/main/OpenGLRender.hxx |2 --
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 59f7f8cd289fadb0ee6dcdfc01018cb1f7fecc62
Author: Markus Mohrhard
Date: Sun Jan 12 16:05:29 2014 +0100
delete all programs at the end
Change-Id: I6a2e0a70e9b6eadcb869596471f702bca4145336
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 66118fb..f81e94c 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -843,10 +843,12 @@ void OpenGLRender::Release()
{
glDeleteBuffers(1, &m_VertexBuffer);
glDeleteBuffers(1, &m_ColorBuffer);
-glDeleteProgram(m_ProgramID);
glDeleteBuffers(1, &m_RenderVertexBuf);
glDeleteBuffers(1, &m_RenderTexCoordBuf);
glDeleteProgram(m_RenderProID);
+glDeleteProgram(m_CommonProID);
+glDeleteProgram(m_TextProID);
+glDeleteProgram(m_BackgroundProID);
glDeleteFramebuffers(1, &m_FboID);
glDeleteTextures(1, &m_TextureObj);
glDeleteRenderbuffers(1, &m_RboID);
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 41fa81e..65c0b91 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -209,8 +209,6 @@ private:
glm::mat4 m_ScaleMatrix;
-GLuint m_ProgramID;
-
GLint m_RenderProID;
glm::vec4 m_Line2DColor;
commit c102d8d4b8122c7d5e7bb32f663e43562a0bddf2
Author: Markus Mohrhard
Date: Sun Jan 12 16:02:17 2014 +0100
use std::min
Change-Id: I8ffaf5e5ed418901658ca6b7e3d1ad369ee0baba
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 99cb450..66118fb 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -967,8 +967,7 @@ void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g,
sal_uInt8 b)
void OpenGLRender::SetLine2DWidth(int width)
{
-m_fLineWidth = (float)width / 10.0f;
-m_fLineWidth = (m_fLineWidth < 0.001) ? 0.001 : m_fLineWidth;
+m_fLineWidth = std::max((float)width / 10.0f, 0.001f);
}
#if defined( _WIN32 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 3 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 87 +++
chart2/source/view/main/OpenGLRender.hxx | 16 ++---
2 files changed, 27 insertions(+), 76 deletions(-)
New commits:
commit e92af2401fa245506094fcdcab7bb51d23486b18
Author: Markus Mohrhard
Date: Sun Jan 12 15:58:48 2014 +0100
formatting
Change-Id: I3806d3b74e850812ccb24dea0580759529c154cc
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index 8b15dbf..41fa81e 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -272,9 +272,9 @@ private:
GLint m_iSamples;
glm::vec4 m_2DColor;
- GLuint m_frameBufferMS;
- GLuint m_renderBufferColorMS;
- GLuint m_renderBufferDepthMS;
+GLuint m_frameBufferMS;
+GLuint m_renderBufferColorMS;
+GLuint m_renderBufferDepthMS;
float m_fPicRight;
commit cbfd328632995eb67813151bfb28e47002e1fe8e
Author: Markus Mohrhard
Date: Sun Jan 12 15:57:38 2014 +0100
remove unused variable
Change-Id: Ia563d4628e322bfde82ccca02b107c5e954a0205
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 3640451..99cb450 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -874,7 +874,6 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape
> xTarget):
m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f))),
m_RotationMatrix(glm::eulerAngleYXZ(0.0f, 0.0f, 0.0f)),
m_ScaleMatrix(glm::scale(m_Model, glm::vec3(1.0f, 1.0f, 1.0f))),
-m_Line2DProID(0), // TODO: moggi: why is it unused?
m_Line2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
m_TextureObj(0),
m_FboID(0),
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index b7aae83..8b15dbf 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -213,8 +213,6 @@ private:
GLint m_RenderProID;
-GLint m_Line2DProID;
-
glm::vec4 m_Line2DColor;
GLuint m_VertexBuffer;
commit 72dd2a8a39298944b89eaf77da50c2e11fe54b90
Author: Markus Mohrhard
Date: Sun Jan 12 15:53:56 2014 +0100
we are rendering to FBO so no need for two objects
Change-Id: I6a900244160c974feefb45ecb41d581050e955e2
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index ff6b6b6..3640451 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -619,7 +619,7 @@ void OpenGLRender::prepareToRender()
glClearDepth(1.0f);
// Clear the screen
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-if ((!m_FboID[0]) || (!m_FboID[1]))
+if (!m_FboID)
{
// create a texture object
CreateTextureObj(m_iWidth, m_iHeight);
@@ -639,7 +639,7 @@ void OpenGLRender::prepareToRender()
}
else
{
-glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[m_iFboIdx % 2]);
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID);
}
// Clear the screen
@@ -658,7 +658,7 @@ void OpenGLRender::renderToBitmap()
{
SAL_INFO("chart2.opengl", "The frame buffer status is not
complete!");
}
-glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FboID[m_iFboIdx % 2]);
+glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FboID);
status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE)
{
@@ -667,12 +667,12 @@ void OpenGLRender::renderToBitmap()
glBlitFramebuffer(0, 0 ,m_iWidth, m_iHeight, 0, 0,m_iWidth ,m_iHeight,
GL_COLOR_BUFFER_BIT, GL_LINEAR);
glBindFramebuffer(GL_READ_FRAMEBUFFER,0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER,0);
-glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[m_iFboIdx % 2]);
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID);
}
#if RENDER_TO_FILE
char fileName[256] = {0};
-sprintf(fileName, "D:\\shaderout_%d_%d_%d.bmp", m_iWidth, m_iHeight,
m_iFboIdx);
+sprintf(fileName, "D:\\shaderout_%d_%d.bmp", m_iWidth, m_iHeight);
sal_uInt8 *buf = (sal_uInt8 *)malloc(m_iWidth * m_iHeight * 3 +
BMP_HEADER_LEN);
CreateBMPHeader(buf, m_iWidth, m_iHeight);
glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGR, GL_UNSIGNED_BYTE, buf +
BMP_HEADER_LEN);
@@ -695,8 +695,6 @@ void OpenGLRender::renderToBitmap()
unx::glXSwapBuffers(glWin.dpy, glWin.win);
#endif
glFlush();
-m_iFboIdx++;
-
}
int OpenGLRender::RenderTexture2FBO(GLuint TexID)
@@ -785,18 +783,8 @@ int OpenGLRender::RenderTexture(GLuint TexID)
int OpenGLRender::CreateTextureObj(int width, int height)
{
-glGenTextures(1, &m_TextureObj[0]);
-glBindTexture(GL_TEXTURE_2D, m_TextureObj[0]);
-glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
Re: OpenGL on Linux
Hi Markus, *, My output is in attachment. System: openSUSE 13.1 KDE AMD 7870 XT with latest stable proprietary drivers (AMD Catalyst 13.12 - Software version 13.251) Cheers, 2014/1/11 Markus Mohrhard > Hey, > > I'm currently working on integrating the chart-opengl2 branch into master > and would like to make it available on linux soon after that. Currently the > feature is developed on Windows and produces runtime problems. > > Sadly Mesa is quite far behind the OpenGL specification (Mesa 10 just > supports 3.3 and our RHEL 5 baseline is still in OpenGL 1.x) > > Could some of you please send me the output of glxinfo to provide a > picture which OpenGL versions are available and more importantly which > OpenGL extensions are supported? > > This helps me to determine which OpenGL features I can use and have an > approximation how many systems are not supported in the chart-opengl2 > branch. I'm both interested in output from systems with the opensource > drivers but even more in systems using the official drivers from > Intel/Nvidia/AMD. > > Thanks a lot for your help, > Markus > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > -- Efe Gürkan YALAMAN http://about.me/efegurkan name of display: :0 display: :0 screen: 0 direct rendering: Yes server glx vendor string: ATI server glx version string: 1.4 server glx extensions: GLX_ARB_multisample, GLX_EXT_import_context, GLX_EXT_texture_from_pixmap, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_OML_swap_method, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_visual_select_group, GLX_SGI_make_current_read, GLX_SGI_swap_control client glx vendor string: ATI client glx version string: 1.4 client glx extensions: GLX_AMD_gpu_association, GLX_ARB_create_context, GLX_ARB_create_context_profile, GLX_ARB_fbconfig_float, GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_buffer_age, GLX_EXT_framebuffer_sRGB, GLX_EXT_import_context, GLX_EXT_swap_control, GLX_EXT_texture_from_pixmap, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_allocate_memory, GLX_MESA_copy_sub_buffer, GLX_MESA_swap_control, GLX_MESA_swap_frame_usage, GLX_NV_swap_group, GLX_OML_swap_method, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_swap_barrier, GLX_SGIX_swap_group, GLX_SGIX_visual_select_group, GLX_SGI_make_current_read, GLX_SGI_swap_control, GLX_SGI_video_sync GLX version: 1.4 GLX extensions: GLX_ARB_create_context, GLX_ARB_create_context_profile, GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_buffer_age, GLX_EXT_import_context, GLX_EXT_swap_control, GLX_EXT_texture_from_pixmap, GLX_EXT_visual_info, GLX_EXT_visual_rating, GLX_MESA_swap_control, GLX_NV_swap_group, GLX_OML_swap_method, GLX_SGIS_multisample, GLX_SGIX_fbconfig, GLX_SGIX_pbuffer, GLX_SGIX_swap_barrier, GLX_SGIX_swap_group, GLX_SGIX_visual_select_group, GLX_SGI_make_current_read, GLX_SGI_swap_control, GLX_SGI_video_sync OpenGL vendor string: Advanced Micro Devices, Inc. OpenGL renderer string: AMD Radeon HD 7800 Series OpenGL core profile version string: 4.3.12618 Core Profile Context 13.251 OpenGL core profile shading language version string: 4.30 OpenGL core profile context flags: (none) OpenGL core profile profile mask: core profile OpenGL core profile extensions: GL_AMDX_debug_output, GL_AMD_blend_minmax_factor, GL_AMD_conservative_depth, GL_AMD_debug_output, GL_AMD_depth_clamp_separate, GL_AMD_draw_buffers_blend, GL_AMD_interleaved_elements, GL_AMD_multi_draw_indirect, GL_AMD_name_gen_delete, GL_AMD_performance_monitor, GL_AMD_pinned_memory, GL_AMD_query_buffer_object, GL_AMD_sample_positions, GL_AMD_seamless_cubemap_per_texture, GL_AMD_shader_atomic_counter_ops, GL_AMD_shader_stencil_export, GL_AMD_shader_stencil_value_export, GL_AMD_shader_trace, GL_AMD_shader_trinary_minmax, GL_AMD_sparse_texture, GL_AMD_stencil_operation_extended, GL_AMD_texture_cube_map_array, GL_AMD_texture_texture4, GL_AMD_transform_feedback3_lines_triangles, GL_AMD_transform_feedback4, GL_AMD_vertex_shader_layer, GL_AMD_vertex_shader_viewport_index, GL_ARB_ES2_compatibility, GL_ARB_ES3_compatibility, GL_ARB_arrays_of_arrays, GL_ARB_base_instance, GL_ARB_blend_func_extended, GL_ARB_clear_buffer_object, GL_ARB_color_buffer_float, GL_ARB_compressed_texture_pixel_storage, GL_ARB_compute_shader, GL_ARB_conservative_depth, GL_ARB_copy_buffer, GL_ARB_copy_image, GL_ARB_debug_output, GL_ARB_depth_buffer_float, GL_ARB_depth_clamp, GL_ARB_depth_texture, GL_ARB_draw_buffers, GL_ARB_draw_buffers_blend, GL_ARB_draw_elements_base_vertex, GL_ARB_draw_indirect, GL_ARB_draw_instanced, GL_ARB_explicit_attrib_location, GL_ARB_explicit_uniform_location, GL_ARB
Re: OpenGL on Linux
Hi Markus, Here's glxinfo output on my nVidia Geforce GTX 460 with binary drivers: http://pastebin.com/raw.php?i=Uh2rYufS Regards, Ruslan On Sat, Jan 11, 2014 at 9:54 PM, Markus Mohrhard wrote: > Hey, > > I'm currently working on integrating the chart-opengl2 branch into master > and would like to make it available on linux soon after that. Currently the > feature is developed on Windows and produces runtime problems. > > Sadly Mesa is quite far behind the OpenGL specification (Mesa 10 just > supports 3.3 and our RHEL 5 baseline is still in OpenGL 1.x) > > Could some of you please send me the output of glxinfo to provide a picture > which OpenGL versions are available and more importantly which OpenGL > extensions are supported? > > This helps me to determine which OpenGL features I can use and have an > approximation how many systems are not supported in the chart-opengl2 > branch. I'm both interested in output from systems with the opensource > drivers but even more in systems using the official drivers from > Intel/Nvidia/AMD. > > Thanks a lot for your help, > Markus > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/moggi/chart-opengl-work'
New branch 'private/moggi/chart-opengl-work' available with the following commits: commit 3b7eef525a778e1f90692153bd7b134da8acee44 Author: Markus Mohrhard Date: Sun Jan 12 15:16:58 2014 +0100 next step Change-Id: I4307175107bc5ead4e74ee9fa9acfc6375e8260e commit e2ab0a7a2a4562af3bac65ebaf212e69917a1a5d Author: Markus Mohrhard Date: Sun Jan 12 14:48:12 2014 +0100 one more error Change-Id: I7a40d5583a76d0b553a828bd2657c77fdca0f59a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OpenGL on Linux
Fedora 20 x86_64 http://pastebin.com/WTsH4S5K On 01/11/2014 03:54 PM, Markus Mohrhard wrote: Hey, I'm currently working on integrating the chart-opengl2 branch into master and would like to make it available on linux soon after that. Currently the feature is developed on Windows and produces runtime problems. Sadly Mesa is quite far behind the OpenGL specification (Mesa 10 just supports 3.3 and our RHEL 5 baseline is still in OpenGL 1.x) Could some of you please send me the output of glxinfo to provide a picture which OpenGL versions are available and more importantly which OpenGL extensions are supported? This helps me to determine which OpenGL features I can use and have an approximation how many systems are not supported in the chart-opengl2 branch. I'm both interested in output from systems with the opensource drivers but even more in systems using the official drivers from Intel/Nvidia/AMD. Thanks a lot for your help, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/moggi/debug-opengl' - 2 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit fd4d9bfa56f77bd32180110025914ad85895b5ce
Author: Markus Mohrhard
Date: Sun Jan 12 14:42:18 2014 +0100
ahh, think error
Change-Id: I400115ad802c1d00ec5f99e4f5fc952938de450a
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index e3868b6..ae784f2 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -551,7 +551,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int
listLength)
m_fPicBottom = std::min(m_fPicBottom, actualY);
m_fPicTop = std::max(m_fPicTop, actualY);
-if (m_Line2DPointList.size() == size_t((listLength * 3) - 1))
+if (m_Line2DPointList.size() == size_t(listLength * 3))
{
m_Line2DShapePointList.push_back(m_Line2DPointList);
}
@@ -1648,7 +1648,7 @@ int OpenGLRender::SetArea2DShapePoint(float x, float y,
int listLength)
m_fPicBottom = std::min(m_fPicBottom, actualY);
m_fPicTop = std::max(m_fPicTop, actualY);
-if (m_Area2DPointList.size() == size_t((listLength * 3) -1))
+if (m_Area2DPointList.size() == size_t(listLength * 3))
{
m_Area2DShapePointList.push_back(m_Area2DPointList);
}
commit 4b039738da3366239a69c3efa69091a51fbc7abc
Author: Markus Mohrhard
Date: Sun Jan 12 14:40:11 2014 +0100
fix code for writting png files
Change-Id: I96244b99b2f5a9f22ca09c133687661b06229359
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index a5592d9..e3868b6 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -45,9 +45,13 @@ using namespace com::sun::star;
using namespace std;
#define RENDER_TO_FILE 0
-#define DEBUG_PNG 0
+#define DEBUG_PNG 1
#define BMP_HEADER_LEN 54
+#if DEBUG_PNG
+#include
+#endif
+
#define OPENGL_SHADER( ... )# __VA_ARGS__
#define GL_PI 3.14159f
___
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/ui/view/output2.cxx | 27 +++
1 file changed, 3 insertions(+), 24 deletions(-)
New commits:
commit f08c1edc0a99e0c29fb1614162d3e88c5660e092
Author: Abdulaziz A Alayed
Date: Sun Jan 12 16:02:37 2014 +0300
fdo#32530 calc:alignment depend on 1st char direct
depending on the first char text direction we'll
use the appropriate text alignment as Mr:Eyal suggest.
and what Mr:Eike have done before.
Change-Id: I87ead619e9eb0c001e4bbd701cb97232fa1da854
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 9c09b5c..911cc11 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1405,12 +1405,9 @@ bool beginsWithRTLCharacter(const OUString& rStr)
right alignment is returned.
*/
static SvxCellHorJustify getAlignmentFromContext( SvxCellHorJustify eInHorJust,
-bool bCellIsValue, const OUString& rText,
-const ScPatternAttr& rPattern, const SfxItemSet* pCondSet,
-const ScDocument* pDoc, SCTAB nTab )
+bool bCellIsValue, const OUString& rText)
{
SvxCellHorJustify eHorJustContext = eInHorJust;
-bool bUseWritingDirection = false;
if (eInHorJust == SVX_HOR_JUSTIFY_STANDARD)
{
// fdo#32530: Default alignment depends on value vs
@@ -1419,23 +1416,6 @@ static SvxCellHorJustify getAlignmentFromContext(
SvxCellHorJustify eInHorJust,
eHorJustContext = bCellIsValue ? SVX_HOR_JUSTIFY_LEFT :
SVX_HOR_JUSTIFY_RIGHT;
else if (bCellIsValue)
eHorJustContext = SVX_HOR_JUSTIFY_RIGHT;
-else
-bUseWritingDirection = true;
-}
-
-if (bUseWritingDirection ||
-eInHorJust == SVX_HOR_JUSTIFY_BLOCK || eInHorJust ==
SVX_HOR_JUSTIFY_REPEAT)
-{
-sal_uInt16 nDirection = lcl_GetValue( rPattern, ATTR_WRITINGDIR, pCondSet);
-if (nDirection == FRMDIR_HORI_LEFT_TOP || nDirection ==
FRMDIR_VERT_TOP_LEFT)
-eHorJustContext = SVX_HOR_JUSTIFY_LEFT;
-else if (nDirection == FRMDIR_ENVIRONMENT)
-{
-SAL_WARN_IF( !pDoc, "sc.ui", "getAlignmentFromContext -
pDoc==NULL");
-eHorJustContext = (pDoc && pDoc->IsLayoutRTL(nTab)) ?
SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT;
-}
-else
-eHorJustContext = SVX_HOR_JUSTIFY_RIGHT;
}
return eHorJustContext;
}
@@ -1714,8 +1694,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
bCellIsValue = pFCell->IsRunning() ||
pFCell->IsValue();
}
-eOutHorJust = getAlignmentFromContext( aVars.GetHorJust(),
bCellIsValue, aVars.GetString(),
-*pPattern, pCondSet, mpDoc, nTab);
+eOutHorJust = getAlignmentFromContext( aVars.GetHorJust(),
bCellIsValue, aVars.GetString());
bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust()
== SVX_HOR_JUSTIFY_BLOCK );
// #i111387# #o11817313# disable automatic line breaks
only for "General" number format
@@ -4644,7 +4623,7 @@ void ScOutputData::DrawEdit(sal_Bool bPixelToLogic)
DrawEditParam aParam(pPattern, pCondSet,
lcl_SafeIsValue(aCell));
aParam.meHorJustContext = getAlignmentFromContext(
aParam.meHorJustAttr,
-aParam.mbCellIsValue, aStr, *pPattern,
pCondSet, mpDoc, nTab);
+aParam.mbCellIsValue, aStr);
aParam.meHorJustResult = (aParam.meHorJustAttr ==
SVX_HOR_JUSTIFY_BLOCK) ?
SVX_HOR_JUSTIFY_BLOCK :
aParam.meHorJustContext;
aParam.mbPixelToLogic = bPixelToLogic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/debug-opengl' - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit e5124ca12a22ddc0b54c82eaded68339d8c48d81
Author: Markus Mohrhard
Date: Sun Jan 12 14:19:36 2014 +0100
try to fix line rendering
The line rendering was not associated with a OpenGL program. This
resulted in runtime errros.
Change-Id: If0d0f015c3505eda908156743ce8bd6a43f644e4
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 2e6b176..a5592d9 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -559,6 +559,11 @@ int OpenGLRender::RenderLine2FBO(int)
CHECK_GL_ERROR();
glLineWidth(m_fLineWidth);
size_t listNum = m_Line2DShapePointList.size();
+PosVecf3 trans = {0.0f, 0.0f, 0.0f};
+PosVecf3 angle = {0.0f, 0.0f, 0.0f};
+PosVecf3 scale = {1.0f, 1.0f, 1.0f};
+MoveModelf(trans, angle, scale);
+m_MVP = m_Projection * m_View * m_Model;
for (size_t i = 0; i < listNum; i++)
{
Line2DPointList &pointList = m_Line2DShapePointList.front();
@@ -571,16 +576,18 @@ int OpenGLRender::RenderLine2FBO(int)
glUseProgram(m_Line2DProID);
CHECK_GL_ERROR();
-glUniform4fv(m_Line2DColorID, 1, &m_Line2DColor[0]);
+glUniform4fv(m_2DColorID, 1, &m_Line2DColor[0]);
+CHECK_GL_ERROR();
+glUniformMatrix4fv(m_MatrixID, 1, GL_FALSE, &m_MVP[0][0]);
CHECK_GL_ERROR();
// 1rst attribute buffer : vertices
-glEnableVertexAttribArray(m_Line2DVertexID);
+glEnableVertexAttribArray(m_2DVertexID);
CHECK_GL_ERROR();
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR();
glVertexAttribPointer(
-m_Line2DVertexID, // attribute. No particular
reason for 0, but must match the layout in the shader.
+m_2DVertexID, // attribute. No particular reason
for 0, but must match the layout in the shader.
3, // size
GL_FLOAT, // type
GL_FALSE, // normalized?
@@ -589,7 +596,7 @@ int OpenGLRender::RenderLine2FBO(int)
);
glDrawArrays(GL_LINE_STRIP, 0, pointList.size()/3); // 12*3 indices
starting at 0 -> 12 triangles
CHECK_GL_ERROR();
-glDisableVertexAttribArray(m_Line2DWholeVertexID);
+glDisableVertexAttribArray(m_2DVertexID);
CHECK_GL_ERROR();
glUseProgram(0);
CHECK_GL_ERROR();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/debug-opengl' - 6 commits - chart2/source
chart2/source/view/main/OpenGLRender.cxx | 131 +--
chart2/source/view/main/OpenGLRender.hxx | 19 +---
2 files changed, 62 insertions(+), 88 deletions(-)
New commits:
commit 9254d8e84e5cbbcd4fd24802d416a180c3b1ed5a
Author: Markus Mohrhard
Date: Sun Jan 12 13:46:46 2014 +0100
more formatting and TODO comments
for GL_QUADS see for example
http://stackoverflow.com/questions/6644099/what-is-so-bad-about-gl-quads
Change-Id: Ife53f1ac09125bc7e42c8aa91c53d7e7991ac0bf
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index f3786a1..2e6b176 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -718,6 +718,7 @@ int OpenGLRender::RenderTexture2FBO(GLuint TexID)
);
glBindTexture(GL_TEXTURE_2D, TexID);
glUniform1i(m_RenderTexID, 0);
+//TODO: moggi: get rid fo GL_QUADS
glDrawArrays(GL_QUADS, 0, 4);
glDisableVertexAttribArray(m_RenderTexCoordID);
glDisableVertexAttribArray(m_RenderVertexID);
@@ -757,6 +758,7 @@ int OpenGLRender::RenderTexture(GLuint TexID)
);
glBindTexture(GL_TEXTURE_2D, TexID);
glUniform1i(m_RenderTexID, 0);
+//TODO: moggi: get rid fo GL_QUADS
glDrawArrays(GL_QUADS, 0, 4);
glDisableVertexAttribArray(m_RenderTexCoordID);
glDisableVertexAttribArray(m_RenderVertexID);
@@ -1083,7 +1085,7 @@ bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR
pfd)
0,0
};
// First We Check To See If We Can Get A Pixel Format For 4 Samples
-valid =
wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats);
+valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1,
&pixelFormat, &numFormats);
// If We Returned True, And Our Format Count Is Greater Than 1
if (valid && numFormats >= 1)
{
@@ -1097,7 +1099,7 @@ bool OpenGLRender::InitMultisample(PIXELFORMATDESCRIPTOR
pfd)
}
// Our Pixel Format With 4 Samples Failed, Test For 2 Samples
iAttributes[19] = 2;
-valid =
wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats);
+valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1,
&pixelFormat, &numFormats);
if (valid && numFormats >= 1)
{
mbArbMultisampleSupported = true;
@@ -1272,7 +1274,6 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y,
float directionX, float d
m_Bubble2DPointList.xScale = directionX / 10.0f;
m_Bubble2DPointList.yScale = directionY / 10.0f;
-
m_fPicLeft = std::min(m_fPicLeft, actualX);
m_fPicRight = std::max(m_fPicRight, actualX);
m_fPicBottom = std::min(m_fPicBottom, actualY);
@@ -1397,6 +1398,7 @@ int OpenGLRender::RenderRectangleShape()
0, // stride
(void*)0// array buffer offset
);
+
// 2nd attribute buffer : color
glEnableVertexAttribArray(m_BackgroundColorID);
glBindBuffer(GL_ARRAY_BUFFER, m_ColorBuffer);
@@ -1408,6 +1410,7 @@ int OpenGLRender::RenderRectangleShape()
0, // stride
(void*)0// array buffer offset
);
+//TODO: moggi: get rid of GL_QUADS
glDrawArrays(GL_QUADS, 0, 4);
glDisableVertexAttribArray(m_BackgroundVertexID);
glDisableVertexAttribArray(m_BackgroundColorID);
@@ -1573,6 +1576,7 @@ int OpenGLRender::RenderTextShape()
//texture
glBindTexture(GL_TEXTURE_2D, textInfo.texture);
glUniform1i(m_TextTexID, 0);
+//TODO: moggi: get rid fo GL_QUADS
glDrawArrays(GL_QUADS, 0, 4);
glDisableVertexAttribArray(m_TextTexCoordID);
glDisableVertexAttribArray(m_TextVertexID);
commit b2f278bd4eeeffa4a5094acefc1eb7da8aa7cd5c
Author: Markus Mohrhard
Date: Sun Jan 12 13:41:42 2014 +0100
more clean-up
Change-Id: Ie774afc8ab2c881c5f82be286c84fb3eb37821c1
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 980cd50..f3786a1 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -615,13 +615,13 @@ void OpenGLRender::prepareToRender()
CreateRenderObj(m_iWidth, m_iHeight);
//create fbo
CreateFrameBufferObj();
-if (m_iArbMultisampleSupported)
+if (mbArbMultisampleSupported)
{
CreateMultiSampleFrameBufObj();
}
}
//bind fbo
-if (m_iArbMultisampleSupported)
+if (mbArbMultisampleSupported)
{
glBindFramebuffer(GL_FRAMEBUFFER,m_frameBufferMS);
}
@@ -638,7 +638,7 @@ void OpenGLRender::prepareToRender()
void OpenGLRender::renderToBitmap()
{
-if (m_iArbMultisampleSupported)
+if (mbArbMultisampleSupported)
{
GLenum status;
glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -909,7 +909,7 @@ OpenGLRender::Op
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - odk/docs odk/examples odk/index.html
odk/docs/install.html | 22 +++--- odk/docs/tools.html|5 ++--- odk/examples/examples.html |4 ++-- odk/index.html |4 ++-- 4 files changed, 17 insertions(+), 18 deletions(-) New commits: commit 8cae5708c761ba10a87f3616a669df03e6ba0039 Author: Tsutomu Uchino Date: Sun Jan 12 12:02:24 2014 + #i124015# fix errors in html files of SDK diff --git a/odk/docs/install.html b/odk/docs/install.html index e3a12cb..5f94d66 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -68,7 +68,7 @@ - Apache OpenOffice %PRODUCT_RELEASE% installation + Apache OpenOffice %PRODUCT_RELEASE% installation The SDK works on top of an existing office installation and uses the same libraries as the office installation. @@ -77,7 +77,7 @@ - JDK (1.5 or higher) + JDK (1.5 or higher) A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on http://java.sun.com/products"; title="link to the Java SDK download page (online)">http://java.sun.com/products. Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only. @@ -87,7 +87,7 @@ - C++ compiler + C++ compiler A C++ compiler is necessary for developing C++ components or applications. UNO depends on a compiler dependent language binding, so that we use the appropriate compiler where a language binding @@ -106,13 +106,13 @@ Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022) - Note: The C++ compiler is optional! If you use the Express edition you have to ensure that the http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en";>Microsoft Visual Studio 2008 Redistributable Package is also installed. You can download this package from Microsoft directly. + Note: The C++ compiler is optional! If you use the Express edition you have to ensure that the http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en";>Microsoft Visual Studio 2008 Redistributable Package is also installed. You can download this package from Microsoft directly. - Microsoft .NET Framework SDK version 1.0 or higher + Microsoft .NET Framework SDK version 1.0 or higher The SDK is required for building CLI applications. That is, programs written in languages, such as C# or VB.NET. Note: The .NET Framework is optional! @@ -121,7 +121,7 @@ - GNU make (3.79.1 or higher) + GNU make (3.79.1 or higher) GNU make is used to build the examples of the SDK. GNU make is available from http://www.gnu.org"; title="link to www.gnu.org (online)">http://www.gnu.org. It can be ftped via ftp://ftp.gnu.org/gnu/make"; title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make Note: Windows user can find an executable of gnu make under http://www.mingw.org/wiki/Getting_Started"; title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started (see the mingw32-make link under "Manual Installation"). Do not use the Cygwin make, because it does not @@ -131,7 +131,7 @@ - zip tool (2.3 or higher) + zip tool (2.3 or higher) The zip tool is used to create UNO packages. zip is a new requirement to make the SDK independent of a Java SDK. If you do not have these already, you can download them from http://www.info-zip.org"; title="link to www.ubfi-zip.org (online)">http://www.info-zip.org. Note: The cygwin zip.exe does not work for the build under @@ -141,7 +141,7 @@ - cat and sed tools + cat and sed tools The cat and set tools are used to create some extensions. Note for Windows users: If you do not have these already, you can download them from http://sourceforge.net/projects/unxutils/files/latest/downloadg"; title="link to UnxUtils (online)">http://sourceforge.net/projects/unxutils/files/latest/download. @@ -150,7 +150,7 @@ - Boost (Unix only and optional) + Boost (Unix only and optional) The
[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/unx vcl/win
vcl/inc/salwtype.hxx|1 -
vcl/osx/salframeview.mm |3 ---
vcl/unx/generic/app/i18n_cb.cxx |1 -
vcl/unx/generic/app/i18n_ic.cxx |3 ---
vcl/unx/generic/window/salframe.cxx |3 ---
vcl/unx/gtk/window/gtksalframe.cxx |3 ---
vcl/win/source/window/salframe.cxx |2 --
7 files changed, 16 deletions(-)
New commits:
commit 3709fe0e2e9336787f3d18b8ae4a1ff2ef5608e6
Author: Caolán McNamara
Date: Sat Jan 11 21:01:19 2014 +
mnDeltaStart is unused
Change-Id: I4f970a150b8ecf6e5631c89ae78ae97134c78d7c
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index de9e2a4..770c025 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -177,7 +177,6 @@ struct SalExtTextInputEvent
OUStringmaText; // Text
const sal_uInt16* mpTextAttr; // Text-Attribute
sal_uLong mnCursorPos;// Cursor-Position
-sal_uLong mnDeltaStart; // Start-Position of last change
sal_uInt8 mnCursorFlags; // EXTTEXTINPUT_CURSOR_xxx
sal_BoolmbOnlyCursor; // sal_True: Only Cursor-Position has
been changed
};
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 81ae1cd..cc4b768 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1084,7 +1084,6 @@ private:
aEvent.maText = aInsertString;
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = aInsertString.getLength();
-aEvent.mnDeltaStart = 0;
aEvent.mnCursorFlags= 0;
aEvent.mbOnlyCursor = FALSE;
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent );
@@ -1099,7 +1098,6 @@ private:
aEvent.maText = OUString();
aEvent.mpTextAttr = NULL;
aEvent.mnCursorPos = 0;
-aEvent.mnDeltaStart = 0;
aEvent.mnCursorFlags= 0;
aEvent.mbOnlyCursor = FALSE;
mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, &aEvent );
@@ -1612,7 +1610,6 @@ private:
int len = [aString length];
SalExtTextInputEvent aInputEvent;
aInputEvent.mnTime = mpFrame->mnLastEventTime;
-aInputEvent.mnDeltaStart = 0;
aInputEvent.mbOnlyCursor = FALSE;
if( len > 0 ) {
NSString *pString = [aString string];
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 6c34568..b5c2f77 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -386,7 +386,6 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
pPreeditData->aInputEv.maText =
OUString(pPreeditData->aText.pUnicodeBuffer,
pPreeditData->aText.nLength);
pPreeditData->aInputEv.mnCursorFlags= 0; // default: make cursor
visible
-pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first;
pPreeditData->aInputEv.mbOnlyCursor = False;
if ( pPreeditData->eState == ePreeditStatusActive && pPreeditData->pFrame )
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 3348a4f..345f4f7 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -50,7 +50,6 @@ static void sendEmptyCommit( SalFrame* pFrame )
aEmptyEv.maText = "";
aEmptyEv.mnCursorPos= 0;
aEmptyEv.mnCursorFlags = 0;
-aEmptyEv.mnDeltaStart = 0;
aEmptyEv.mbOnlyCursor = False;
pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
if( ! aDel.isDeleted() )
@@ -170,7 +169,6 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame
*pFrame ) :
maClientData.aInputEv.mnTime= 0;
maClientData.aInputEv.mpTextAttr= NULL;
maClientData.aInputEv.mnCursorPos = 0;
-maClientData.aInputEv.mnDeltaStart = 0;
maClientData.aInputEv.mnCursorFlags = 0;
maClientData.aInputEv.mbOnlyCursor = sal_False;
@@ -570,7 +568,6 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText,
sal_Size nLength)
aTextEvent.mnCursorPos = nLength;
aTextEvent.maText= OUString(pText, nLength);
aTextEvent.mnCursorFlags = 0;
-aTextEvent.mnDeltaStart = 0;
aTextEvent.mbOnlyCursor = False;
maClientData.pFrame->CallCallback(SALEVENT_EXTTEXTINPUT,
(void*)&aTextEvent);
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index ee04b72..ee1abf8 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2974,7 +2974,6 @@ void X11SalFrame::beginUnicodeSequence()
aEv.maText = rSeq;
aEv.mpTextAttr = &nTextAttr;
aEv.mnCursorPos = 0;
-aEv.mnDeltaStart= 0;
aEv.mnCursorFlags = 0;
aEv.mbOnlyCursor= sal_False;
@@ -3004,7 +3003,6 @@ bool X11SalFr
RE: Annoying green square in top left hand corner of Writer document window
Didn't know that myself.. good to know ! :) Adam Fyne Office: +972-77-517-5008 Twitter | LinkedIn | Facebook | Blog -Original Message- From: libreoffice-boun...@lists.freedesktop.org [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Tor Lillqvist Sent: Friday, January 10, 2014 11:31 AM To: Alex Thurgood Cc: libreoffice-dev Subject: Re: Annoying green square in top left hand corner of Writer document window It is an intentional debugging aid and is present only when LO is built with --enable-dbgutil. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-21'
Tag 'suse-4.0-21' created by Andras Timar at 2014-01-12 08:19 -0800 suse-4.0-21 Changes since suse-4.0-20-17: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-21'
Tag 'suse-4.0-21' created by Andras Timar at 2014-01-12 08:19 -0800 suse-4.0-21 Changes since libreoffice-4.0.2.2-10: --- 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/suse-4.0-21'
Tag 'suse-4.0-21' created by Andras Timar at 2014-01-12 08:19 -0800 suse-4.0-21 Changes since libreoffice-4.0.2.2-4: --- 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/suse-4.0-21'
Tag 'suse-4.0-21' created by Andras Timar at 2014-01-12 08:19 -0800 suse-4.0-21 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
