[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter.cxx |4 +-
sw/source/core/crsr/callnk.cxx | 10 ++---
sw/source/core/crsr/crsrsh.cxx |4 +-
sw/source/core/crsr/crstrvl.cxx |8 ++--
sw/source/core/crsr/findattr.cxx|6 +--
sw/source/core/crsr/findtxt.cxx | 12 +++
sw/source/core/crsr/swcrsr.cxx |7 +---
sw/source/core/doc/DocumentContentOperationsManager.cxx | 16 -
sw/source/core/doc/doc.cxx |9 ++---
sw/source/core/doc/doccomp.cxx | 10 ++---
sw/source/core/doc/docedt.cxx | 27 +++-
sw/source/core/doc/docfld.cxx |3 -
sw/source/core/doc/docglbl.cxx |4 +-
sw/source/core/doc/docnum.cxx |4 +-
sw/source/core/doc/docredln.cxx | 17 --
sw/source/core/doc/docsort.cxx |2 -
sw/source/core/docnode/ndtbl.cxx|2 -
sw/source/core/docnode/node.cxx |5 +-
sw/source/core/docnode/nodes.cxx| 10 ++---
sw/source/core/edit/edattr.cxx |4 +-
sw/source/core/edit/edfmt.cxx |2 -
sw/source/core/edit/editsh.cxx |2 -
sw/source/core/text/EnhancedPDFExportHelper.cxx |3 -
sw/source/core/tox/txmsrt.cxx |2 -
sw/source/core/undo/rolbck.cxx |3 -
sw/source/core/undo/unattr.cxx |3 -
sw/source/core/undo/undobj1.cxx |6 +--
sw/source/core/undo/unins.cxx |4 +-
sw/source/core/unocore/unoobj2.cxx |5 +-
sw/source/filter/ww8/docxsdrexport.cxx |2 -
sw/source/filter/ww8/ww8par.cxx |2 -
31 files changed, 90 insertions(+), 108 deletions(-)
New commits:
commit 3c95503cefaf996faec1adb87e296c1b8a71d221
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 19 09:03:34 2014 +0100
Use SwNode::GetTxtNode()
Change-Id: Icf3e1013d5eba5702badf19aa6c1f5e6708ed154
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 4fa1680..d79b6b3 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -239,8 +239,8 @@ void SwUiWriterTest::testImportRTF()
CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
sal_uLong nIndex = pWrtShell-GetCrsr()-GetNode().GetIndex();
-CPPUNIT_ASSERT_EQUAL(OUString(fooHello world!),
static_castSwTxtNode*(pDoc-GetNodes()[nIndex - 1])-GetTxt());
-CPPUNIT_ASSERT_EQUAL(OUString(bar),
static_castSwTxtNode*(pDoc-GetNodes()[nIndex])-GetTxt());
+CPPUNIT_ASSERT_EQUAL(OUString(fooHello world!), pDoc-GetNodes()[nIndex
- 1]-GetTxtNode()-GetTxt());
+CPPUNIT_ASSERT_EQUAL(OUString(bar),
pDoc-GetNodes()[nIndex]-GetTxtNode()-GetTxt());
}
void SwUiWriterTest::testExportRTF()
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 6c036c3..6725f43 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -56,7 +56,7 @@ SwCallLink::SwCallLink( SwCrsrShell rSh )
bHasSelection = ( *pCrsr-GetPoint() != *pCrsr-GetMark() );
if( rNd.IsTxtNode() )
-nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(),
static_castSwTxtNode(rNd), nCntnt,
+nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(),
*rNd.GetTxtNode(), nCntnt,
!rShell.ActionPend() );
else
{
@@ -151,7 +151,7 @@ SwCallLink::~SwCallLink()
{
// If travelling with left/right only and the frame is
// unchanged (columns!) then check text hints.
-if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(),
static_castSwTxtNode(*pCNd), nAktCntnt,
+if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(),
*pCNd-GetTxtNode(), nAktCntnt,
!rShell.ActionPend() )
(( nCmp = nCntnt ) + 1 == nAktCntnt || // Right
nCntnt -1 == ( nCmp = nAktCntnt )) )// Left
@@ -159,9 +159,9 @@ SwCallLink::~SwCallLink()
if( nCmp == nAktCntnt pCurCrsr-HasMark() ) // left select
++nCmp;
-if ( static_castSwTxtNode*(pCNd)-HasHints() )
+if ( pCNd-GetTxtNode()-HasHints() )
{
-const SwpHints rHts =
static_castSwTxtNode*(pCNd)-GetSwpHints();
+const SwpHints rHts = pCNd-GetTxtNode()-GetSwpHints();
for( size_t n = 0; n rHts.Count(); ++n )
{
@@
[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/plugins jvmfwk/source
jvmfwk/inc/vendorplugin.hxx | 22 ++
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 73 +++-
jvmfwk/source/framework.cxx | 38 +-
3 files changed, 58 insertions(+), 75 deletions(-)
New commits:
commit 772a36932e4803beaffdad87200e0162e1020e94
Author: Michael Weghorn m.wegh...@posteo.de
Date: Tue Nov 18 17:40:13 2014 +
changed type of parameters from rtl_uString to OUString
changed type of several parameters of the functions
jfw_plugin_getAllJavaInfos and jfw_plugin_getJavaInfoByPath
from rtl_uString to OUString
Change-Id: I80feb311542e6ccded9f9924f800c75a7e14a1e7
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 02ea040..3fd4d35 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -36,7 +36,7 @@
what version a JRE must have then it relies on certain features and bug
fixes of that version. Because a version 1.4.2_1 from vendor X may contain
different fixes as the same version from vendor Y it is important to see
- version an vendor as one entity. One without the other does not guarantee
+ version and vendor as one entity. One without the other does not guarantee
the existence of a particular set of features or bug fixes. An
implementation
of this API may support multiple vendors. /p
p
@@ -83,11 +83,9 @@ typedef enum
[in] only JREs from this vendor are examined. This parameter always
contains
a vendor string. That is, the string it is not empty.
@param sMinVersion
-[in] represents the minimum version of a JRE. The string can be empty
but
-a null pointer is not allowed.
+[in] represents the minimum version of a JRE. The string can be empty.
@param sMaxVersion
-[in] represents the maximum version of a JRE. The string can be empty
but
-a null pointer is not allowed.
+[in] represents the maximum version of a JRE. The string can be empty.
@param arExcludeList
[in] contains a list of quot;badquot; versions. JREs which have one
of these
versions must not be returned by this function. It can be NULL.
@@ -111,9 +109,9 @@ typedef enum
version strings.
*/
javaPluginError jfw_plugin_getAllJavaInfos(
-rtl_uString *sVendor,
-rtl_uString *sMinVersion,
-rtl_uString *sMaxVersion,
+OUString const sVendor,
+OUString const sMinVersion,
+OUString const sMaxVersion,
rtl_uString * * arExcludeList,
sal_Int32 nSizeExcludeList,
JavaInfo*** parJavaInfo,
@@ -162,10 +160,10 @@ javaPluginError jfw_plugin_getAllJavaInfos(
a vendor which is not supported by this API implementation.
*/
javaPluginError jfw_plugin_getJavaInfoByPath(
-rtl_uString *sLocation,
-rtl_uString *sVendor,
-rtl_uString *sMinVersion,
-rtl_uString *sMaxVersion,
+OUString const sLocation,
+OUString const sVendor,
+OUString const sMinVersion,
+OUString const sMaxVersion,
rtl_uString * *arExcludeList,
sal_Int32 nSizeExcludeList,
JavaInfo ** ppInfo);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index dd6335e..d0dac26 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -210,11 +210,9 @@ extern C void JNICALL abort_handler()
@param aVendorInfo
[in] the object to be inspected whether it meets the version
requirements
@param sMinVersion
-[in] represents the minimum version of a JRE. The string can be empty
but
-a null pointer is not allowed.
+[in] represents the minimum version of a JRE. The string can be empty.
@param sMaxVersion
-[in] represents the maximum version of a JRE. The string can be empty
but
-a null pointer is not allowed.
+[in] represents the maximum version of a JRE. The string can be empty.
@param arExcludeList
[in] contains a list of quot;badquot; versions. JREs which have one
of these
versions must not be returned by this function. It can be NULL.
@@ -232,19 +230,16 @@ extern C void JNICALL abort_handler()
*/
javaPluginError checkJavaVersionRequirements(
rtl::ReferenceVendorBase const aVendorInfo,
-rtl_uString *sMinVersion,
-rtl_uString *sMaxVersion,
+OUString const sMinVersion,
+OUString const sMaxVersion,
rtl_uString * * arExcludeList,
sal_Int32 nLenList)
{
-OUString ouMinVer(sMinVersion);
-OUString ouMaxVer(sMaxVersion);
-
-if (!ouMinVer.isEmpty())
+if (!sMinVersion.isEmpty())
{
try
{
-if (aVendorInfo-compareVersions(ouMinVer) 0)
+if (aVendorInfo-compareVersions(sMinVersion) 0)
return JFW_PLUGIN_E_FAILED_VERSION;
}
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 5 commits - canvas/source vcl/source
canvas/source/opengl/ogl_canvascustomsprite.cxx |7 -
canvas/source/opengl/ogl_canvashelper.cxx | 32 ---
canvas/source/opengl/ogl_canvastools.cxx| 33 +---
canvas/source/opengl/ogl_canvastools.hxx|5 ++-
canvas/source/opengl/ogl_renderHelper.cxx | 13 +
canvas/source/opengl/ogl_spritedevicehelper.cxx |4 --
vcl/source/opengl/OpenGLHelper.cxx | 19 +++--
7 files changed, 57 insertions(+), 56 deletions(-)
New commits:
commit 293a54dd59928330baf1873e23f4cb61c73e33e0
Author: Michael Jaumann meta_...@yahoo.com
Date: Wed Nov 19 08:20:59 2014 +
unbind buffers, remove GlewInit()
Change-Id: I9304fa6ae3b02812d53c91dde0470d09b4cc3668
diff --git a/canvas/source/opengl/ogl_renderHelper.cxx
b/canvas/source/opengl/ogl_renderHelper.cxx
index 7bf6a94..1d1379b 100644
--- a/canvas/source/opengl/ogl_renderHelper.cxx
+++ b/canvas/source/opengl/ogl_renderHelper.cxx
@@ -11,7 +11,6 @@ namespace oglcanvas
}
void RenderHelper::InitOpenGL()
{
-GLenum err = glewInit();
//Load Shaders //
m_texManProgID =
OpenGLHelper::LoadShaders(textManipulatingVertexShader, textFragmentShader);
m_simpleProgID = OpenGLHelper::LoadShaders(simpleVertexShader,
textFragmentShader);
@@ -37,7 +36,7 @@ namespace oglcanvas
m_simplePosAttrb = glGetAttribLocation(m_simpleProgID ,vPosition);
m_texPosAttrb = glGetAttribLocation(m_texProgID ,vPosition);
-//glViewport(0, 0, m_iWidth, m_iHeight);
+glViewport(0, 0, m_iWidth, m_iHeight);
}
//Todo figgure out, which parameters i should use :)
void RenderHelper::SetVP(int width, int height)
@@ -77,8 +76,8 @@ namespace oglcanvas
glDrawArrays(mode, 0, sizeof(vertices) / sizeof(vertices[0]) /2);
glDisableVertexAttribArray(m_texPosAttrb);
-glUseProgram(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
+glUseProgram(0);
}
//Renders a TriangleStrip, Texture has to be stored in TextureUnit0
@@ -122,6 +121,7 @@ namespace oglcanvas
glDisableVertexAttribArray(m_simplePosAttrb);
glDisableVertexAttribArray(m_simpleUvAttrb);
+glBindBuffer(GL_ARRAY_BUFFER, 0);
glUseProgram(0);
}
@@ -164,6 +164,7 @@ namespace oglcanvas
glDrawArrays(mode, 0, sizeof(vertices) / sizeof(vertices[0]) /2);
glDisableVertexAttribArray(m_manPosAttrb);
+glBindBuffer(GL_ARRAY_BUFFER, 0);
glUseProgram(0);
}
}
\ No newline at end of file
commit 2dee7ecb904e956542a3d74cf28e8a52e2b1af60
Author: Michael Jaumann meta_...@yahoo.com
Date: Wed Nov 19 08:15:07 2014 +
assign lcl_drawPolyPolygon to maFunction
Change-Id: I58b465938e64fd44e1dd27b71c248a540dd3abbe
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx
b/canvas/source/opengl/ogl_canvashelper.cxx
index 33d5814..cd9823d 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -500,7 +500,7 @@ namespace oglcanvas
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon));
rAct.maPolyPolys.back().makeUnique(); // own copy, for thread
safety
- // rAct.maFunction = lcl_drawPolyPolygon;
+rAct.maFunction = lcl_drawPolyPolygon;
}
// TODO(P1): Provide caching here.
commit 0f8b4f8b9827cb726aa9c8eb604f95beda527cf4
Author: Michael Jaumann meta_...@yahoo.com
Date: Wed Nov 19 08:13:17 2014 +
renderOSD with renderHelper
Change-Id: I1acff597434f870504d58e699cb55c76080db15d
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 58b2561..6073e5a 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -127,6 +127,7 @@ namespace oglcanvas
bool CanvasCustomSprite::renderSprite()
{
+
if( ::basegfx::fTools::equalZero( mfAlpha ) )
return true;
@@ -152,6 +153,7 @@ namespace oglcanvas
const glm::mat4 translate =
glm::translate(glm::vec3(maPosition.getX(), maPosition.getY(), 0));
if( pBufferContext )
{
+
const glm::mat4 aGLTransform = glm::mat4(
maTransformation.m00, maTransformation.m10, 0, 0,
maTransformation.m01, maTransformation.m11, 0, 0,
@@ -225,7 +227,9 @@ namespace oglcanvas
}
glBindTexture(GL_TEXTURE_2D, 0);
+
}
+
// translate sprite to output position
pRenderHelper-SetModelAndMVP(translate);
GLfloat vertices[] = {-2, -2,
@@ -241,7 +245,8 @@ namespace oglcanvas
aVec.push_back(mfAlpha);
aVec.push_back(mfPriority);
aVec.push_back(maCanvasHelper.getRecordedActionCount());
-renderOSD( aVec, 10 );
+
+
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xilink.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 05362fd2dbb481b735e8b7e97288d842a6e3ec0b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 18 21:22:10 2014 +
coverity#1242708 Untrusted loop bound
Change-Id: Ic5af417ad38cafa46051789574239996a8845ffb
diff --git a/sc/source/filter/excel/xilink.cxx
b/sc/source/filter/excel/xilink.cxx
index 52e8a5a..51da063 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -272,6 +272,17 @@ XclImpExtName::MOper::MOper(svl::SharedStringPool rPool,
XclImpStream rStrm) :
{
SCSIZE nLastCol = rStrm.ReaduInt8();
SCSIZE nLastRow = rStrm.ReaduInt16();
+
+//assuming worse case scenario of nOp + one byte unistring len
+const size_t nMinRecordSize = 2;
+const size_t nMaxRows = rStrm.GetRecLeft() / (nMinRecordSize *
(nLastCol+1));
+if (nLastRow = nMaxRows)
+{
+SAL_WARN(sc, Parsing error: nMaxRows
+ max possible rows, but nLastRow index claimed,
truncating);
+nLastRow = nMaxRows-1;
+}
+
mxCached-Resize(nLastCol+1, nLastRow+1);
for (SCSIZE nRow = 0; nRow = nLastRow; ++nRow)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry
icon-themes/galaxy/links.txt |1 + icon-themes/tango/links.txt |1 + officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |3 +++ 3 files changed, 5 insertions(+) New commits: commit 2ab8eb20ce82649168af96c551476cdfeb31f4ff Author: Yousuf Philips philip...@hotmail.com Date: Wed Nov 19 09:58:32 2014 +0400 add an icon for calc's time number format Change-Id: Ife32075210af738e0e677f62ccad1ce29b236700 Reviewed-on: https://gerrit.libreoffice.org/12962 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index bc8ac25..337374d 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -14,6 +14,7 @@ cmd/lc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png cmd/lc_closepreview.png cmd/lc_closedoc.png cmd/sc_closepreview.png cmd/sc_closedoc.png +cmd/sc_numberformattime.png cmd/sc_timefield.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 3be83d5..5222f7b 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -135,6 +135,7 @@ cmd/sc_closepreview.png cmd/sc_closedoc.png cmd/lc_objectmirrorvertical.png cmd/sc_flipvertical.png cmd/lc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png +cmd/sc_numberformattime.png cmd/sc_timefield.png # Duplicates cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 7c8766a..2a1da27e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1645,6 +1645,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USTime/value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:NumberFormatIncDecimals oor:op=replace prop oor:name=Label oor:type=xs:string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/cmd/sc_colorscaleformatdialog.png |binary icon-themes/galaxy/cmd/sc_conddateformatdialog.png|binary icon-themes/galaxy/cmd/sc_conditionalformatdialog.png |binary icon-themes/galaxy/cmd/sc_conditionalformatmenu.png |binary icon-themes/galaxy/cmd/sc_databarformatdialog.png |binary icon-themes/galaxy/cmd/sc_iconsetformatdialog.png |binary 6 files changed New commits: commit a47a16cb2ec4ccb3c7b503c7726528b95c639406 Author: Yousuf Philips philip...@hotmail.com Date: Tue Nov 18 23:02:02 2014 +0400 Add small icons for conditional formatting to galaxy so they show in tango Change-Id: Id8b7615610b7eb190c64b88a157df7a498b9cd09 Reviewed-on: https://gerrit.libreoffice.org/12959 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/cmd/sc_colorscaleformatdialog.png b/icon-themes/galaxy/cmd/sc_colorscaleformatdialog.png new file mode 100644 index 000..94b8b63 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_colorscaleformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conddateformatdialog.png b/icon-themes/galaxy/cmd/sc_conddateformatdialog.png new file mode 100644 index 000..9b28083 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_conddateformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conditionalformatdialog.png b/icon-themes/galaxy/cmd/sc_conditionalformatdialog.png new file mode 100644 index 000..9b28083 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_conditionalformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png new file mode 100644 index 000..9b28083 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_conditionalformatmenu.png differ diff --git a/icon-themes/galaxy/cmd/sc_databarformatdialog.png b/icon-themes/galaxy/cmd/sc_databarformatdialog.png new file mode 100644 index 000..ecff4a1 Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_databarformatdialog.png differ diff --git a/icon-themes/galaxy/cmd/sc_iconsetformatdialog.png b/icon-themes/galaxy/cmd/sc_iconsetformatdialog.png new file mode 100644 index 000..2e42b9f Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_iconsetformatdialog.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bmpfast.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f857358d83e7c105271eb0e2c43f0b036f14f284
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Wed Nov 19 11:25:28 2014 +0800
fdo#86298 Avoid crash blending upside down Bitmaps of differing size
Change-Id: I3ed0dec7c2f8d80ca104f8ba8d47894ace582c0a
Reviewed-on: https://gerrit.libreoffice.org/12961
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 1764dc6..ff51c23 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -566,7 +566,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtrSRCFMT rSrcLine,
// source and destination don't match: upside down
if( (rSrcBuffer.mnFormat ^ rDstBuffer.mnFormat) BMP_FORMAT_TOP_DOWN )
{
-aDstLine.AddByteOffset( (rSrcBuffer.mnHeight - 1) * nDstLinestep );
+aDstLine.AddByteOffset( (rDstBuffer.mnHeight - 1) * nDstLinestep );
nDstLinestep = -nDstLinestep;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/UnpackedTarball_coinmp.mk |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit b943150fe84a0158546b6a00ee330ea503c02359 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Sun Oct 19 16:27:58 2014 +0200 coinmp: conditional patch Change-Id: I33927632173d422d04771f550721dba1767cded5 Reviewed-on: https://gerrit.libreoffice.org/12040 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index ef70c5c..95e40e7 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -21,9 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/werror-format-security.patch.0 \ external/coinmp/werror-undef.patch.0 \ external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ - $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \ + $(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \ + ) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ - $(if $(filter MSC,$(COM)),$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \ )) # vim: set noet sw=4 ts=4: ___ 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/optdlg/calcoptionsdlg.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 6635508ad59515311245245472f7a38eabab28cd Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 19 10:27:03 2014 +0100 -Werror,-Wabsolute-value (using integer absolute value function 'abs' when argument is of floating point type) Change-Id: I8c091049b44dd44ec44124055c160a024ec658a5 diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 750d859..3a4764e 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -7,6 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include sal/config.h + +#include cmath + #include calcconfig.hxx #include calcoptionsdlg.hxx #include docsh.hxx @@ -1049,7 +1053,7 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, ) // Handle TAN undefinedness. Use a relative epsilon for larger TAN values if (i = 16 i % 4 == 2) pDoc-SetValue(ScAddress(23,i,2), 0); -else if (abs(tan(d)) 10) +else if (std::abs(tan(d)) 10) pDoc-SetString(ScAddress(23,i,2), OUString(=IF(ABS(D) + is + -N + is + ) + sEpsilon + ,0,1)); else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest
gerritbot/send-daily-digest |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 2eb30f4f83c417e97095a87f99fa915c1fc86b39
Author: Mathias Michel m...@gmx.fr
Date: Wed Sep 24 00:23:58 2014 +0200
fdo#84227 Use only last patchset for modules
Change-Id: I5a1804507e1161aef2514dadb019d74eacfdae61
Reviewed-on: https://gerrit.libreoffice.org/11614
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Reviewed-by: Mathias M m...@gmx.fr
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 19cb5b5..1fea363 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -43,8 +43,7 @@ def get_digest(query):
change = json.loads(line)
if 'url' in change.keys():
if do_fresh: # we are in new changes
-fpaths = (set([fileobj['file'] for pset in change['patchSets']
-for fileobj in pset['files']]))
+fpaths = (set([fileobj['file'] for fileobj in
change['patchSets'][-1]['files']]))
fpaths.remove('/COMMIT_MSG')
# we assume gerrit replies with no leading slash
# if no subfolder, module is build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75467, which changed state. Bug 75467 Summary: OS X integration: selecting a file in Open File dialog adds resource fork, changes size and mod date (10.6/10.7) https://bugs.freedesktop.org/show_bug.cgi?id=75467 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/unoidl-read.cxx | 29 -
1 file changed, 20 insertions(+), 9 deletions(-)
New commits:
commit f9fb1fcb8e0558a719cc6b423064d19433ce5e37
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 11:13:19 2014 +0100
Guard against cyclic entity dependencies
...in unoidl-read, although it would be better (but more expensive at start-
up) to check consistency in unoidl::Manager.
Change-Id: I5f5894fcd51af3aa999fe30621f52bfd11d0e610
diff --git a/unoidl/source/unoidl-read.cxx b/unoidl/source/unoidl-read.cxx
index 113acee..e301ba5 100644
--- a/unoidl/source/unoidl-read.cxx
+++ b/unoidl/source/unoidl-read.cxx
@@ -136,16 +136,19 @@ OUString decomposeType(
}
struct Entity {
+enum class Sorted { NO, ACTIVE, YES };
+
explicit Entity(
rtl::Referenceunoidl::Entity const theEntity, bool theRelevant):
-entity(theEntity), relevant(theRelevant), sorted(false), written(false)
+entity(theEntity), relevant(theRelevant), sorted(Sorted::NO),
+written(false)
{}
rtl::Referenceunoidl::Entity const entity;
std::setOUString dependencies;
std::setOUString interfaceDependencies;
bool relevant;
-bool sorted;
+Sorted sorted;
bool written;
};
@@ -160,7 +163,7 @@ void insertEntityDependency(
if (weakInterfaceDependency) {
rtl::Referenceunoidl::Entity ent(manager-findEntity(name));
if (!ent.is()) {
-std::cerr unknown entity name std::endl;
+std::cerr Unknown entity name std::endl;
std::exit(EXIT_FAILURE);
}
ifc = ent-getSort() == unoidl::Entity::SORT_INTERFACE_TYPE;
@@ -404,7 +407,7 @@ void scanMap(
void propagateRelevant(std::mapOUString, Entity entities, Entity entity)
{
if (!entity.relevant) {
entity.relevant = true;
-if (entity.sorted) {
+if (entity.sorted != Entity::Sorted::YES) {
for (std::setOUString::iterator i(entity.dependencies.begin());
i != entity.dependencies.end(); ++i)
{
@@ -422,10 +425,9 @@ void visit(
std::mapOUString, Entity::iterator const iterator,
std::vectorOUString result)
{
-if (!iterator-second.sorted) {
-// Doesn't bother to verify the graph is acyclic (which it is
guaranteed
-// to be for a consistent set of entities); a non-DAG will lead to
-// infinite recursion/stack overflow:
+switch (iterator-second.sorted) {
+case Entity::Sorted::NO:
+iterator-second.sorted = Entity::Sorted::ACTIVE;
for (std::setOUString::iterator i(
iterator-second.dependencies.begin());
i != iterator-second.dependencies.end(); ++i)
@@ -438,8 +440,17 @@ void visit(
visit(entities, j, result);
}
}
-iterator-second.sorted = true;
+iterator-second.sorted = Entity::Sorted::YES;
result.push_back(iterator-first);
+break;
+case Entity::Sorted::ACTIVE:
+std::cerr
+ Entity iterator-first recursively depends on itself
+ std::endl;
+std::exit(EXIT_FAILURE);
+// fall-through avoids warnings
+default:
+break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +-
sc/source/core/tool/calcconfig.cxx |1 -
sc/source/ui/optdlg/calcoptionsdlg.cxx |4
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8f317cd32e3a0ae7b6dfd28cd3a3f5aa9f5da6ec
Author: Tor Lillqvist t...@collabora.com
Date: Wed Nov 19 12:10:10 2014 +0200
Don't use OpenCL for RAND by default
The current implementation from 60ae598d537c14283109e1c6de22ec43a0147bcf is
so
broken it isn't even funny.
Change-Id: I962d2643d21283340646893bb7892fb2a3d0c2e3
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 425f9b8..abf01b0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1373,7 +1373,7 @@
might be calculated using OpenCL./desc
!-- numeric values correspond to
RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS
--
/info
-
value66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value
+
value82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value
/prop
prop oor:name=OpenCLAutoSelect oor:type=xs:boolean
oor:nillable=false
!-- UIHints: Tools - Options Spreadsheet Formula --
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index 0ba4cdf..ff81e98 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -40,7 +40,6 @@ void ScCalcConfig::setOpenCLConfigToDefault()
mbOpenCLAutoSelect = true;
mnOpenCLMinimumFormulaGroupSize = 100;
-maOpenCLSubsetOpCodes.insert(ocRandom);
maOpenCLSubsetOpCodes.insert(ocSin);
maOpenCLSubsetOpCodes.insert(ocCos);
maOpenCLSubsetOpCodes.insert(ocTan);
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 3a4764e..92af35a 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -993,7 +993,11 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*,
)
for (int i = 0; i N; ++i)
{
+#if 0 // While our RAND OpenCL implementation is broken...
pDoc-SetString(ScAddress(0,i,1), =RAND());
+#else
+pDoc-SetValue(ScAddress(0,i,1), (i%13)/13.);
+#endif
pDoc-SetValue(ScAddress(1,i,1),
comphelper::rng::uniform_real_distribution(0, 1000));
pDoc-SetString(ScAddress(10,i,1), OUString(=IF(AND(A) +
OUString::number(i+1) + = 0,A + OUString::number(i+1) + = 1),0,1));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/source
vcl/inc/impgraph.hxx|2
vcl/source/gdi/impgraph.cxx | 102
2 files changed, 3 insertions(+), 101 deletions(-)
New commits:
commit db222b74f1482870aac76d51646215d756901b8d
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 19 11:18:16 2014 +0100
mbSwapUnderway always true inside ImpGraphic::ImplReadEmbedded
Change-Id: I641a9ca69d8e821f6b4e82ca98179a59b793345a
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index eafd6c3..4b3dc17 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -981,17 +981,6 @@ bool ImpGraphic::ImplReadEmbedded( SvStream rIStm )
const sal_uInt16nOldFormat = rIStm.GetNumberFormatInt();
boolbRet = false;
-if( !mbSwapUnderway )
-{
-const OUString aTempURLStr( maDocFileURLStr );
-const sal_uLong nTempPos = mnDocFilePos;
-
-ImplClear();
-
-maDocFileURLStr = aTempURLStr;
-mnDocFilePos = nTempPos;
-}
-
rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
rIStm.ReadUInt32( nId );
commit b62e70ef6f352c61d50eca36388e9aa8d3f5e412
Author: Matúš Kukan matus.ku...@collabora.com
Date: Wed Nov 19 11:09:44 2014 +0100
ImpGraphic::ImplReadEmbedded: bSwap is false; remove dead code
Change-Id: Ie5b6b593e178d3752ebf7421af8aee4b50f75819
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 513074d..f376603 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -136,7 +136,7 @@ private:
const OUString ImplGetDocFileName() const;
sal_uLong ImplGetDocFilePos() const { return mnDocFilePos;}
-boolImplReadEmbedded( SvStream rIStream, bool bSwap =
false );
+boolImplReadEmbedded( SvStream rIStream );
boolImplWriteEmbedded( SvStream rOStream );
boolImplSwapIn();
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index b41ecd8..eafd6c3 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -40,7 +40,6 @@
#include vcl/dibtools.hxx
#include boost/scoped_ptr.hpp
-#define GRAPHIC_MAXPARTLEN 256000L
#define GRAPHIC_MTFTOBMP_MAXEXT 2048
#define GRAPHIC_STREAMBUFSIZE 8192UL
@@ -970,7 +969,7 @@ const OUString ImpGraphic::ImplGetDocFileName() const
}
-bool ImpGraphic::ImplReadEmbedded( SvStream rIStm, bool bSwap )
+bool ImpGraphic::ImplReadEmbedded( SvStream rIStm )
{
MapMode aMapMode;
SizeaSize;
@@ -1071,93 +1070,7 @@ bool ImpGraphic::ImplReadEmbedded( SvStream rIStm, bool
bSwap )
maMetaFile.SetPrefSize( aSize );
}
-if( bSwap )
-{
-if (!maDocFileURLStr.isEmpty())
-{
-rIStm.Seek( nStartPos + nHeaderLen + nLen );
-bRet = mbSwapOut = true;
-}
-else
-{
-::utl::TempFile aTempFile;
-const INetURLObject aTmpURL( aTempFile.GetURL() );
-
-if( !aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).isEmpty() )
-{
-boost::scoped_ptrSvStream pOStm;
-try
-{
-pOStm.reset(::utl::UcbStreamHelper::CreateStream(
aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE |
STREAM_SHARE_DENYWRITE ));
-}
-catch( const ::com::sun::star::uno::Exception )
-{
-}
-
-if( pOStm )
-{
-sal_uLong nFullLen = nHeaderLen + nLen;
-sal_uLong nPartLen = std::min( nFullLen, (sal_uLong)
GRAPHIC_MAXPARTLEN );
-sal_uInt8* pBuffer = (sal_uInt8*) rtl_allocateMemory(
nPartLen );
-
- pOStm-SetNumberFormatInt(
NUMBERFORMAT_INT_LITTLEENDIAN );
-
-if( pBuffer )
-{
-rIStm.Seek( nStartPos );
-
-while( nFullLen )
-{
-rIStm.Read( (char*) pBuffer, nPartLen );
-pOStm-Write( (char*) pBuffer, nPartLen );
-
-nFullLen -= nPartLen;
-
-if( nFullLen GRAPHIC_MAXPARTLEN )
-nPartLen = nFullLen;
-}
-
-rtl_freeMemory( pBuffer );
-sal_uLong nReadErr = rIStm.GetError(), nWriteErr =
pOStm-GetError();
-pOStm.reset();
-
-if( !nReadErr !nWriteErr )
-{
-bRet = mbSwapOut = true;
-mpSwapFile =
[Libreoffice-commits] core.git: include/cppuhelper include/osl include/rtl
include/cppuhelper/component_context.hxx |4
include/cppuhelper/interfacecontainer.h |1 +
include/cppuhelper/weak.hxx |1 +
include/cppuhelper/weakref.hxx |1 +
include/osl/file.hxx |1 +
include/osl/profile.hxx |2 ++
include/rtl/stringutils.hxx |1 +
7 files changed, 11 insertions(+)
New commits:
commit 40d4f917e3395611276240c75c1d825d172ed559
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 19 00:31:37 2014 +0100
sal, cppuhelper headers a little more complete and self-contained
All of them now build as-is (doing that is actually a pain because some
are named the same as C library headers and clang looks first in the
directory where the source file is in...).
Change-Id: Ief6e245c8f49fcee678aebd46394c19e4cb47f51
diff --git a/include/cppuhelper/component_context.hxx
b/include/cppuhelper/component_context.hxx
index f22ff2c..9baf861 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -20,7 +20,11 @@
#define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/uno/Any.hxx
+#include com/sun/star/uno/Reference.hxx
#include cppuhelper/cppuhelperdllapi.h
+#include rtl/ustring.hxx
+#include sal/types.h
namespace cppu
diff --git a/include/cppuhelper/interfacecontainer.h
b/include/cppuhelper/interfacecontainer.h
index 2813af0..650d455 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -23,6 +23,7 @@
#include functional
#include vector
+#include utility
#include osl/diagnose.h
#include osl/mutex.hxx
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 60ee36c..9719db1 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_CPPUHELPER_WEAK_HXX
#define INCLUDED_CPPUHELPER_WEAK_HXX
+#include cassert
#include osl/interlck.h
#include rtl/alloc.h
#include com/sun/star/uno/XWeak.hpp
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 796e744..01ee4c8 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX
#define INCLUDED_CPPUHELPER_WEAKREF_HXX
+#include com/sun/star/uno/Reference.hxx
#include com/sun/star/uno/XInterface.hpp
#include cppuhelper/cppuhelperdllapi.h
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index 293f18d..2c65fcd 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -26,6 +26,7 @@
#include cassert
+#include sal/log.hxx
#include osl/time.h
#include rtl/ustring.hxx
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index 1c1e899..a4c9e72 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -22,7 +22,9 @@
#include osl/profile.h
#include rtl/ustring.hxx
+
#include string.h
+#include exception
#include list
namespace osl {
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 88034d3..52ed1d0 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_RTL_STRINGUTILS_HXX
#include sal/config.h
+#include sal/types.h
// Manually defining RTL_DISABLE_FAST_STRING allows to force turning fast
string concatenation off
// (e.g. for debugging).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - cui/source filter/source include/basebmp package/source vcl/inc vcl/opengl vcl/source
cui/source/dialogs/SpellDialog.cxx |2
filter/source/graphicfilter/ipict/ipict.cxx | 12 ++
include/basebmp/compositeiterator.hxx | 140 +---
package/source/zipapi/ZipFile.cxx | 13 +-
vcl/inc/openglgdiimpl.hxx |2
vcl/opengl/gdiimpl.cxx | 10 --
vcl/opengl/win/gdiimpl.cxx |4
vcl/opengl/x11/gdiimpl.cxx |4
vcl/source/control/field.cxx|7 +
9 files changed, 122 insertions(+), 72 deletions(-)
New commits:
commit 5d8e23fdb98a74372ca3da37559af4b45655fee4
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 19 10:43:19 2014 +
coverity#1226488 Big parameter passed by value
Change-Id: I55ee5dcd7ed18fe907fc06aba345d96a90fb2324
diff --git a/include/basebmp/compositeiterator.hxx
b/include/basebmp/compositeiterator.hxx
index 4fb9c10..1823181 100644
--- a/include/basebmp/compositeiterator.hxx
+++ b/include/basebmp/compositeiterator.hxx
@@ -89,26 +89,51 @@ namespace detail
typedef DifferenceType difference_type;
typedef IteratorCategory iterator_category;
+struct Impl
+{
+iterator1_type maIter1;
+iterator2_type maIter2;
+Impl()
+: maIter1()
+, maIter2()
+{
+}
+Impl(const iterator1_type rIter1, const iterator2_type rIter2)
+: maIter1(rIter1)
+, maIter2(rIter2)
+{
+}
+};
+
protected:
-iterator1_type maIter1;
-iterator2_type maIter2;
+Impl* pImpl;
private:
bool equal(CompositeIteratorBase const rhs) const
{
-return (maIter1 == rhs.maIter1) (maIter2 == rhs.maIter2);
+return (pImpl-maIter1 == rhs.pImpl-maIter1) (pImpl-maIter2
== rhs.pImpl-maIter2);
}
public:
-CompositeIteratorBase() :
-maIter1(),
-maIter2()
-{}
+CompositeIteratorBase()
+{
+pImpl = new Impl();
+}
-CompositeIteratorBase( const iterator1_type rIter1, const
iterator2_type rIter2 ) :
-maIter1( rIter1 ),
-maIter2( rIter2 )
-{}
+CompositeIteratorBase(const iterator1_type rIter1, const
iterator2_type rIter2)
+{
+pImpl = new Impl(rIter1, rIter2);
+}
+
+CompositeIteratorBase(const CompositeIteratorBase rOther)
+{
+pImpl = new Impl(rOther.pImpl-maIter1, rOther.pImpl-maIter2);
+}
+
+~CompositeIteratorBase()
+{
+delete pImpl;
+}
bool operator==(Derived const rhs) const
{
@@ -122,21 +147,21 @@ namespace detail
difference_type operator-(Derived const rhs) const
{
-OSL_ASSERT( maIter1 - rhs.maIter1 == maIter2 - rhs.maIter2 );
-return maIter1 - rhs.maIter1;
+OSL_ASSERT(pImpl-maIter1 - rhs.pImpl-maIter1 == pImpl-maIter2 -
rhs.pImpl-maIter2);
+return pImpl-maIter1 - rhs.pImpl-maIter1;
}
Derived operator+=(difference_type const s)
{
-maIter1 += s;
-maIter2 += s;
+pImpl-maIter1 += s;
+pImpl-maIter2 += s;
return static_castDerived(*this);
}
Derived operator-=(difference_type const s)
{
-maIter1 -= s;
-maIter2 -= s;
+pImpl-maIter1 -= s;
+pImpl-maIter2 -= s;
return static_castDerived(*this);
}
@@ -156,63 +181,70 @@ namespace detail
Derived operator++()
{
-++maIter1;
-++maIter2;
+++pImpl-maIter1;
+++pImpl-maIter2;
return static_castDerived(*this);
}
Derived operator--()
{
---maIter1;
---maIter2;
+--pImpl-maIter1;
+--pImpl-maIter2;
return static_castDerived(*this);
}
Derived operator++(int)
{
Derived ret(static_castDerived const(*this));
-++maIter1;
-++maIter2;
+++pImpl-maIter1;
+++pImpl-maIter2;
return ret;
}
Derived operator--(int)
{
Derived ret(static_castDerived const(*this));
---maIter1;
---maIter2;
+--pImpl-maIter1;
+--pImpl-maIter2;
return ret;
}
value_type get() const
{
-return value_type(maIter1.get(),
- maIter2.get());
+return value_type(pImpl-maIter1.get(),
+ pImpl-maIter2.get());
}
value_type get(difference_type const d) const
{
-return
[Libreoffice-commits] core.git: 2 commits - sw/qa unotest/source
sw/qa/core/data/html/pass/EDB-35279-1.html |binary unotest/source/cpp/filters-test.cxx|3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 36feeb1eab0165137087f909698ee208e397cdcf Author: Caolán McNamara caol...@redhat.com Date: Wed Nov 19 11:04:32 2014 + tweak the assert message so its readable when an errors happens Change-Id: Ib4f262f4c8cffc9790001618ce8050eda75ae559 diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index 436c6dd..035a9af 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -122,7 +122,8 @@ void FiltersTest::recursiveScan(filterStatus nExpected, bRes?Pass:Fail,nEndTime-nStartTime); if (nExpected == test::indeterminate) continue; -CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == (nExpected == test::pass)); +filterStatus nResult = bRes ? test::pass : test::fail; +CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), nResult == nExpected); } } CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close()); commit d1e2335584c4723e3f0560b52a3113fd94f4f169 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 18 10:19:03 2014 + add EDB-35279 test-case Change-Id: I9fb6e1e33f6b67342c8b407eafc9882ee44f4b46 diff --git a/sw/qa/core/data/html/pass/EDB-35279-1.html b/sw/qa/core/data/html/pass/EDB-35279-1.html new file mode 100644 index 000..77e476a Binary files /dev/null and b/sw/qa/core/data/html/pass/EDB-35279-1.html differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impgraph.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 137886bb081c4d0e12677f2d8de96a9bf4ddad16
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 19 11:08:54 2014 +
WaE: -Werror=unused-but-set-variable
Change-Id: If55fe92af710221000ccec4e09eeba9f56c8a7aa
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 4b3dc17..27bd0b9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -973,9 +973,7 @@ bool ImpGraphic::ImplReadEmbedded( SvStream rIStm )
{
MapMode aMapMode;
SizeaSize;
-const sal_uLong nStartPos = rIStm.Tell();
sal_uInt32 nId;
-sal_uLong nHeaderLen;
sal_Int32 nType;
sal_Int32 nLen;
const sal_uInt16nOldFormat = rIStm.GetNumberFormatInt();
@@ -1032,7 +1030,6 @@ bool ImpGraphic::ImplReadEmbedded( SvStream rIStm )
Fraction( nScaleNumY, nScaleDenomY ) );
}
-nHeaderLen = rIStm.Tell() - nStartPos;
meType = (GraphicType) nType;
if( meType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/docnode/section.cxx | 42 -
sw/source/core/docnode/swbaslnk.cxx | 10 +-
sw/source/core/draw/dcontact.cxx| 44 +-
sw/source/core/draw/dflyobj.cxx |6 -
sw/source/core/draw/dpage.cxx |8 -
sw/source/core/draw/dview.cxx | 22 ++---
sw/source/core/edit/autofmt.cxx | 14 +--
sw/source/core/edit/edatmisc.cxx|6 -
sw/source/core/edit/edattr.cxx | 28 +++---
sw/source/core/edit/eddel.cxx |2
sw/source/core/edit/edfcol.cxx |4
sw/source/core/edit/edfld.cxx | 10 +-
sw/source/core/edit/edfldexp.cxx|2
sw/source/core/edit/edfmt.cxx |2
sw/source/core/edit/edglbldc.cxx|4
sw/source/core/edit/editsh.cxx | 32 +++
sw/source/core/edit/edlingu.cxx |2
sw/source/core/edit/ednumber.cxx|6 -
sw/source/core/edit/edredln.cxx |2
sw/source/core/edit/edtab.cxx | 16 +--
sw/source/core/edit/edtox.cxx |8 -
sw/source/core/edit/edws.cxx| 10 +-
sw/source/core/fields/authfld.cxx | 42 -
sw/source/core/fields/cellfml.cxx | 28 +++---
sw/source/core/fields/chpfld.cxx|2
sw/source/core/fields/dbfld.cxx | 36
sw/source/core/fields/ddefld.cxx| 30 +++
sw/source/core/fields/ddetbl.cxx| 10 +-
sw/source/core/fields/docufld.cxx | 68
sw/source/core/fields/expfld.cxx| 42 -
sw/source/core/fields/fldbas.cxx| 20 ++--
sw/source/core/fields/flddat.cxx|4
sw/source/core/fields/fldlst.cxx|4
sw/source/core/fields/macrofld.cxx |2
sw/source/core/fields/reffld.cxx| 24 ++---
sw/source/core/fields/scrptfld.cxx |2
sw/source/core/fields/tblcalc.cxx |4
sw/source/core/fields/usrfld.cxx| 18 ++--
sw/source/core/frmedt/fecopy.cxx| 22 ++---
sw/source/core/frmedt/fedesc.cxx| 22 ++---
sw/source/core/frmedt/fefly1.cxx| 88 ++--
sw/source/core/frmedt/feflyole.cxx |8 -
sw/source/core/frmedt/feshview.cxx | 104
sw/source/core/frmedt/fetab.cxx | 52 ++--
sw/source/core/frmedt/fews.cxx | 36
sw/source/core/frmedt/tblsel.cxx| 120 ++--
sw/source/core/graphic/grfatr.cxx |6 -
sw/source/core/graphic/ndgrf.cxx| 24 ++---
sw/source/core/layout/atrfrm.cxx| 112 +-
sw/source/core/layout/calcmove.cxx | 110 +-
sw/source/core/layout/colfrm.cxx| 36
sw/source/core/layout/dbg_lay.cxx |2
sw/source/core/layout/findfrm.cxx | 152 ++--
sw/source/core/layout/flowfrm.cxx | 98 +++
sw/source/core/layout/fly.cxx | 94 +++---
55 files changed, 851 insertions(+), 851 deletions(-)
New commits:
commit 0ad264911b9217a3241f6c0e1769b22e8bd76e48
Author: Noel Grandin n...@peralex.com
Date: Wed Nov 19 09:31:53 2014 +0200
loplugin: cstylecast
Change-Id: If25e3b030d484f03078bfba265bed82b315e2742
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 4f10aeb..4d05948 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -104,7 +104,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString*
pNewClpTxt )
// also delete surrounding FlyFrames if any
for( sal_uInt16 n = 0; n pClpDoc-GetSpzFrmFmts()-size(); ++n )
{
-SwFlyFrmFmt* pFly = (SwFlyFrmFmt*)(*pClpDoc-GetSpzFrmFmts())[n];
+SwFlyFrmFmt* pFly =
static_castSwFlyFrmFmt*((*pClpDoc-GetSpzFrmFmts())[n]);
pClpDoc-getIDocumentLayoutAccess().DelLayoutFmt( pFly );
}
pClpDoc-GetDocumentFieldsManager().GCFieldTypes();// delete the
FieldTypes
@@ -199,7 +199,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString*
pNewClpTxt )
}
else
{
-SwDrawContact *pContact = (SwDrawContact*)GetUserCall( pObj );
+SwDrawContact *pContact =
static_castSwDrawContact*(GetUserCall( pObj ));
SwFrmFmt *pFmt = pContact-GetFmt();
SwFmtAnchor aAnchor( pFmt-GetAnchor() );
if ((FLY_AT_PARA == aAnchor.GetAnchorId()) ||
@@ -232,7 +232,7 @@ static const Point lcl_FindBasePos( const SwFrm *pFrm,
const Point rPt )
while ( pF !pF-Frm().IsInside( rPt ) )
{
if ( pF-IsCntntFrm() )
-pF = ((SwCntntFrm*)pF)-GetFollow();
+pF = static_castconst SwCntntFrm*(pF)-GetFollow();
else
pF = 0;
}
@@ -301,7 +301,7 @@ bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell, const
Point rSttPt,
{
SdrObject *pObj = aMrkList.GetMark( i )-GetMarkedSdrObj();
-SwDrawContact *pContact = (SwDrawContact*)GetUserCall( pObj );
+SwDrawContact *pContact = static_castSwDrawContact*(GetUserCall(
pObj ));
Translatable toolbar tooltips
Hi, Recently I noticed a commit [1] that tries to set toolbar tooltips using the toolbar:tooltip attribute of the toolbar xml file. But I wonder whether those tooltips are translatable, because I couldn't find any handling of their translations. I looked in solenv/gbuild/UIConfig.mk, but it seems to me to just copy the files to the dist. So could someone please point me to the place where this is handled, or - maybe they're indeed not translatable, and that commit should be reverted? Thanks, Maxim [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=c481f596877f52e1c801981618ebfbf2aab88dcf ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
| 62 ++
writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
| 62 ++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
|8 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx
| 13 +-
4 files changed, 138 insertions(+), 7 deletions(-)
New commits:
commit b4840d3632e4404bee4bd192a7db916cbad3a401
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 20 08:56:54 2014 +0100
Resolves: fdo#86449 backport rtf fixes
empty Reference
valgrind + bff
(cherry picked from commit 0a42632a74596cbc781746931bf8f2650994b80f)
empty m_aStates
valgrind + bff
(cherry picked from commit e3247719911f4e9b61ec43ea1c9ce04bcddc4ff8)
Change-Id: Id3c039a46dec5d2d4a4642dfb53d23a76972dde2
3bd526b7ebf0f4fce5d0c7054809e0dc2908e73f
Reviewed-on: https://gerrit.libreoffice.org/12965
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
new file mode 100644
index 000..c3ffebc
--- /dev/null
+++
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
@@ -0,0 +1,62 @@
+{\rtf1\ansi\deff0\adeflang1025
+{\fonttbl{\f0\froman\fprq2\fcharset0 Times New
Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0
Arial;}{\f3\froman\fprq2\fcharset128 Times New
Roman;}{\f4\froman\fprq2\fcharset128 Arial
Narrow;}{\f5\froman\fprq0\fcharset128 Arial
Narrow;}{\f6\froman\fprq2\fcharset128 Symbol;}{\f7\froman\fprq0\fcharset128
Symbol;}{\f8\froman\fprq2\fcharset128 Wingdings;}{\f9\froman\fprq0\fcharset128
Wingdings;}{\f10\froman\fprq0\fcharset128 Times New
Roman;}{\f11\fnil\fprq2\fcharset0 Microsoft YaHei;}{\f12\fnil\fprq2\fcharset128
SimSun;}{\f13\fnil\fprq2\fcharset128 Times New Roman
(Arabic);}{\f14\fnil\fprq0\fcharset128 Times New Roman
(Arabic);}{\f15\fnil\fprq2\fcharset128 Times New
Roman;}{\f16\fnil\fprq0\fcharset128 Times New Roman;}{\f17\fnil\fprq2\fcharset0
Mangal;}{\f18\fnil\fprq0\fcharset128 Mangal;}{\f19\fnil\fprq2\fcharset128
Mangal;}{\f20\fnil\fprq2\fcharset128 Cambria Math;}{\f21\fnil\fprq0\fcharset128
Cambria Math;}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red128\green128\blue128;}
+{\stylesheet{\s0\snext0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040
Predefinito;}
+{\s15\sbasedon0\snext16\sb240\sa120\keepn\hich\af11\dbch\af17\afs28\loch\f2\fs28
Intestazione;}
+{\s16\sbasedon0\snext16\sb0\sa120 Corpo testo;}
+{\s17\sbasedon16\snext17\sb0\sa120\dbch\af18 Elenco;}
+{\s18\sbasedon0\snext18\sb120\sa120\noline\i\dbch\af18\afs24\ai\fs24
Didascalia;}
+{\s19\sbasedon0\snext19\noline\dbch\af18 Indice;}
+}{\info{\creatim\yr2011\mo9\dy28\hr16\min28}{\revtim\yr2011\mo9\dy28\hr16\min29}{\printim\yr0\mo0\dy0\hr0\min0}{\comment
LibreOffice}{\vern3500}}\deftab720
+
+{\*\pgdsctbl
+{\pgdsc0\pgdscuse195\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1417\margbsxn1134\pgdscnxt0
Predefinito;}}
+\formshade{\*\pgdscno0}\paperh15840\paperw12240\margl1134\margr1134\margt1417\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1134\margrsxn1134\margtsxn1417\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\trowd\trql\trleft-108\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\clvertalt\cellx9864\pgndec\pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040\intbl\qr\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0\keepn{\scaps\b\hich\af14\langfe1040\dbch\af14\afs26\alang1025\ab\rtlch
\ltrch\loch\fs26\lang1040\loch\f5
+SSS SSS curriculum vitae}
+\par \pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040\intbl\ql\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\rtlch
\ltrch\loch
+}
+\par \pard\plain
\s0\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\cf0\kerning1\hich\af22\langfe2052\dbch\af17\afs24\alang1081\loch\f0\fs24\lang1040\intbl\qr\nowidctlpar\faauto\li0\ri0\lin0\rin0\fi0{\langfe1040\dbch\af14\afs16\alang1025\rtlch
\ltrch\loch\fs16\lang1040\loch\f5
+}\cell\row\pard\pard\plain
[Libreoffice-commits] core.git: 19 commits - jurt/Library_jpipe.mk jurt/source sal/Library_sal.mk sal/osl
jurt/Library_jpipe.mk |3
jurt/source/pipe/staticsalhack.cxx | 67
jurt/source/pipe/staticsalhack.h | 16
jurt/source/pipe/staticsalhack_c.c | 18
jurt/source/pipe/staticsalhack_cxx.cxx | 58
sal/Library_sal.mk | 24
sal/osl/all/filepath.c | 114 -
sal/osl/all/filepath.cxx | 114 +
sal/osl/unx/file.cxx |6
sal/osl/unx/file_error_transl.cxx |6
sal/osl/unx/file_error_transl.h| 63
sal/osl/unx/file_error_transl.hxx | 54
sal/osl/unx/file_misc.cxx |6
sal/osl/unx/file_stat.cxx |4
sal/osl/unx/file_url.cxx |4
sal/osl/unx/file_url.h | 44
sal/osl/unx/file_url.hxx | 35
sal/osl/unx/file_volume.cxx|4
sal/osl/unx/interlck.c | 103 -
sal/osl/unx/interlck.cxx | 103 +
sal/osl/unx/memory.c | 40
sal/osl/unx/memory.cxx | 40
sal/osl/unx/module.cxx |2
sal/osl/unx/mutex.c| 184 --
sal/osl/unx/mutex.cxx | 184 ++
sal/osl/unx/nlsupport.c| 956
sal/osl/unx/nlsupport.cxx | 956
sal/osl/unx/nlsupport.h| 44
sal/osl/unx/nlsupport.hxx | 36
sal/osl/unx/osxlocale.cxx |2
sal/osl/unx/pipe.c | 612
sal/osl/unx/pipe.cxx | 612
sal/osl/unx/process.cxx| 17
sal/osl/unx/process_impl.cxx |4
sal/osl/unx/procimpl.h | 43
sal/osl/unx/profile.cxx|4
sal/osl/unx/readwrite_helper.c | 69
sal/osl/unx/readwrite_helper.cxx | 69
sal/osl/unx/readwrite_helper.h | 33
sal/osl/unx/readwrite_helper.hxx | 24
sal/osl/unx/salinit.cxx|2
sal/osl/unx/saltime.h | 37
sal/osl/unx/saltime.hxx| 29
sal/osl/unx/secimpl.h | 42
sal/osl/unx/secimpl.hxx| 34
sal/osl/unx/security.cxx | 10
sal/osl/unx/socket.c | 2477 -
sal/osl/unx/socket.cxx | 2477 +
sal/osl/unx/sockimpl.h | 67
sal/osl/unx/sockimpl.hxx | 59
sal/osl/unx/system.c | 312
sal/osl/unx/system.cxx | 312
sal/osl/unx/tempfile.cxx |2
sal/osl/unx/time.c | 321
sal/osl/unx/time.cxx | 321
sal/osl/unx/uunxapi.cxx|8
sal/osl/unx/uunxapi.h | 70
sal/osl/unx/uunxapi.hxx| 36
58 files changed, 5616 insertions(+), 5777 deletions(-)
New commits:
commit 9a038e5e7b89822fb39064f63367be292999f8ea
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 13:01:08 2014 +0100
Fold uunxapi.h into uunxapi.hxx
Change-Id: Ic16758e436da13684320e7e3bf07b80d8d8c7c5d
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 545c318..a8b004b 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -35,7 +35,7 @@
#include file_error_transl.hxx
#include file_impl.hxx
#include file_url.hxx
-#include uunxapi.h
+#include uunxapi.hxx
#include algorithm
#include limits
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index b632d44..749bfc0 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -33,7 +33,7 @@
#include file_path_helper.h
-#include uunxapi.h
+#include uunxapi.hxx
#include getexecutablefile.hxx
#include nlsupport.hxx
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 995b936..c28491c 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -19,7 +19,7 @@
#include config_features.h
-#include uunxapi.h
+#include uunxapi.hxx
#include system.h
#include limits.h
#include rtl/ustring.hxx
@@ -186,19 +186,19 @@ int access_u(const rtl_uString* pustrPath, int mode)
return result;
}
-sal_Bool realpath_u(const rtl_uString* pustrFileName, rtl_uString**
ppustrResolvedName)
+bool realpath_u(const rtl_uString* pustrFileName, rtl_uString**
ppustrResolvedName)
{
rtl::OString fn = OUStringToOString(pustrFileName);
#ifdef ANDROID
if (fn == /assets || fn.startsWith(/assets/))
{
if (access_u(pustrFileName, F_OK) == -1)
-return sal_False;
+return false;
rtl_uString silly(*pustrFileName);
rtl_uString_assign(ppustrResolvedName, silly);
-return sal_True;
+return true;
}
#endif
diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h
deleted file mode 100644
index 76b5e41..000
--- a/sal/osl/unx/uunxapi.h
+++
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 156 +
1 file changed, 85 insertions(+), 71 deletions(-)
New commits:
commit 185dae1969bb463ae1be8ea46a7780efa32372f5
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 19 12:11:47 2014 +
Resolves: fdo#86451 guard all the tops post pop
Change-Id: Ic89edb94c6c12a66fd46e0630115a458857cc6cc
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a48553c..1234e37 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5790,7 +5790,7 @@ int RTFDocumentImpl::popState()
case DESTINATION_PARAGRAPHNUMBERING:
{
RTFValue::Pointer_t pIdValue =
aState.aTableAttributes.find(NS_ooxml::LN_CT_AbstractNum_nsid);
-if (pIdValue.get())
+if (pIdValue.get() !m_aStates.empty())
{
// Abstract numbering
RTFSprms aLeveltextAttributes;
@@ -5859,87 +5859,98 @@ int RTFDocumentImpl::popState()
}
break;
case DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER:
-{
-// FIXME: don't use pDestinationText, points to popped state
-RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
-m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val,
pValue);
-}
+if (!m_aStates.empty())
+{
+// FIXME: don't use pDestinationText, points to popped state
+RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val, pValue);
+}
break;
case DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE:
-{
-// FIXME: don't use pDestinationText, points to popped state
-RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
-m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val,
pValue);
-}
+if (!m_aStates.empty())
+{
+// FIXME: don't use pDestinationText, points to popped state
+RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val, pValue);
+}
break;
case DESTINATION_LISTNAME:
break;
case DESTINATION_LISTLEVEL:
-{
-RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
-aState.aTableAttributes.set(NS_ooxml::LN_CT_Lvl_ilvl, pInnerValue);
+if (!m_aStates.empty())
+{
+RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
+aState.aTableAttributes.set(NS_ooxml::LN_CT_Lvl_ilvl, pInnerValue);
-RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
-if (m_aStates.top().nDestinationState != DESTINATION_LFOLEVEL)
-
m_aStates.top().aListLevelEntries.set(NS_ooxml::LN_CT_AbstractNum_lvl, pValue,
OVERWRITE_NO_APPEND);
-else
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_NumLvl_lvl,
pValue);
-}
+RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
+if (m_aStates.top().nDestinationState != DESTINATION_LFOLEVEL)
+
m_aStates.top().aListLevelEntries.set(NS_ooxml::LN_CT_AbstractNum_lvl, pValue,
OVERWRITE_NO_APPEND);
+else
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_NumLvl_lvl,
pValue);
+}
break;
case DESTINATION_LFOLEVEL:
-{
-RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
-aState.aTableAttributes.set(NS_ooxml::LN_CT_NumLvl_ilvl, pInnerValue);
+if (!m_aStates.empty())
+{
+RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
+aState.aTableAttributes.set(NS_ooxml::LN_CT_NumLvl_ilvl,
pInnerValue);
-RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Num_lvlOverride,
pValue);
-}
+RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Num_lvlOverride,
pValue);
+}
break;
// list override table
case DESTINATION_LISTOVERRIDEENTRY:
-{
-if (m_aStates.top().nDestinationState == DESTINATION_LISTOVERRIDEENTRY)
-{
-// copy properties upwards so upper popState inserts it
-m_aStates.top().aTableAttributes = aState.aTableAttributes;
-m_aStates.top().aTableSprms = aState.aTableSprms;
-}
-else
+if (!m_aStates.empty())
{
-
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/nlsupport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76cdf2ffeafa6a516c15e5d50c20848205665872 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 19 14:13:18 2014 +0200 ISO C++11 does not allow conversion from string literal to 'char *' Change-Id: I098d0b8b3428cbf57a69c331515093df36e0c172 diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index 03107ef..a7e7640 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -873,7 +873,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) locale = getenv( LANG ); if( NULL == locale ) -locale = C; +locale = strdup(C); } /* return the locale */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 42949] accelerating compile times by removing unnecessary header #include
https://bugs.freedesktop.org/show_bug.cgi?id=42949
Michael Stahl mst...@redhat.com changed:
What|Removed |Added
CC||riccardo.magliocchetti@gmai
||l.com
Summary|accelerating compile times |accelerating compile times
|... |by removing unnecessary
||header #include
--- Comment #15 from Michael Stahl mst...@redhat.com ---
some issues that you should be aware of when doing cleanup:
1. we want each header file to be complete in the sense that it would build
successfully as a compilation unit on its own; it should not depend on some
other header being included before it into a source file to provide the types
it uses, it should either include a header that declares the needed type, or
contain a forward declaration of it.
2. removing an include from a source file because there is another include in
the source file that transitively brings in the needed include is also
undesirable: some time later somebody will refactor the code and reomve some
include that is no longer directly needed and then it turns out that there are
a lot of errors that need fixing because the source file was relying on
indirectly included files.
3. it's also too easy to remove platform dependent or configuration dependent
include this way; some of the code is behind some #ifdef. Ok, this is a more
general problem and you have to be aware of it whatever approach you use. best
to build with --enable-dbgutil to get all the debug code built.
include-what-you-use does indeed appear to be the best way to solve this
because it avoids issues 1 and 2.
how to build it on Fedora 20:
yum install llvm-static llvm-devel clang-devel
tar -xzvf /tmp/include-what-you-use-3.4.src.tar.gz
cd include-what-you-use/
[ edit the CMakeLists.txt and replace link_directories(${LLVM_PATH}/lib) with
link_directories(${LLVM_PATH}) ]
cmake .
cmake -DLLVM_PATH=/usr/lib/llvm-3.4 .
make
for LibreOffice use the --with-iwyu flag (see comment #14)
iwyu unfortunately only reports problems in the source file that is being
compiled, and in a header file with the same basename as the source file.
so i've added a make iwyudummy target that can be used to build all include
files: it will generate a iwyudummy/StaticLibrary_iwyudummy.mk that can be
edited to those include files you want to clean up.
i've already used iwyu to clean up all the headers that are shipped in the sdk
(i.e. listed in odk/Package_odk_headers.mk).
likely it would be a good approach to clean up include/ first in a bottom-up
way following the module dependency graph http://ostrovsky.org/libo/lo.png
oh and there is no need to clean up the precompiled_*.hxx headers manually,
since they are created automatically by some update_pch script anyway.
--
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/nlsupport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0e589394e8452ee8dea8e807d3b5ef6620a1c6c1
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 13:31:37 2014 +0100
-Werror,-Wc++11-compat-deprecated-writable-strings
Change-Id: I4a8cbbbebe9833625af4805074d0c68ef3623ebd
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index a7e7640..2a5c659 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -844,7 +844,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale
* pLocale )
void _imp_getProcessLocale( rtl_Locale ** ppLocale )
{
-static char *locale = NULL;
+static char const *locale = NULL;
/* basic thread safeness */
//pthread_mutex_lock( aLocalMutex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/nlsupport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 78ac39dcef36b3881b2574b2db1e0d5a068c7804
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 13:38:09 2014 +0100
Revert -Werror,-Wc++11-compat-deprecated-writable-strings
This reverts commit 0e589394e8452ee8dea8e807d3b5ef6620a1c6c1, which
was a misguided attempt at solving a problem already solved by Tor.
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 2a5c659..a7e7640 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -844,7 +844,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale
* pLocale )
void _imp_getProcessLocale( rtl_Locale ** ppLocale )
{
-static char const *locale = NULL;
+static char *locale = NULL;
/* basic thread safeness */
//pthread_mutex_lock( aLocalMutex );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - framework/source
framework/source/uielement/toolbarmanager.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ccad3636f8577b1e89a8e3064dd51d2bd4d53751
Author: Tobias Madl tobias.madl@gmail.com
Date: Wed Nov 19 12:47:05 2014 +
merge fix
Change-Id: If567ad20c9bfbe93da8ea73a4e36b46a62280474
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index cc07a53..f18bc3f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -477,7 +477,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard g;
if ( Action.Action == FrameAction_CONTEXT_CHANGED )
{
-m_aAsyncUpdateControllersIdle.Start();
+m_aAsyncUpdateControllersTimer.Start();
}
}
@@ -1417,7 +1417,7 @@ void ToolBarManager::FillToolbar( const Reference
XIndexAccess rItemContaine
UpdateControllers();
else if ( m_pToolBar-IsReallyVisible() )
{
-m_aAsyncUpdateControllersIdle.Start();
+m_aAsyncUpdateControllersTimer.Start();
}
// Try to retrieve UIName from the container property set and set it as
the title
@@ -2046,7 +2046,7 @@ IMPL_LINK( ToolBarManager, StateChanged,
StateChangedType*, pStateChangedType )
{
if ( m_pToolBar-IsReallyVisible() )
{
-m_aAsyncUpdateControllersIdle.Start();
+m_aAsyncUpdateControllersTimer.Start();
}
}
else if ( *pStateChangedType == StateChangedType::INITSHOW )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 177 +
1 file changed, 97 insertions(+), 80 deletions(-)
New commits:
commit 566300ebd57e6ff07fdb014321e23a92c9bcf5ee
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 19 12:14:08 2014 +
Resolves: fdo#86451 guard all the tops post pop
Change-Id: I98be6f014893dfc7cee770c44cd9d0be32b39f5c
Reviewed-on: https://gerrit.libreoffice.org/12966
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index be56161..7c5cbf1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5637,7 +5637,7 @@ int RTFDocumentImpl::popState()
case DESTINATION_PARAGRAPHNUMBERING:
{
RTFValue::Pointer_t pIdValue =
aState.aTableAttributes.find(NS_ooxml::LN_CT_AbstractNum_nsid);
-if (pIdValue.get())
+if (pIdValue.get() !m_aStates.empty())
{
// Abstract numbering
RTFSprms aLeveltextAttributes;
@@ -5706,85 +5706,96 @@ int RTFDocumentImpl::popState()
}
break;
case DESTINATION_PARAGRAPHNUMBERING_TEXTAFTER:
-{
-// FIXME: don't use pDestinationText, points to popped state
-RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
-m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val,
pValue);
-}
+if (!m_aStates.empty())
+{
+// FIXME: don't use pDestinationText, points to popped state
+RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val, pValue);
+}
break;
case DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE:
-{
-// FIXME: don't use pDestinationText, points to popped state
-RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
-m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val,
pValue);
-}
+if (!m_aStates.empty())
+{
+// FIXME: don't use pDestinationText, points to popped state
+RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val, pValue);
+}
break;
case DESTINATION_LISTLEVEL:
-{
-RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
-aState.aTableAttributes.set(NS_ooxml::LN_CT_Lvl_ilvl, pInnerValue);
+if (!m_aStates.empty())
+{
+RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
+aState.aTableAttributes.set(NS_ooxml::LN_CT_Lvl_ilvl, pInnerValue);
-RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
-if (m_aStates.top().nDestinationState != DESTINATION_LFOLEVEL)
-
m_aStates.top().aListLevelEntries.set(NS_ooxml::LN_CT_AbstractNum_lvl, pValue,
OVERWRITE_NO_APPEND);
-else
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_NumLvl_lvl,
pValue);
-}
+RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
+if (m_aStates.top().nDestinationState != DESTINATION_LFOLEVEL)
+
m_aStates.top().aListLevelEntries.set(NS_ooxml::LN_CT_AbstractNum_lvl, pValue,
OVERWRITE_NO_APPEND);
+else
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_NumLvl_lvl,
pValue);
+}
break;
case DESTINATION_LFOLEVEL:
-{
-RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
-aState.aTableAttributes.set(NS_ooxml::LN_CT_NumLvl_ilvl, pInnerValue);
+if (!m_aStates.empty())
+{
+RTFValue::Pointer_t pInnerValue(new
RTFValue(m_aStates.top().nListLevelNum++));
+aState.aTableAttributes.set(NS_ooxml::LN_CT_NumLvl_ilvl,
pInnerValue);
-RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
-m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Num_lvlOverride,
pValue);
-}
+RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
+m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Num_lvlOverride,
pValue);
+}
break;
// list override table
case DESTINATION_LISTOVERRIDEENTRY:
-{
-if (m_aStates.top().nDestinationState == DESTINATION_LISTOVERRIDEENTRY)
-{
-// copy properties upwards so upper popState inserts it
-m_aStates.top().aTableAttributes = aState.aTableAttributes;
-
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdobj.hxx | 18 +-
svx/source/svdraw/svdobj.cxx | 17 +
2 files changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 58ce60da28b019be3dcf52c6b9fc51b91361137e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 19 09:14:00 2014 -0500
Move SdrObjUserDataList out of the header.
It's only used within SdrObject. This also eliminates the need to
include boost's ptr_vector in the header file.
Change-Id: I5ba9b424be21c5ee3280364de1d73b0fa3921129
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 0f8fa44..9768b9c 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -42,7 +42,6 @@
#include vcl/timer.hxx
#include boost/optional.hpp
-#include boost/ptr_container/ptr_vector.hpp
// forward declarations
@@ -73,6 +72,7 @@ namespace tools { class PolyPolygon; }
class SfxPoolItem;
class SdrVirtObj;
class SdrDragView;
+class SdrObjUserDataList;
namespace sdr
{
@@ -208,22 +208,6 @@ public:
virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec rRec, const
SdrObject* pObj) const;
};
-class SdrObjUserDataList
-{
-typedef boost::ptr_vectorSdrObjUserData ListType;
-ListType maList;
-
-public:
-SdrObjUserDataList();
-~SdrObjUserDataList();
-
-size_t GetUserDataCount() const;
-const SdrObjUserData* GetUserData(size_t nNum) const;
-SdrObjUserData* GetUserData(size_t nNum);
-void AppendUserData(SdrObjUserData* pData);
-void DeleteUserData(size_t nNum);
-};
-
// all geometrical data of an arbitrary object for use in undo/redo
class SVX_DLLPUBLIC SdrObjGeoData
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index ba3c477..9c251bc 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -130,6 +130,7 @@
#include rtl/strbuf.hxx
#include svdoopengl.hxx
#include boost/scoped_ptr.hpp
+#include boost/ptr_container/ptr_vector.hpp
using namespace ::com::sun::star;
@@ -224,6 +225,22 @@ OUString SdrObjUserData::GetMacroPopupComment(const
SdrObjMacroHitRec /*rRec*/,
return OUString();
}
+class SdrObjUserDataList
+{
+typedef boost::ptr_vectorSdrObjUserData ListType;
+ListType maList;
+
+public:
+SdrObjUserDataList();
+~SdrObjUserDataList();
+
+size_t GetUserDataCount() const;
+const SdrObjUserData* GetUserData(size_t nNum) const;
+SdrObjUserData* GetUserData(size_t nNum);
+void AppendUserData(SdrObjUserData* pData);
+void DeleteUserData(size_t nNum);
+};
+
SdrObjUserDataList::SdrObjUserDataList() {}
SdrObjUserDataList::~SdrObjUserDataList() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/store/cascadingcondop.cxx | 66
compilerplugins/clang/store/cascadingcondop.hxx | 38 +
2 files changed, 104 insertions(+)
New commits:
commit b736204f3ba6ee9813ae109071c9d442c2fb2219
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Nov 19 15:08:05 2014 +0100
add clang plugin for detecting cascading condops
Change-Id: I1b782bb04b09bee5c3db2261f9390a7b2edf4564
Reviewed-on: https://gerrit.libreoffice.org/12967
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/compilerplugins/clang/store/cascadingcondop.cxx
b/compilerplugins/clang/store/cascadingcondop.cxx
new file mode 100644
index 000..f18a93b
--- /dev/null
+++ b/compilerplugins/clang/store/cascadingcondop.cxx
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#include cascadingcondop.hxx
+
+/*
+This is a compile check.
+
+It checks for conditional operators in conditional operators, which are
+errorprone, e.g.
+ Thing foo = IsBar() ? ( IsBaz() ? b1 : b2 ) : b3;
+
+However, it finds 556 cases in sw/source alone, thus likely needs some more
+restricting, e.g. by checking for multiline conditional operator statements or
+a certain length in characters (but that needs the Context/SourceManager, which
+I havent played with yet).
+*/
+
+namespace loplugin
+{
+
+// Ctor, nothing special, pass the argument(s).
+CascadingCondOp::CascadingCondOp( const InstantiationData data )
+: Plugin( data )
+{
+}
+
+// Perform the actual action.
+void CascadingCondOp::run()
+{
+// Traverse the whole AST of the translation unit (i.e. examine the whole
source file).
+// The Clang AST helper class will call VisitReturnStmt for every return
statement.
+TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
+}
+
+void CascadingCondOp::Walk( const Stmt* stmt )
+{
+for(Stmt::const_child_iterator it = stmt-child_begin(); it !=
stmt-child_end(); ++it)
+{
+if ( const ConditionalOperator* condop = dyn_cast ConditionalOperator
( *it ))
+report( DiagnosticsEngine::Warning, cascading conditional
operator, condop-getLocStart());
+Walk(*it);
+}
+}
+
+bool CascadingCondOp::VisitStmt( const Stmt* stmt )
+{
+if ( const ConditionalOperator* condop = dyn_cast ConditionalOperator (
stmt ))
+Walk(condop);
+return true;
+}
+
+// Register the plugin action with the LO plugin handling.
+static Plugin::Registration CascadingCondOp X( cascadingcondop );
+
+} // namespace loplugin
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/store/cascadingcondop.hxx
b/compilerplugins/clang/store/cascadingcondop.hxx
new file mode 100644
index 000..e648bdf
--- /dev/null
+++ b/compilerplugins/clang/store/cascadingcondop.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+#ifndef CASCADINGCONDOP_H
+#define CASCADINGCONDOP_H
+
+#include plugin.hxx
+
+namespace loplugin
+{
+
+// The class implementing the plugin action.
+class CascadingCondOp
+// Inherits from the Clang class that will allow examing the Clang AST
tree (i.e. syntax tree).
+: public RecursiveASTVisitor CascadingCondOp
+// And the base class for LO Clang plugins.
+, public Plugin
+{
+public:
+CascadingCondOp( const InstantiationData data );
+virtual void run() override;
+void Walk( const Stmt* stmt );
+bool VisitStmt( const Stmt* stmt );
+};
+
+} // namespace loplugin
+
+#endif // CASCADINGCONDOP_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/opengl vcl/source
vcl/opengl/gdiimpl.cxx |1 -
vcl/source/outdev/gradient.cxx | 19 ---
2 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 738f3b4e026ec4d57d7de691df9d253f4497d9b0
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Wed Nov 19 10:09:42 2014 -0500
vcl: Apply the OutputDevice transformation to the gradient clipping polygon
Change-Id: I16845c6cb0c110749112d608c209020f21549e70
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index c008cc2..53c7ce0 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1705,7 +1705,6 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon rPolyPoly,
aBoundRect.Top()--;
aBoundRect.Right()++;
aBoundRect.Bottom()++;
-//TODO: lfrb: some missing transformation with the polygon in outdev
PreDraw();
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 77be6a0..8916e76 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -41,8 +41,6 @@ void OutputDevice::DrawGradient( const Rectangle rRect,
void OutputDevice::DrawGradient( const tools::PolyPolygon rPolyPoly,
const Gradient rGradient )
{
-bool bDrawn = false;
-
if ( mnDrawMode DRAWMODE_NOGRADIENT )
return; // nothing to draw!
@@ -52,12 +50,7 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon
rPolyPoly,
if ( mbOutputClipped )
return;
-if ( mpGraphics || AcquireGraphics() )
-{
-bDrawn = mpGraphics-DrawGradient( rPolyPoly, rGradient, this );
-}
-
-if ( !bDrawn rPolyPoly.Count() rPolyPoly[ 0 ].GetSize() )
+if ( rPolyPoly.Count() rPolyPoly[ 0 ].GetSize() )
{
if ( mnDrawMode ( DRAWMODE_BLACKGRADIENT | DRAWMODE_WHITEGRADIENT |
DRAWMODE_SETTINGSGRADIENT) )
{
@@ -95,6 +88,9 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon
rPolyPoly,
// do nothing if the rectangle is empty
if ( !aRect.IsEmpty() )
{
+tools::PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel(
rPolyPoly ) );
+bool bDrawn = false;
+
if( !mpGraphics !AcquireGraphics() )
return;
@@ -105,10 +101,11 @@ void OutputDevice::DrawGradient( const
tools::PolyPolygon rPolyPoly,
if( mbInitClipRegion )
InitClipRegion();
-if( !mbOutputClipped )
-{
-tools::PolyPolygon aClipPolyPoly( ImplLogicToDevicePixel(
rPolyPoly ) );
+// try to draw gradient natively
+bDrawn = mpGraphics-DrawGradient( aClipPolyPoly, aGradient,
this );
+if( !bDrawn !mbOutputClipped )
+{
// draw gradients without border
if( mbLineColor || mbInitLineColor )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - config_host/config_features.h.in configure.ac sal/Library_sal.mk sal/osl svx/source
config_host/config_features.h.in |3
configure.ac |1
sal/Library_sal.mk |4
sal/osl/unx/file_path_helper.cxx | 11
sal/osl/unx/file_path_helper.h | 228
sal/osl/unx/file_path_helper.hxx | 194 ++
sal/osl/unx/file_url.cxx |9
sal/osl/unx/file_url.hxx |8
sal/osl/unx/process.cxx | 119 +---
sal/osl/unx/process_impl.cxx |2
sal/osl/unx/signal.c | 1088 --
sal/osl/unx/signal.cxx | 1091 +++
svx/source/svdraw/svdobj.cxx |6
13 files changed, 1350 insertions(+), 1414 deletions(-)
New commits:
commit 4123c2bac37821584b354e016ac4f5c5bc598d02
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 15:43:51 2014 +0100
loplugin:unreffun
Change-Id: I648b91e1124fcdad16ccd5d619192b72e4c8ec3f
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 9c251bc..d5f0c6e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -235,7 +235,6 @@ public:
~SdrObjUserDataList();
size_t GetUserDataCount() const;
-const SdrObjUserData* GetUserData(size_t nNum) const;
SdrObjUserData* GetUserData(size_t nNum);
void AppendUserData(SdrObjUserData* pData);
void DeleteUserData(size_t nNum);
@@ -249,11 +248,6 @@ size_t SdrObjUserDataList::GetUserDataCount() const
return static_castsal_uInt16(maList.size());
}
-const SdrObjUserData* SdrObjUserDataList::GetUserData(size_t nNum) const
-{
-return maList.at(nNum);
-}
-
SdrObjUserData* SdrObjUserDataList::GetUserData(size_t nNum)
{
return maList.at(nNum);
commit bb05f1128fa073b35788a73ff6e8a5d8366b7710
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 14:51:29 2014 +0100
Remove obsolete osl_searchPath_impl
(obsoleting cid#983584)
Change-Id: Icbf25bd364fdabb208abe201ddc146daa60f9b62
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 6b1cca2..1ce6424 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -621,9 +621,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*
ustrBaseDirURL, rtl_uString* u
return oslFileError(rc);
}
-namespace
-{
-
+namespace osl { namespace detail {
/*
No separate error code if unicode to text
conversion or getenv fails because for the
@@ -642,7 +640,10 @@ namespace
return bfound;
}
+} }
+namespace
+{
/*
No separate error code if unicode to text
conversion or getcwd fails because for the
@@ -689,7 +690,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath,
rtl_uString* ustrSearc
rtl::OUString result;
if (find_in_searchPath(file_path, ustrSearchPath, result) ||
-find_in_PATH(file_path, result) ||
+osl::detail::find_in_PATH(file_path, result) ||
find_in_CWD(file_path, result))
{
rtl::OUString resolved;
diff --git a/sal/osl/unx/file_url.hxx b/sal/osl/unx/file_url.hxx
index d087638..eceaabd 100644
--- a/sal/osl/unx/file_url.hxx
+++ b/sal/osl/unx/file_url.hxx
@@ -22,6 +22,8 @@
#include osl/file.h
+namespace rtl { class OUString; }
+
oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL,
rtl_uString **pustrSystemPath);
oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString*
ustrFileURL);
@@ -30,6 +32,12 @@ int UnicodeToText(char * buffer, size_t bufLen, const
sal_Unicode * uniText, sal
int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode*
unic_text, sal_Int32 unic_text_buffer_size);
+namespace osl { namespace detail {
+
+bool find_in_PATH(const rtl::OUString file_path, rtl::OUString result);
+
+} }
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 57af42b..537b1eb 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -50,6 +50,7 @@
#include osl/conditn.h
#include osl/thread.h
#include osl/file.h
+#include osl/file.hxx
#include osl/signal.h
#include rtl/alloc.h
#include sal/log.hxx
@@ -94,69 +95,6 @@ struct ProcessData
static oslProcessImpl* ChildList;
static oslMutexChildListMutex;
-/**
- Deprecated
- Old and buggy implementation of osl_searchPath used only by
- osl_psz_executeProcess.
- A new implementation is in file_path_helper.cxx
- */
-
-static oslProcessError SAL_CALL osl_searchPath_impl(const sal_Char* pszName,
- sal_Char *pszBuffer, sal_uInt32 Max)
-{
-sal_Char path[PATH_MAX + 1];
-sal_Char *pchr;
-
-path[0] = '\0';
-
-OSL_ASSERT(pszName != NULL);
-
-if ( pszName == 0 )
-{
-
Building on MAC OS-X 10.10 fails - Java Runtime missing
Hi, I'm trying to build now on a totally fresh clean Macbook, after I've installed whatever was needed. (went with the easy approach, but was missing JDK and ANT so I've installed them separatly). After cloning, autogen make - I get these unit-test errors: http://pastebin.com/raw.php?i=iYF13p1s All the unit-tests seem to come from 'dbaccess'. I also see this line in the output: No Java runtime present, requesting install. Wasn't JDK 64-bit enough ? In the installation guide for Mac https://wiki.documentfoundation.org/Development/BuildingOnMac it said that only if autogen asks if I want to install JRE - I should accept, so I've assumed it is not missing, since autogen did not complain about it. Best, *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/examples
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
|1 +
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
|1 +
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
|4
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
|1 +
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
|1 +
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
|2 ++
odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx
|1 +
odk/examples/cpp/complextoolbarcontrols/MyJob.h
|1 +
odk/examples/cpp/complextoolbarcontrols/MyListener.h
|1 +
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
|1 +
odk/examples/cpp/counter/counter.cxx
|1 +
odk/examples/cpp/counter/countermain.cxx
|2 ++
odk/examples/cpp/remoteclient/remoteclient.cxx
|1 +
13 files changed, 18 insertions(+)
New commits:
commit 26cf7dcf19933feffabcb6b690e840c51f04c31b
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 17:06:30 2014 +0100
Make SDK examples compile again
...after various recent changes to include files etc.
Change-Id: I9d2acbcfb09ca1df6247038afa6fbd99aa74a90d
diff --git
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 41466a4..6a57f32 100644
---
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
+++
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
@@ -46,6 +46,7 @@
// include our specific addon header to get access to functions and definitions
#include addon.hxx
+using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git
a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index fcfef8f..20649fc 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -43,6 +43,7 @@
#include my_module/XSomething.hpp
+using namespace ::rtl; // for OUString
using namespace ::com::sun::star; // for odk interfaces
using namespace ::com::sun::star::uno; // for basic types
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
index b80b3e4..b482d50 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
@@ -41,6 +41,10 @@
#include cppuhelper/compbase2.hxx
#include SConnection.hxx
+namespace com { namespace sun { namespace star { namespace lang {
+class XMultiServiceFactory;
+} } } }
+
namespace connectivity
{
namespace skeleton
diff --git
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index 5676354..a64fa88 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -44,6 +44,7 @@
#include com/sun/star/sdbc/FetchDirection.hpp
#include com/sun/star/lang/DisposedException.hpp
#include cppuhelper/typeprovider.hxx
+#include cppuhelper/queryinterface.hxx
#include propertyids.hxx
using namespace connectivity::skeleton;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
index 89f1f38..9d234e9 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
+++
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
@@ -43,6 +43,7 @@
#include filterdetect.hxx
+using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index cd87a7e..6c7e6d7 100644
---
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/conditn.cxx |2 sal/osl/unx/file.cxx |2 sal/osl/unx/file_misc.cxx|2 sal/osl/unx/file_stat.cxx|2 sal/osl/unx/file_url.cxx |2 sal/osl/unx/file_volume.cxx |2 sal/osl/unx/interlck.cxx |2 sal/osl/unx/module.cxx |2 sal/osl/unx/mutex.cxx|2 sal/osl/unx/nlsupport.cxx|2 sal/osl/unx/pipe.cxx |2 sal/osl/unx/process.cxx |2 sal/osl/unx/profile.cxx |2 sal/osl/unx/readwrite_helper.cxx |2 sal/osl/unx/security.cxx |2 sal/osl/unx/signal.cxx |2 sal/osl/unx/socket.cxx |2 sal/osl/unx/system.cxx |2 sal/osl/unx/system.h | 409 --- sal/osl/unx/system.hxx | 403 ++ sal/osl/unx/tempfile.cxx |2 sal/osl/unx/thread.cxx |2 sal/osl/unx/time.cxx |2 sal/osl/unx/uunxapi.cxx |2 24 files changed, 425 insertions(+), 431 deletions(-) New commits: commit af66914c1151533ced12bca6e8a7ec14348bdb9e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 19 17:12:03 2014 +0100 system.h - system.hxx Change-Id: I39a60d0b775bfe40fa89e8b5d5f7466d0db5d36e diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 36fd44a..1ba0f84 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -21,7 +21,7 @@ #include assert.h -#include system.h +#include system.hxx #include sal/log.hxx #include sal/types.h diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index a8b004b..659526b 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -30,7 +30,7 @@ #include sal/log.hxx -#include system.h +#include system.hxx #include createfilehandlefromfd.hxx #include file_error_transl.hxx #include file_impl.hxx diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx index 658e0a6..44095fa 100644 --- a/sal/osl/unx/file_misc.cxx +++ b/sal/osl/unx/file_misc.cxx @@ -26,7 +26,7 @@ #include rtl/alloc.h #include rtl/string.hxx -#include system.h +#include system.hxx #include file_impl.hxx #include file_error_transl.hxx #include file_path_helper.hxx diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index c589e40..ab61199 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -19,7 +19,7 @@ #include osl/file.h -#include system.h +#include system.hxx #include sys/types.h #include dirent.h #include errno.h diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx index 1ce6424..30c03ba 100644 --- a/sal/osl/unx/file_url.cxx +++ b/sal/osl/unx/file_url.cxx @@ -19,7 +19,7 @@ #include file_url.hxx -#include system.h +#include system.hxx #include limits.h #include errno.h diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index c530eb0..f99092d 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -25,7 +25,7 @@ #include file_error_transl.hxx #include file_url.hxx -#include system.h +#include system.hxx #include errno.h #include limits.h diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx index 025d8dc..01e8da4 100644 --- a/sal/osl/unx/interlck.cxx +++ b/sal/osl/unx/interlck.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include system.h +#include system.hxx #include osl/interlck.h #include osl/diagnose.h diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index cb0e763..e8ae7b5 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -26,7 +26,7 @@ #include osl/process.h #include osl/file.h #include assert.h -#include system.h +#include system.hxx #include file_url.hxx #ifdef AIX diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx index 62f212f..5898622 100644 --- a/sal/osl/unx/mutex.cxx +++ b/sal/osl/unx/mutex.cxx @@ -23,7 +23,7 @@ #define _GNU_SOURCE 1 #endif #endif -#include system.h +#include system.hxx #include osl/mutex.h #include osl/diagnose.h diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index a7e7640..93cc859 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -836,7 +836,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale ) } #if defined(MACOSX) || defined(IOS) -#include system.h +#include system.hxx /* return the current process locale diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index 12e9b6a..b1b5a76 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include system.h +#include system.hxx #include osl/pipe.h #include osl/diagnose.h diff --git a/sal/osl/unx/process.cxx
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/nlsupport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 437cf27b6db107b2b74836ac2d897a10ebc67c0b Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 19 17:15:19 2014 +0100 Blind fix for Android Change-Id: I091fa9f9fd4c2df1818aadcba7995b174b07f098 diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index 93cc859..f6ae33c 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -901,7 +901,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale ) /* No locale environment variables on Android, so why even bother * with getenv(). */ - char * locale = en-US.UTF-8; + char const * locale = en-US.UTF-8; #else /* simulate behavior off setlocale */ char * locale = getenv( LC_ALL ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/uiconfig
basctl/uiconfig/basicide/ui/deletelangdialog.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 42fbe6391896422a13807a751d4ab03a46275656 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Nov 19 09:47:01 2014 -0600 Fix typo in deletelangdialog.ui Change-Id: I20602fb7f048c2c79073b47539cad6419fb90bb5 Reviewed-on: https://gerrit.libreoffice.org/12969 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/basctl/uiconfig/basicide/ui/deletelangdialog.ui b/basctl/uiconfig/basicide/ui/deletelangdialog.ui index d17a24f..2aa1f4b 100644 --- a/basctl/uiconfig/basicide/ui/deletelangdialog.ui +++ b/basctl/uiconfig/basicide/ui/deletelangdialog.ui @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.1 -- +!-- Generated with glade 3.18.3 -- interface requires lib=gtk+ version=3.0/ object class=GtkMessageDialog id=DeleteLangDialog @@ -11,13 +11,13 @@ property name=skip_taskbar_hintTrue/property property name=message_typequestion/property property name=buttonsok-cancel/property -property name=text translatable=yesDo you want to delete the resources of the selected language(s)/property +property name=text translatable=yesDo you want to delete the resources of the selected language(s)?/property property name=secondary_text translatable=yesYou are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted./property child internal-child=vbox object class=GtkBox id=messagedialog-vbox property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing24/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=messagedialog-action_area property name=can_focusFalse/property ___ 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/gridwin.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 755209d88073fd497b884b8de1348ec75c2df7eb
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 19 16:39:55 2014 +
Resolves: rhbz#1165444 abrt crash with NULL pView
Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e8defd1..7b27f0c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5183,12 +5183,9 @@ bool ScGridWindow::GetEditUrl( const Point rPos,
ScInputHandler* pInputHdl = NULL;
if (pViewSh)
pInputHdl = pViewSh-GetInputHandler();
-
-if (pInputHdl pInputHdl-IsInputMode())
-{
-EditView* pView = pInputHdl-GetTableView();
+EditView* pView = (pInputHdl pInputHdl-IsInputMode()) ?
pInputHdl-GetTableView() : NULL;
+if (pView)
return extractURLInfo(pView-GetFieldUnderMousePointer(), pName, pUrl,
pTarget);
-}
//! nPosX/Y mit uebergeben?
SCsCOL nPosX;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|7 +++
writerfilter/source/dmapper/NumberingManager.cxx|3 ++-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 14 +++---
4 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit 122d97673d762cc5fc043bdadfdf4cb80ac871cf
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 19 17:34:45 2014 +0100
writerfilter: indentation fixes
Change-Id: Ib9bee587931cd020848b033ce4429f36d04e61b1
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1234e37..5481466 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5865,7 +5865,7 @@ int RTFDocumentImpl::popState()
RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelSuffix_val, pValue);
}
-break;
+break;
case DESTINATION_PARAGRAPHNUMBERING_TEXTBEFORE:
if (!m_aStates.empty())
{
@@ -5873,7 +5873,7 @@ int RTFDocumentImpl::popState()
RTFValue::Pointer_t pValue(new
RTFValue(aState.aDestinationText.makeStringAndClear(), true));
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_LevelText_val, pValue);
}
-break;
+break;
case DESTINATION_LISTNAME:
break;
case DESTINATION_LISTLEVEL:
@@ -5888,7 +5888,7 @@ int RTFDocumentImpl::popState()
else
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_NumLvl_lvl,
pValue);
}
-break;
+break;
case DESTINATION_LFOLEVEL:
if (!m_aStates.empty())
{
@@ -5898,7 +5898,7 @@ int RTFDocumentImpl::popState()
RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes,
aState.aTableSprms));
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Num_lvlOverride,
pValue);
}
-break;
+break;
// list override table
case DESTINATION_LISTOVERRIDEENTRY:
if (!m_aStates.empty())
@@ -5916,14 +5916,14 @@ int RTFDocumentImpl::popState()
m_aListTableSprms.set(NS_ooxml::LN_CT_Numbering_num, pValue,
OVERWRITE_NO_APPEND);
}
}
-break;
+break;
case DESTINATION_LEVELTEXT:
if (!m_aStates.empty())
{
RTFValue::Pointer_t pValue(new RTFValue(aState.aTableAttributes));
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Lvl_lvlText,
pValue);
}
-break;
+break;
case DESTINATION_LEVELNUMBERS:
if (!m_aStates.empty())
m_aStates.top().aTableSprms = aState.aTableSprms;
@@ -5947,7 +5947,7 @@ int RTFDocumentImpl::popState()
// both \sp and \sv are destinations, copy the text up-ward for
later
m_aStates.top().aDestinationText = aState.aDestinationText;
}
-break;
+break;
case DESTINATION_FALT:
if (!m_aStates.empty())
m_aStates.top().aTableSprms = aState.aTableSprms;
commit d9f0c19edde7cb28086860ea6b3519be0d49a3e0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 19 17:25:04 2014 +0100
DOCX import: handle w:lvlOverride without w:lvlText
Change-Id: I0b941bd7a733408655db192b8608ed3987b9c1fc
diff --git a/sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx
b/sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx
new file mode 100644
index 000..5ee3602
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 964ec96..8c78d45 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -591,6 +591,13 @@ DECLARE_OOXMLEXPORT_TEST(testNumParentStyle,
num-parent-style.docx)
CPPUNIT_ASSERT(getPropertyOUString(getParagraph(4),
NumberingStyleName).startsWith(WWNum));
}
+DECLARE_OOXMLEXPORT_TEST(testNumOverrideLvltext, num-override-lvltext.docx)
+{
+uno::Referencecontainer::XIndexAccess xRules = getProperty
uno::Referencecontainer::XIndexAccess
(getStyles(NumberingStyles)-getByName(WWNum1), NumberingRules);
+// This was 1, i.e. the numbering on the second level was 1, not 1.1.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2),
comphelper::SequenceAsHashMap(xRules-getByIndex(1))[ParentNumbering].getsal_Int16());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2d5618d..af2c2e3 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -614,7 +614,8 @@ void
[Libreoffice-commits] core.git: 3 commits - officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 - sc/source/core/tool/calcconfig.cxx |7 +++ sc/source/ui/optdlg/calcoptionsdlg.cxx | 29 +++ 3 files changed, 31 insertions(+), 7 deletions(-) New commits: commit c560b4d7d981328026bec2b0a6e6ea533c02818c Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 19 18:49:49 2014 +0200 Add COUNT Change-Id: Ibdff629c3653d43e08b5200a7babb7ff05a7b5ac diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index bfb5f88..aa44d84 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1373,7 +1373,7 @@ might be calculated using OpenCL./desc !-- numeric values correspond to RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS -- /info - value40;41;42;43;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value + value40;41;42;43;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;227;236;403/value /prop prop oor:name=OpenCLAutoSelect oor:type=xs:boolean oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 0ec1e17..69abb2d 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -62,6 +62,7 @@ void ScCalcConfig::setOpenCLConfigToDefault() maOpenCLSubsetOpCodes.insert(ocSum); maOpenCLSubsetOpCodes.insert(ocProduct); maOpenCLSubsetOpCodes.insert(ocAverage); +maOpenCLSubsetOpCodes.insert(ocCount); maOpenCLSubsetOpCodes.insert(ocNormDist); maOpenCLSubsetOpCodes.insert(ocSumIfs); commit 44f941692521c21f5c152f3bab84b07f19f22353 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 19 18:48:14 2014 +0200 Add opcodes for binary operators + - * / These are of course very common, and one would hope they are correctly implemented in our OpenCL code. Change-Id: I0ca6d3983502b18a1ea56522d4f20673ad94357d diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index abf01b0..bfb5f88 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1373,7 +1373,7 @@ might be calculated using OpenCL./desc !-- numeric values correspond to RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS -- /info - value82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value + value40;41;42;43;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value /prop prop oor:name=OpenCLAutoSelect oor:type=xs:boolean oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index ff81e98..0ec1e17 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -40,6 +40,12 @@ void ScCalcConfig::setOpenCLConfigToDefault() mbOpenCLAutoSelect = true; mnOpenCLMinimumFormulaGroupSize = 100; +// Keep in order of opcode value, is that clearest? (Random order, +// at least, would make no sense at all.) +maOpenCLSubsetOpCodes.insert(ocAdd); +maOpenCLSubsetOpCodes.insert(ocSub); +maOpenCLSubsetOpCodes.insert(ocMul); +maOpenCLSubsetOpCodes.insert(ocDiv); maOpenCLSubsetOpCodes.insert(ocSin); maOpenCLSubsetOpCodes.insert(ocCos); maOpenCLSubsetOpCodes.insert(ocTan); commit f8e17ff09f03240a71b1292b9bd8af9a17c10ca7 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 19 16:27:33 2014 +0200 Test also MIN, MAX and PRODUCT Change-Id: Ibbc4c65271142b63c85d08ab4c9162ba96d32b6a diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 92af35a..a92b75d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -9,6 +9,7 @@ #include sal/config.h +#include algorithm #include cmath #include calcconfig.hxx @@ -999,27 +1000,43 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, ) pDoc-SetValue(ScAddress(0,i,1), (i%13)/13.); #endif pDoc-SetValue(ScAddress(1,i,1), comphelper::rng::uniform_real_distribution(0, 1000)); +// The [0.1,2.5) interval is carefully chosen to keep the product of them likely sane +pDoc-SetValue(ScAddress(6,i,1), comphelper::rng::uniform_real_distribution(0.1, 2.5)); pDoc-SetString(ScAddress(10,i,1), OUString(=IF(AND(A) + OUString::number(i+1) + =
Re: Building on MAC OS-X 10.10 fails - Java Runtime missing
On 11/19/2014 04:54 PM, Adam Fyne wrote: I'm trying to build now on a totally fresh clean Macbook, after I've installed whatever was needed. (went with the easy approach, but was missing JDK and ANT so I've installed them separatly). After cloning, autogen make - I get these unit-test errors: http://pastebin.com/raw.php?i=iYF13p1s All the unit-tests seem to come from 'dbaccess'. I also see this line in the output: No Java runtime present, requesting install. Wasn't JDK 64-bit enough ? see http://lists.freedesktop.org/archives/libreoffice/2014-October/064096.html Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8 and http://lists.freedesktop.org/archives/libreoffice/2014-October/064097.html Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/chtoutline.rtf | 207 +
sw/qa/extras/rtfimport/rtfimport.cxx | 22 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8
3 files changed, 236 insertions(+), 1 deletion(-)
New commits:
commit 49329e371c0a5f1fe7e605841109cab02e053b1a
Author: Mark Hung mark...@gmail.com
Date: Tue Nov 18 16:21:44 2014 -0800
Fix rtf outline importing issue.
When importing RTF files, the outline is treated
as normal numbering list. Open the toolschapter, outline
doesn't correspond to heading styles correctly.
This patch is to handle RTF keyword \s in a \listlevel.
The patch use style name as its id so that is consistent
with the one already used by StyleSheetEntry.
Change-Id: I5ab6602b5ce64ca65ec08e0adb34d60ae7293650
Reviewed-on: https://gerrit.libreoffice.org/12960
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/rtfimport/data/chtoutline.rtf
b/sw/qa/extras/rtfimport/data/chtoutline.rtf
new file mode 100644
index 000..58c1b7b
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/chtoutline.rtf
@@ -0,0 +1,207 @@
+{\rtf1\adeflang1025\ansi\ansicpg950\uc2\adeff0\deff0\stshfdbch14\stshfloch37\stshfhich37\stshfbi0\deflang1033\deflangfe1028\themelang1033\themelangfe1028\themelangcs0{\fonttbl{\f0\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f14\fbidi \froman\fcharset136\fprq2{\*\panose
02020500}\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9{\*\falt
PMingLiU};}{\f14\fbidi \froman\fcharset136\fprq2{\*\panose
02020500}\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9{\*\falt PMingLiU};}
+{\f36\fbidi \froman\fcharset0\fprq2{\*\panose
02040503050406030204}Cambria;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose
020f0502020204030204}Calibri;}
+{\f38\fbidi \froman\fcharset136\fprq2{\*\panose
02020500}@\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9;}{\flomajor\f31500\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset136\fprq2{\*\panose
02020500}\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9{\*\falt
PMingLiU};}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose
02040503050406030204}Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi
\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset136\fprq2{\*\panose
02020500}\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9{\*\falt
PMingLiU};}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose
020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose
02020603050405020304}Times New Roman;}{\f347\fbidi \froman\fcharset238\fprq2
Times New Roman CE;}{\f348\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f350\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f351\fbidi
\froman\fcharset162\fprq2 Times New Roman Tur;}{\f352\fbidi
\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f353\fbidi
\froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f354\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f355\fbidi
\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f489\fbidi
\froman\fcharset0\fprq2 PMingLiU Western{\*\falt PMingLiU};}
+{\f489\fbidi \froman\fcharset0\fprq2 PMingLiU Western{\*\falt
PMingLiU};}{\f707\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\f708\fbidi
\froman\fcharset204\fprq2 Cambria Cyr;}{\f710\fbidi \froman\fcharset161\fprq2
Cambria Greek;}
+{\f711\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\f714\fbidi
\froman\fcharset186\fprq2 Cambria Baltic;}{\f715\fbidi
\froman\fcharset163\fprq2 Cambria (Vietnamese);}{\f717\fbidi
\fswiss\fcharset238\fprq2 Calibri CE;}
+{\f718\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f720\fbidi
\fswiss\fcharset161\fprq2 Calibri Greek;}{\f721\fbidi \fswiss\fcharset162\fprq2
Calibri Tur;}{\f724\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\f725\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f729\fbidi
\froman\fcharset0\fprq2 @\'b7\'73\'b2\'d3\'a9\'fa\'c5\'e9
Western;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman
Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman
Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman
(Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman
(Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman
Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman
(Vietnamese);}{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 PMingLiU
Western{\*\falt PMingLiU};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2
Cambria CE;}
[Libreoffice-commits] core.git: comphelper/source framework/source include/comphelper sw/source
comphelper/source/misc/sequenceashashmap.cxx | 23 +++ framework/source/inc/loadenv/loadenv.hxx |1 + include/comphelper/sequenceashashmap.hxx |5 ++--- sw/source/core/unocore/unodraw.cxx | 11 +-- 4 files changed, 19 insertions(+), 21 deletions(-) New commits: commit fced31697bcc2a2a4da34d804582002de0320302 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Nov 19 18:16:18 2014 +0100 comphelper::SequenceAsHashMap: throw IllegalArgumentException ...instead of IllegalTypeException (where the latter is not a RuntimeException). Fixes cid#707218, cid#1224993, etc., and reverts previous fix 358f5280e0f6afb968edc295d8f1dce55f05e18f Fix coverity#1224993 w/o breaking JunitTest_framework_unoapi. Change-Id: I13ce153e1513749fb0be2ee8e560cec86a30c5ba diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 35f2d6b..46df283 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include sal/config.h + +#include com/sun/star/lang/IllegalArgumentException.hpp #include comphelper/sequenceashashmap.hxx @@ -75,8 +78,9 @@ void SequenceAsHashMap::operator(const css::uno::Any aSource) return; } -throw css::beans::IllegalTypeException( -Any contains wrong type. ); +throw css::lang::IllegalArgumentException( +Any contains wrong type., css::uno::Referencecss::uno::XInterface(), +-1); } @@ -94,8 +98,9 @@ void SequenceAsHashMap::operator(const css::uno::Sequence css::uno::Any lS (lP.Name.isEmpty()) || (!lP.Value.hasValue()) ) -throw css::beans::IllegalTypeException( -PropertyValue struct contains no useful information. ); +throw css::lang::IllegalArgumentException( +PropertyValue struct contains no useful information., +css::uno::Referencecss::uno::XInterface(), -1); (*this)[lP.Name] = lP.Value; continue; } @@ -107,16 +112,18 @@ void SequenceAsHashMap::operator(const css::uno::Sequence css::uno::Any lS (lN.Name.isEmpty()) || (!lN.Value.hasValue()) ) -throw css::beans::IllegalTypeException( -NamedValue struct contains no useful information. ); +throw css::lang::IllegalArgumentException( +NamedValue struct contains no useful information., +css::uno::Referencecss::uno::XInterface(), -1); (*this)[lN.Name] = lN.Value; continue; } // ignore VOID Any ... but reject wrong filled ones! if (lSource[i].hasValue()) -throw css::beans::IllegalTypeException( -Any contains wrong type. ); +throw css::lang::IllegalArgumentException( +Any contains wrong type., +css::uno::Referencecss::uno::XInterface(), -1); } } diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index ae598df..3ac1465 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -22,6 +22,7 @@ #include loadenv/loadenvexception.hxx #include loadenv/actionlockguard.hxx +#include com/sun/star/beans/IllegalTypeException.hpp #include com/sun/star/lang/IllegalArgumentException.hpp #include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/frame/XComponentLoader.hpp diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 38cf734..7d9cdfd 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -27,7 +27,6 @@ #include com/sun/star/beans/PropertyValue.hpp #include com/sun/star/beans/NamedValue.hpp -#include com/sun/star/beans/IllegalTypeException.hpp #include comphelper/comphelperdllapi.h @@ -99,7 +98,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param aSource contains the new items for this map. -@throw An com::sun::star::beans::IllegalTypeException +@throw An com::sun::star::lang::IllegalArgumentException is thrown, if the given any does not contain a suitable sequence ... but not if it's a VOID Any! */ @@ -114,7 +113,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase @param lSource contains the new items for this map. -@throw An com::sun::star::beans::IllegalTypeException +@throw An
[Libreoffice-commits] core.git: framework/source
framework/source/inc/loadenv/loadenv.hxx |2 +-
framework/source/loadenv/loadenv.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e753f8b9dc3b4df22f85f1366a15503de2464fd5
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 18:25:42 2014 +0100
Revert cid#706551 Uncaught exception
This reverts commit ec651eaead5aaa2a74f4c87d3bf17f7feddb958e, now that
fced31697bcc2a2a4da34d804582002de0320302 comphelper::SequenceAsHashMap:
throw
IllegalArgumentException made the underlying problem go away.
Conflicts:
framework/source/inc/loadenv/loadenv.hxx
framework/source/loadenv/loadenv.cxx
Change-Id: I473815256b95f6e20a2e1a4a5617f491636305ab
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 3ac1465..4b157ca 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -466,7 +466,7 @@ private:
the whole runtime can't be used any longer.
*/
bool impl_loadContent()
-throw(LoadEnvException, css::uno::RuntimeException,
css::beans::IllegalTypeException, std::exception);
+throw(LoadEnvException, css::uno::RuntimeException, std::exception);
/** @short checks if the specified content is already loaded.
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 64eca8e..8bc66de 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -999,7 +999,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
}
bool LoadEnv::impl_loadContent()
-throw(LoadEnvException, css::uno::RuntimeException,
beans::IllegalTypeException, std::exception)
+throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE - ---
osl::ClearableMutexGuard aWriteLock(m_mutex);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/inc/loadenv/loadenv.hxx |2 +-
framework/source/loadenv/loadenv.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6f58f34fc0cd74c198b9474d074529bc4c9d7e02
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 18:28:46 2014 +0100
Revert cid#706552 Uncaught exception
This reverts commit ecd00991fd5884cd769ed00c9c3f42ba44d64511, now that
fced31697bcc2a2a4da34d804582002de0320302 comphelper::SequenceAsHashMap:
throw
IllegalArgumentException made the underlying problem go away.
Conflicts:
framework/source/inc/loadenv/loadenv.hxx
framework/source/loadenv/loadenv.cxx
Change-Id: I7821ae67b5cc99b8591fbf06396ac20098e55c8d
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 4b157ca..cbc11dc 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -447,7 +447,7 @@ private:
the whole runtime can't be used any longer.
*/
bool impl_handleContent()
-throw(LoadEnvException, css::uno::RuntimeException,
css::beans::IllegalTypeException, std::exception);
+throw(LoadEnvException, css::uno::RuntimeException, std::exception);
/** @short tries to use FrameLoader objects for loading.
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 8bc66de..965d6d4 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -853,7 +853,7 @@ void LoadEnv::impl_detectTypeAndFilter()
}
bool LoadEnv::impl_handleContent()
-throw(LoadEnvException, css::uno::RuntimeException,
beans::IllegalTypeException, std::exception)
+throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
// SAFE - ---
osl::ClearableMutexGuard aReadLock(m_mutex);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/inc/loadenv/loadenv.hxx |3 +--
framework/source/loadenv/loadenv.cxx |2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 30bf5787e1f996b4dd690e8bf8d49133ad1e9bba
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 18:30:46 2014 +0100
Revert cid#706553 Uncaught exception
This reverts commit 0a87f4ad1a45ad885a1418d0d6bed21db456, now that
fced31697bcc2a2a4da34d804582002de0320302 comphelper::SequenceAsHashMap:
throw
IllegalArgumentException made the underlying problem go away.
Conflicts:
framework/source/inc/loadenv/loadenv.hxx
framework/source/loadenv/loadenv.cxx
Change-Id: Id2f468bf0f24f5a8a7a0e6eb113ccfedd35b03cc
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index cbc11dc..3bf66fff 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -22,7 +22,6 @@
#include loadenv/loadenvexception.hxx
#include loadenv/actionlockguard.hxx
-#include com/sun/star/beans/IllegalTypeException.hpp
#include com/sun/star/lang/IllegalArgumentException.hpp
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/frame/XComponentLoader.hpp
@@ -413,7 +412,7 @@ private:
the whole runtime can't be used any longer.
*/
void impl_detectTypeAndFilter()
-throw(LoadEnvException, css::uno::RuntimeException,
css::beans::IllegalTypeException, std::exception);
+throw(LoadEnvException, css::uno::RuntimeException, std::exception);
/** @short tries to ask user for it's filter decision in case
normal detection failed.
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 965d6d4..cfb474a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -735,7 +735,7 @@ bool queryOrcusTypeAndFilter(const
uno::Sequencebeans::PropertyValue, OUStrin
}
void LoadEnv::impl_detectTypeAndFilter()
-throw(LoadEnvException, css::uno::RuntimeException,
beans::IllegalTypeException, std::exception)
+throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{
static const char TYPEPROP_PREFERREDFILTER[] = PreferredFilter;
static const char FILTERPROP_FLAGS[] = Flags;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/Library_svxcore.mk svx/source
include/svx/svdobj.hxx | 25 ---
svx/Library_svxcore.mk |2
svx/source/inc/svdobjplusdata.hxx| 47 +++
svx/source/inc/svdobjuserdatalist.hxx| 36 +++
svx/source/svdraw/svdoashp.cxx |1
svx/source/svdraw/svdobj.cxx | 97 ---
svx/source/svdraw/svdobjplusdata.cxx | 67 +
svx/source/svdraw/svdobjuserdatalist.cxx | 35 +++
8 files changed, 192 insertions(+), 118 deletions(-)
New commits:
commit 64ce79ff5eab8fe686c13c0ad676ad7f941a346f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 19 10:57:27 2014 -0500
Move SdrObjPlusData out of SdrObject's header.
It is only used locally within svx.
Change-Id: Iae53de3d1cb2b1f5f2ba5cede2794f08dfef972c
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 9768b9c..5a5ab9b 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -73,6 +73,7 @@ class SfxPoolItem;
class SdrVirtObj;
class SdrDragView;
class SdrObjUserDataList;
+class SdrObjPlusData;
namespace sdr
{
@@ -227,30 +228,6 @@ public:
virtual ~SdrObjGeoData();
};
-// Bitsack for DrawObjects
-class SdrObjPlusData
-{
-friend classSdrObject;
-
-SfxBroadcaster* pBroadcast;// broadcaster, if this object
is referenced (bVirtObj=true). Also for connectors etc.
-SdrObjUserDataList* pUserDataList; // application specific data
-SdrGluePointList* pGluePoints; // glue points for glueing
object connectors
-
-// #i68101#
-// object name, title and description
-OUString aObjName;
-OUString aObjTitle;
-OUString aObjDescription;
-
-public:
-TYPEINFO();
-SdrObjPlusData();
-virtual ~SdrObjPlusData();
-virtual SdrObjPlusData* Clone(SdrObject* pObj1) const;
-
-void SetGluePoints(const SdrGluePointList rPts);
-};
-
// provides information about various ZObject properties
class SVX_DLLPUBLIC SdrObjTransformInfoRec
{
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 23cb969..420a6b8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -303,6 +303,8 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/svdoashp \
svx/source/svdraw/svdoattr \
svx/source/svdraw/svdobj \
+svx/source/svdraw/svdobjplusdata \
+svx/source/svdraw/svdobjuserdatalist \
svx/source/svdraw/svdocapt \
svx/source/svdraw/svdocirc \
svx/source/svdraw/svdoedge \
diff --git a/svx/source/inc/svdobjplusdata.hxx
b/svx/source/inc/svdobjplusdata.hxx
new file mode 100644
index 000..289f64b
--- /dev/null
+++ b/svx/source/inc/svdobjplusdata.hxx
@@ -0,0 +1,47 @@
+/* -*- 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/.
+*/
+
+#ifndef INCLUDED_SVX_SVDOBJPLUSDATA_HXX
+#define INCLUDED_SVX_SVDOBJPLUSDATA_HXX
+
+#include tools/rtti.hxx
+#include rtl/ustring.hxx
+
+class SdrObject;
+class SfxBroadcaster;
+class SdrObjUserDataList;
+class SdrGluePointList;
+
+// Bitsack for DrawObjects
+class SdrObjPlusData
+{
+friend classSdrObject;
+
+SfxBroadcaster* pBroadcast;// broadcaster, if this object
is referenced (bVirtObj=true). Also for connectors etc.
+SdrObjUserDataList* pUserDataList; // application specific data
+SdrGluePointList* pGluePoints; // glue points for glueing
object connectors
+
+// #i68101#
+// object name, title and description
+OUString aObjName;
+OUString aObjTitle;
+OUString aObjDescription;
+
+public:
+TYPEINFO();
+SdrObjPlusData();
+virtual ~SdrObjPlusData();
+virtual SdrObjPlusData* Clone(SdrObject* pObj1) const;
+
+void SetGluePoints(const SdrGluePointList rPts);
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/svdobjuserdatalist.hxx
b/svx/source/inc/svdobjuserdatalist.hxx
new file mode 100644
index 000..b13b640
--- /dev/null
+++ b/svx/source/inc/svdobjuserdatalist.hxx
@@ -0,0 +1,36 @@
+/* -*- 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/.
+*/
+
+#ifndef INCLUDED_SVX_SVDOBJUSERDATALIST_HXX
+#define INCLUDED_SVX_SVDOBJUSERDATALIST_HXX
+
+#include svx/svdobj.hxx
+
+#include boost/ptr_container/ptr_vector.hpp
+
+class SdrObjUserData;
+
+class SdrObjUserDataList
+{
+typedef
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accportions.cxx |2 +-
sw/source/core/access/accportions.hxx |2 +-
sw/source/core/inc/SwPortionHandler.hxx |7 +--
sw/source/core/inc/swfont.hxx |3 +++
sw/source/core/text/porfld.cxx |6 +-
sw/source/core/text/xmldump.cxx | 14 +-
6 files changed, 28 insertions(+), 6 deletions(-)
New commits:
commit 37f613c6eae5ee7e221cecf92ce321622d3cf4a8
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 19 19:02:07 2014 +0100
sw: include the font of SwNumberPortions in layout dump
Change-Id: I3d015c7a97ace6db548c4ad11ae24b0a7daa35c5
diff --git a/sw/source/core/access/accportions.cxx
b/sw/source/core/access/accportions.cxx
index b5ccaae..c997d9e 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -135,7 +135,7 @@ void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16
nAttrFldType )
}
void SwAccessiblePortionData::Special(
-sal_Int32 nLength, const OUString rText, sal_uInt16 nType, sal_Int32
/*nHeight*/, sal_Int32 /*nWidth*/)
+sal_Int32 nLength, const OUString rText, sal_uInt16 nType, sal_Int32
/*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/)
{
OSL_ENSURE( nModelPosition = 0, illegal position );
OSL_ENSURE( (nModelPosition + nLength) = pTxtNode-GetTxt().getLength(),
diff --git a/sw/source/core/access/accportions.hxx
b/sw/source/core/access/accportions.hxx
index 491afee..e99cf8f 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -98,7 +98,7 @@ public:
// SwPortionHandler methods
virtual void Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 nHeight =
0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
-virtual void Special(sal_Int32 nLength, const OUString rText, sal_uInt16
nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0) SAL_OVERRIDE;
+virtual void Special(sal_Int32 nLength, const OUString rText, sal_uInt16
nType, sal_Int32 nHeight = 0, sal_Int32 nWidth = 0, const SwFont* pFont = 0)
SAL_OVERRIDE;
virtual void LineBreak(sal_Int32 nWidth) SAL_OVERRIDE;
virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE;
virtual void Finish() SAL_OVERRIDE;
diff --git a/sw/source/core/inc/SwPortionHandler.hxx
b/sw/source/core/inc/SwPortionHandler.hxx
index 8d04b19..3b76564 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -22,6 +22,8 @@
#include swtypes.hxx
+class SwFont;
+
/** The SwPortionHandler interface implements a visitor for the layout
* engine's text portions. This can be used to gather information of
* the on-screen representation of a single paragraph.
@@ -35,7 +37,7 @@
* held by the corresponding SwTxtNode.
*
* The SwPortionHandler can be used with the
- * SwTextFrame::VisitPortions(...) method.
+ * SwTxtFrm::VisitPortions(...) method.
*/
class SwPortionHandler
{
@@ -68,7 +70,8 @@ public:
const OUString rText, /// text which is painted on-screen
sal_uInt16 nType, /// type of this portion
sal_Int32 nHeight = 0, /// font height of the painted text
-sal_Int32 nWidth = 0 /// width of this portion
+sal_Int32 nWidth = 0, /// width of this portion
+const SwFont* pFont = 0 /// font of this portion
) = 0;
/** line break. This method is called whenever a line break in the
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index fa1d718..b01ba5e 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -36,6 +36,7 @@ class SwDrawTextInfo; // _DrawText
class SwScriptInfo; // _GetTxtSize
class SwViewShell;
class IDocumentSettingAccess;
+typedef struct _xmlTextWriter *xmlTextWriterPtr;
const sal_Unicode CH_BLANK = ' '; // ' ' blank spaces
const sal_Unicode CH_BREAK = 0x0A;
@@ -449,6 +450,8 @@ public:
sal_uInt16 CalcShadowSpace(
const sal_uInt16 nShadow, const bool bVertLayout,
const bool bSkipLeft, const bool bSkipRight ) const;
+
+void dumpAsXml( xmlTextWriterPtr writer = NULL ) const;
};
inline void SwFont::SetColor( const Color rColor )
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 5ee2d1f..997d975 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -445,9 +445,13 @@ bool SwFldPortion::GetExpTxt( const SwTxtSizeInfo rInf,
OUString rTxt ) const
void SwFldPortion::HandlePortion( SwPortionHandler rPH ) const
{
sal_Int32 nH = 0;
+sal_Int32 nW = 0;
if (pFnt)
+{
nH = pFnt-GetSize(pFnt-GetActual()).Height();
-rPH.Special( GetLen(), aExpand, GetWhichPor(), nH );
+nW = pFnt-GetSize(pFnt-GetActual()).Width();
+}
+rPH.Special( GetLen(), aExpand, GetWhichPor(), nH, nW, pFnt );
if( GetWhichPor() == POR_FLD )
{
rPH.SetAttrFieldType(m_nAttrFldType);
diff --git
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - vcl/inc vcl/opengl vcl/source
vcl/inc/regionband.hxx|2 +-
vcl/opengl/gdiimpl.cxx|3 ++-
vcl/source/gdi/regionband.cxx |2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 1f3a20c2d1fffe996cb06fc6f102157ae0bccce3
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Wed Nov 19 14:18:10 2014 -0500
vcl: Correctly set the values for the GL scissor test when clipping
Change-Id: I5ff59f93a3760e6a920860f8aa5fc3f62d0d183d
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 53c7ce0..877db3b 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -182,7 +182,8 @@ bool OpenGLSalGraphicsImpl::setClipRegion( const
vcl::Region rClip )
mbUseStencil = false;
mbUseScissor = true;
maContext.makeCurrent();
-glScissor( aRect.Left(), GetHeight() - aRect.Top(), aRect.GetWidth(),
aRect.GetHeight() );
+glViewport( 0, 0, GetWidth(), GetHeight() );
+glScissor( aRect.Left(), GetHeight() - aRect.Bottom() - 1,
aRect.GetWidth(), aRect.GetHeight() );
}
else
{
commit 913554d500166983b6b8d76506fb38d467986dd4
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Wed Nov 19 14:10:22 2014 -0500
vcl: Actually returns the number of rectangles for the RegionBand
Change-Id: I6be30b28fa608855919890dc47145ef5a3648021
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 5676329..277e2c7 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -73,7 +73,7 @@ public:
void XOr(const RegionBand rSource);
Rectangle GetBoundRect() const;
bool IsInside(const Point rPoint) const;
-sal_uInt32 getRectangleCount() const; // only users are Region::Intersect
and PSWriter::ImplBmp
+sal_uInt32 getRectangleCount() const; // only users are Region::Intersect,
Region::IsRectangle and PSWriter::ImplBmp
void GetRegionRectangles(RectangleVector rTarget) const;
};
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index a7d109f..5e1492c 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -1259,7 +1259,7 @@ sal_uInt32 RegionBand::getRectangleCount() const
pBand = pBand-mpNextBand;
}
-return 0;
+return nCount;
}
#ifdef DBG_UTIL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/grouparealistener.hxx |6 ++
sc/source/core/data/bcaslot.cxx | 28 ++--
sc/source/core/tool/grouparealistener.cxx | 13 +
3 files changed, 41 insertions(+), 6 deletions(-)
New commits:
commit 801e8b05fcfcb7cd19654e00290c3b2eb08ea68f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 19 13:40:09 2014 -0500
Dump formula group listener info.
Change-Id: Idbad1451393c42c272465907312c64c65eba9525
diff --git a/sc/inc/grouparealistener.hxx b/sc/inc/grouparealistener.hxx
index 28e8f43..5abb0e8 100644
--- a/sc/inc/grouparealistener.hxx
+++ b/sc/inc/grouparealistener.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SC_GROUPAREALISTENER_HXX
#include address.hxx
+#include calcmacros.hxx
#include svl/listener.hxx
@@ -51,6 +52,11 @@ public:
*/
void collectFormulaCells( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW
nRow2, std::vectorScFormulaCell* rCells ) const;
+#if DEBUG_AREA_BROADCASTER
+ScAddress getTopCellPos() const;
+SCROW getGroupLength() const;
+#endif
+
private:
void notifyCellChange( const SfxHint rHint, const ScAddress rPos );
void notifyBulkChange( const BulkDataHint rHint );
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index ee6f17a..d2edf54 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -31,6 +31,7 @@
#if DEBUG_AREA_BROADCASTER
#include formulacell.hxx
+#include grouparealistener.hxx
#endif
// Number of slots per dimension
@@ -620,20 +621,35 @@ void ScBroadcastAreaSlot::Dump() const
{
const ScBroadcastAreaEntry rEntry = *it;
const ScBroadcastArea* pArea = rEntry.mpArea;
-cout* range:
rtl::OUStringToOString(pArea-GetRange().Format(SCA_VALID|SCA_TAB_3D, pDoc),
RTL_TEXTENCODING_UTF8).getStr() endl;
const SvtBroadcaster rBC = pArea-GetBroadcaster();
const SvtBroadcaster::ListenersType rListeners =
rBC.GetAllListeners();
size_t n = rListeners.size();
-cout * listener count: n endl;
+
+cout* range:
rtl::OUStringToOString(pArea-GetRange().Format(SCA_VALID|SCA_TAB_3D, pDoc),
RTL_TEXTENCODING_UTF8).getStr()
+ , listener count: n endl;
+
for (size_t i = 0; i n; ++i)
{
const ScFormulaCell* pFC = dynamic_castconst
ScFormulaCell*(rListeners[i]);
-if (!pFC)
+if (pFC)
+{
+cout * listener: formula cell:
+
rtl::OUStringToOString(pFC-aPos.Format(SCA_VALID|SCA_TAB_3D, pDoc),
RTL_TEXTENCODING_UTF8).getStr()
+ endl;
+continue;
+}
+
+const sc::FormulaGroupAreaListener* pFGListener =
dynamic_castconst sc::FormulaGroupAreaListener*(rListeners[i]);
+if (pFGListener)
+{
+cout * listener: formula group: (pos:
+
rtl::OUStringToOString(pFGListener-getTopCellPos().Format(SCA_VALID |
SCA_TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ , length: pFGListener-getGroupLength()
+ ) endl;
continue;
+}
-cout* listener: formula cell:
-
rtl::OUStringToOString(pFC-aPos.Format(SCA_VALID|SCA_TAB_3D, pDoc),
RTL_TEXTENCODING_UTF8).getStr()
- endl;
+cout * listener: unknown endl;
}
}
}
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 7a83461..4321e9b 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -219,6 +219,19 @@ void FormulaGroupAreaListener::collectFormulaCells(
}
}
+#if DEBUG_AREA_BROADCASTER
+ScAddress FormulaGroupAreaListener::getTopCellPos() const
+{
+const ScFormulaCell rFC = **mppTopCell;
+return rFC.aPos;
+}
+
+SCROW FormulaGroupAreaListener::getGroupLength() const
+{
+return mnGroupLen;
+}
+#endif
+
void FormulaGroupAreaListener::notifyCellChange( const SfxHint rHint, const
ScAddress rPos )
{
// Determine which formula cells within the group need to be notified of
this change.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools sw/source tools/source
include/tools/color.hxx |2 +-
sw/source/core/text/xmldump.cxx |2 +-
tools/source/generic/color.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 34411dc2f0535a21b4ec3bec19d493e0aa037646
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Nov 19 22:50:10 2014 +0100
Mark Color::AsRGBHexString() as const
Change-Id: Idf00e228c480afe264682ed01f2c778b6d9d
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 3515e59..ea92187 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -164,7 +164,7 @@ public:
// Return color as RGB hex string
// for example 00ff00 for green color
-OUString AsRGBHexString();
+OUString AsRGBHexString() const;
// get ::basegfx::BColor from this color
::basegfx::BColor getBColor() const { return ::basegfx::BColor(GetRed() /
255.0, GetGreen() / 255.0, GetBlue() / 255.0); }
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 17ba86b..e74ecd1 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -440,7 +440,7 @@ void SwFont::dumpAsXml(xmlTextWriterPtr writer) const
{
xmlTextWriterStartElement(writer, BAD_CAST(pFont));
xmlTextWriterWriteFormatAttribute(writer, BAD_CAST(ptr), %p, this);
-xmlTextWriterWriteFormatAttribute(writer, BAD_CAST(color), %s,
const_castColor(GetColor()).AsRGBHexString().toUtf8().getStr());
+xmlTextWriterWriteFormatAttribute(writer, BAD_CAST(color), %s,
GetColor().AsRGBHexString().toUtf8().getStr());
xmlTextWriterEndElement(writer);
}
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 64cc6c4..cbdc6e4 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.cxx
@@ -232,7 +232,7 @@ SvStream Color::Write( SvStream rOStm, bool bNewFormat )
return rOStm;
}
-OUString Color::AsRGBHexString()
+OUString Color::AsRGBHexString() const
{
std::stringstream ss;
ss std::hex std::setfill ('0') std::setw(6) GetRGBColor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/uiconfig
desktop/uiconfig/ui/extensionmanager.ui | 22 -- 1 file changed, 4 insertions(+), 18 deletions(-) New commits: commit e3e064ed274cc88e5264e102720dc064bde1da6a Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Nov 19 12:01:38 2014 -0600 Remove hardcoded âLibreOfficeâ name Change-Id: Iccaafa5a66df3df8bcfc1d2013b38bb15d37fbec Reviewed-on: https://gerrit.libreoffice.org/12972 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui index 6fd3a2a..5e21515 100644 --- a/desktop/uiconfig/ui/extensionmanager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -1,7 +1,8 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- - !-- interface-requires LibreOffice 1.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=ExtensionManagerDialog property name=can_focusFalse/property property name=border_width6/property @@ -117,7 +118,6 @@ object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property -property name=haligncenter/property property name=hexpandTrue/property property name=vexpandTrue/property property name=column_spacing12/property @@ -135,8 +135,6 @@ packing property name=left_attach1/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -153,13 +151,11 @@ packing property name=left_attach2/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child object class=GtkCheckButton id=bundled -property name=label translatable=yesBundled with LibreOffice/property +property name=label translatable=yesBundled with %PRODUCTNAME/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property @@ -171,8 +167,6 @@ packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child /object @@ -211,8 +205,6 @@ packing property name=left_attach1/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -226,8 +218,6 @@ packing property name=left_attach3/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -239,8 +229,6 @@ packing property name=left_attach2/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -256,8 +244,6 @@ packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child /object ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/test_ToxLinkProcessor.cxx|4 +++-
sw/source/core/tox/ToxLinkProcessor.cxx | 11 +++
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 6b9ab853b6a5fa71c0b6c594ed0e6e6016d13a3b
Author: Michael Stahl mst...@redhat.com
Date: Wed Nov 19 23:54:18 2014 +0100
fdo#85872: sw: fix crash in insert index dialog
Looks like the old code would create a link starting at the beginning in
this case, so let's do the same.
(regression from 94b296d5416dd71d721ad16216b50bce79e3dc04)
Change-Id: Idcd17ae51c478aa5c2a000c7b33a8244f06bd166
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx
b/sw/qa/core/test_ToxLinkProcessor.cxx
index e0ae1a1..7c16c18 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -64,7 +64,9 @@
ToxLinkProcessorTest::ExceptionIsThrownIfTooManyLinksAreClosed()
ToxLinkProcessor sut;
sut.StartNewLink(0, STYLE_NAME_1);
sut.CloseLink(1, URL_1);
-CPPUNIT_ASSERT_THROW(sut.CloseLink(1, URL_1), std::runtime_error);
+// fdo#85872 actually it turns out the UI does something like this
+// so an exception must not be thrown!
+sut.CloseLink(1, URL_1);
}
void
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx
b/sw/source/core/tox/ToxLinkProcessor.cxx
index 181757c..e778f55 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -11,6 +11,7 @@
#include SwStyleNameMapper.hxx
#include ndtxt.hxx
+#include poolfmt.hrc
#include boost/foreach.hpp
#include stdexcept
@@ -26,11 +27,13 @@ ToxLinkProcessor::StartNewLink(sal_Int32 startPosition,
const OUString characte
void
ToxLinkProcessor::CloseLink(sal_Int32 endPosition, const OUString url)
{
-if (mStartedLinks.empty()) {
-throw std::runtime_error(ToxLinkProcessor: More calls for CloseLink()
than open links exist.);
+StartedLink const startedLink( (mStartedLinks.empty())
+? StartedLink(0, SW_RES(STR_POOLCHR_TOXJUMP))
+: mStartedLinks.back() );
+if (!mStartedLinks.empty())
+{
+mStartedLinks.pop_back();
}
-StartedLink startedLink = mStartedLinks.back();
-mStartedLinks.pop_back();
if (url.isEmpty()) {
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/signal.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit d273a60bfdbf9bb7623bed38667ec0647753157c Author: Michael Stahl mst...@redhat.com Date: Thu Nov 20 00:03:10 2014 +0100 sal: fix --enable-crashdump build in new C++ world order Change-Id: I95e4f43f4ef40e8c04b37002bbae03f4f23a9e34 diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx index 890b73e..b5de273 100644 --- a/sal/osl/unx/signal.cxx +++ b/sal/osl/unx/signal.cxx @@ -599,11 +599,11 @@ static int ReportCrash( int Signal ) Dl_info dl_info; fprintf( stackout, 0x% SAL_PRIxUINTPTR :, -SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame]) ); +reinterpret_castsal_uIntPtr(stackframes[iFrame]) ); fprintf( xmlout, errormail:StackInfo pos=\%d\ ip=\0x% SAL_PRIxUINTPTR \, iFrame, -SAL_INT_CAST(sal_uIntPtr, stackframes[iFrame]) +reinterpret_castsal_uIntPtr(stackframes[iFrame]) ); memset( dl_info, 0, sizeof(dl_info) ); @@ -648,8 +648,8 @@ static int ReportCrash( int Signal ) for ( j = 0; j 16; fprintf( checksumout, %02X, checksum[j++] ) ); fprintf( checksumout, \ bytes=\%lu\ file=\%s\/\n, -SAL_INT_CAST( -unsigned long, nBytesProcessed), +sal::static_int_cast +unsigned long(nBytesProcessed), dli_fname ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building on MAC OS-X 10.10 fails - Java Runtime missing
Thanks Stephan. So better to build using '--without-java' or better to install the older Java 1-6 ? On Wed, Nov 19, 2014 at 7:12 PM, Stephan Bergmann sberg...@redhat.com wrote: On 11/19/2014 04:54 PM, Adam Fyne wrote: I'm trying to build now on a totally fresh clean Macbook, after I've installed whatever was needed. (went with the easy approach, but was missing JDK and ANT so I've installed them separatly). After cloning, autogen make - I get these unit-test errors: http://pastebin.com/raw.php?i=iYF13p1s All the unit-tests seem to come from 'dbaccess'. I also see this line in the output: No Java runtime present, requesting install. Wasn't JDK 64-bit enough ? see http://lists.freedesktop.org/archives/libreoffice/2014- October/064096.html Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8 and http://lists.freedesktop.org/archives/libreoffice/2014-October/064097.html Re: Java problem when running CppunitTest_dbaccess_dialog_save on OS X 10.10 with Oracle JDK 1.8 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- *Adam Fyne* Interoperability Team Leader Twitter http://www.twitter.com/cloudoninc | LinkedIn http://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remaining Unconfirmed Bugs - Useful Categorization
Hi All, Well thanks to some amazing work by multiple new and old faces - our bug count has reached record lows :) To simplify things, Beluga went ahead and made some cool grouping (no clue howbut it's cool none the less) that might help experienced developers and QA members target the harder bugs to triage. Help is appreciated as always. Best, Joel Accessibility: Bug 77679 - Accessibility support for replaced objects is incomplete Bug 81168 - Remove placeholder names for accessible objects AOO: Bug 76657 - compatibility problem: paste copied cells from LO to AOO (notourbug?) API: Bug 67336 - The footer in libreoffice impress is not modifiable programmatically. Bug 79941 - com.sun.star.io.TextInputStream incorrectly detects permanent EOF when working with partial reads from readSomeBytes Bug 67538 - XTypeDetection::queryTypeByDescriptor poor performance Bug 81717 - FILESAVE: Headless mode java concurrent request to convert odt to doc, XOutputStream used to write doc result in document mixup Bug 81749 - Java UNO deadlock on document close Bug 63026 - FILEOPEN: OLE-Objects cannot be opened within a Writer-Document if loaded via Java and loadComponentFromUrl Change a default behavior: Bug 82633 - a new document has regular _expression_ enabled in formulas by default Bug 82857 - FORMATTING: Formatted text in cell contents not replicated when another cell "targets" those contents Bug 46988 - VIEWING: Screen jumps when scrolling down with arrow keys Bug 76346 - FORMATTING: the page number in the view-> page break preview does not show correctly Bug 85773 - Auto-filter uses wrong, extended range for filtering Bug 34686 - Option to turn off Paste mode for Return Bug 82684 - TABLE: Table shows fake border lines on page breaks CMIS: Bug 72881 - LO CMIS fileopen does not lock or open in readonly mode Bug 72832 - CMIS check out process overwrites document's title property Compiling/unit tests: Bug 83241 - Failing unit test sw_ooxmlimport building master on OSX 10.9.4 / Xcode 5.1.1 Bug 82694 - libreoffice can be built only with internal coinmp (patched in 4.4) Bug 82695 - Libreoffice use only bundled components when building ftgl (seems like it can be closed) Bug 85365 - Build failure: assertion failed in CppunitTest_writerperfect_stream with clang 3.5 Bug 85803 - Missing lodevbasis4.1-images deb package while building libreoffice headless with epm Bug 69333 - Other: Compiler failure on filter/source/svg/svgexport.cxx and svgfilter.cxx Bug 74308 - CppunitTest_dbaccess_firebird_test fails with: double free or corruption (out) Bug 78858 - Test testOLEObjectInHeader throws NoSuchElementException Dependencies: Bug 81983 - UI: libobases4.3-es broked in libobasis4.3-es-help_4.3.0.4-4_amd64.deb (looks like this Fedora problem: 76227) Bug 76227 - Other: Problem with last version report, and now latest which isn't listed in menu above Bug 71289 - External dependencies fail to build due to outdated libtool version Bug 77185 - libreoffice nvidia separate xscreens no text menus Development related: Bug 82359 - Deprecate/Drop gstreamer 0.10 support Bug 84237 - Method setErrorHandler in documentbuilder not working Bug 85743 - libreoffice configure.ac - turn valgrind automagic into --enable-valgrind option (patch included) Files over network: Bug 77902 - Device I/O error when appending to log file from Linux to Samba share Bug 75488 - Other: Filesystem lock on shared Calc Documents in Excel-format not released Bug 84873 - Commandline parameter "--nolockcheck" don't works for readonly shared folder. (Windows server) Bug 72364 - PDF import fails on Unix on CIFS mounts (windows shares) Bug 85512 - Printing to archive a series from a document in a smb share Bug 72337 - Other: Unable to open document on a network share Bug 36827 - Cant save Libreoffice file into SSHFS share (a comment from 2014 has a workaround) Bug 78129 - LTSP + Libreoffice + network share + open an already opened file = file damaged warning Bug 74721 - Some server connection types don't work (WebDAV, SSH, Windows share) Bug 65854 - Open read only fails when trying to open an already open document on a samba share (reporter used mailinator.com email address so is unlikely to respond) Bug 80923 - FILEOPEN: LO proplem open file in Win Server 2008 Bug 81640 - Very slow and lagging if open file stored on network Bug 82329 - FILEOPEN: In Kubuntu 14.04 LibreOffice hangs when opening a flie from a mounted nfs drive and the file path contains spezial german chars Fonts: Bug 75553 - Font embedding corrupts asian font and includes in western document Bug 85238 - Libreoffice takes built-in font preference list as precedence instead of fontconfig Bug 34525 - fontwork problem: font URW Chancery L renders not correct when bold Bug 37573 - Exporting to PDF with
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 63483, which changed state. Bug 63483 Summary: UI: FILESAVE with 'Open file read-only' not offered in Draw and Impress https://bugs.freedesktop.org/show_bug.cgi?id=63483 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||68604 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/column.hxx |8 +---
sc/source/core/data/column3.cxx | 22 --
sc/source/core/data/table2.cxx |2 +-
3 files changed, 22 insertions(+), 10 deletions(-)
New commits:
commit 42431473f5168fd894acdcde76353e23eb068601
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 19 22:05:32 2014 -0500
Use group area listener when entering a new single formula cell.
Change-Id: I01dc4537919b69a312e92ede2ae00fbe7d781bd7
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 07ef1e5..709840a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -309,7 +309,7 @@ public:
* @return pCell if it was successfully inserted, NULL otherwise. pCell
* is deleted automatically on failure to insert.
*/
-ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell );
+ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, bool
bSingle = false );
ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
@@ -632,8 +632,10 @@ private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
sc::CellStoreType::iterator GetPositionToInsert( const
sc::CellStoreType::iterator it, SCROW nRow );
-void AttachNewFormulaCell( const sc::CellStoreType::iterator itPos, SCROW
nRow, ScFormulaCell rCell, bool bJoin = true );
-void AttachNewFormulaCell( const sc::CellStoreType::position_type aPos,
ScFormulaCell rCell, bool bJoin = true );
+void AttachNewFormulaCell(
+const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin = true, bool bSingle = false );
+void AttachNewFormulaCell(
+const sc::CellStoreType::position_type aPos, ScFormulaCell rCell,
bool bJoin = true, bool bSingle = false );
void AttachNewFormulaCells( const sc::CellStoreType::position_type aPos,
size_t nLength );
void BroadcastNewCell( SCROW nRow );
bool UpdateScriptType( sc::CellTextAttr rAttr, SCROW nRow, const
sc::CellStoreType::iterator itr );
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index be6dfc4..7d6c938 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -375,13 +375,13 @@ sc::CellStoreType::iterator
ScColumn::GetPositionToInsert( const sc::CellStoreTy
}
void ScColumn::AttachNewFormulaCell(
-const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin )
+const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin, bool bSingle )
{
-AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
+AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin, bSingle);
}
void ScColumn::AttachNewFormulaCell(
-const sc::CellStoreType::position_type aPos, ScFormulaCell rCell, bool
bJoin )
+const sc::CellStoreType::position_type aPos, ScFormulaCell rCell, bool
bJoin, bool bSingle )
{
if (bJoin)
// See if this new formula cell can join an existing shared formula
group.
@@ -394,7 +394,17 @@ void ScColumn::AttachNewFormulaCell(
// After Import we call CalcAfterLoad and in there Listening.
if (!pDocument-IsClipOrUndo() !pDocument-IsInsertingFromOtherDoc())
{
-rCell.StartListeningTo(pDocument);
+if (bSingle)
+{
+boost::shared_ptrsc::ColumnBlockPositionSet pPosSet(new
sc::ColumnBlockPositionSet(*pDocument));
+sc::StartListeningContext aStartCxt(*pDocument, pPosSet);
+sc::EndListeningContext aEndCxt(*pDocument, pPosSet);
+SCROW nRow = aPos.first-position + aPos.second;
+StartListeningFormulaCells(aStartCxt, aEndCxt, nRow, nRow);
+}
+else
+rCell.StartListeningTo(pDocument);
+
if (!pDocument-IsCalcingAfterLoad())
rCell.SetDirty();
}
@@ -1822,7 +1832,7 @@ void ScColumn::SetFormula( SCROW nRow, const OUString
rFormula, formula::Formul
AttachNewFormulaCell(it, nRow, *pCell);
}
-ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell )
+ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell,
bool bSingle )
{
sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
sal_uInt32 nCellFormat = GetNumberFormat(nRow);
@@ -1833,7 +1843,7 @@ ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow,
ScFormulaCell* pCell )
CellStorageModified();
-AttachNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell, true, bSingle);
return pCell;
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a00c5c3..6c6f828 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1409,7 +1409,7 @@ ScFormulaCell* ScTable::SetFormulaCell( SCCOL nCol, SCROW
nRow, ScFormulaCell* p
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|68604 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx |8 +---
sc/source/core/data/column3.cxx | 22 --
sc/source/core/data/table2.cxx |2 +-
3 files changed, 22 insertions(+), 10 deletions(-)
New commits:
commit 797db638870f5c6192e72c0b4669b471788e16ea
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Nov 19 22:05:32 2014 -0500
Use group area listener when entering a new single formula cell.
Change-Id: I01dc4537919b69a312e92ede2ae00fbe7d781bd7
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 72a55e9..19bb2aa 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -307,7 +307,7 @@ public:
* @return pCell if it was successfully inserted, NULL otherwise. pCell
* is deleted automatically on failure to insert.
*/
-ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell );
+ScFormulaCell* SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, bool
bSingle = false );
ScFormulaCell* SetFormulaCell( sc::ColumnBlockPosition rBlockPos, SCROW
nRow, ScFormulaCell* pCell );
bool SetFormulaCells( SCROW nRow, std::vectorScFormulaCell* rCells );
@@ -630,8 +630,10 @@ private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
sc::CellStoreType::iterator GetPositionToInsert( const
sc::CellStoreType::iterator it, SCROW nRow );
-void AttachNewFormulaCell( const sc::CellStoreType::iterator itPos, SCROW
nRow, ScFormulaCell rCell, bool bJoin = true );
-void AttachNewFormulaCell( const sc::CellStoreType::position_type aPos,
ScFormulaCell rCell, bool bJoin = true );
+void AttachNewFormulaCell(
+const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin = true, bool bSingle = false );
+void AttachNewFormulaCell(
+const sc::CellStoreType::position_type aPos, ScFormulaCell rCell,
bool bJoin = true, bool bSingle = false );
void AttachNewFormulaCells( const sc::CellStoreType::position_type aPos,
size_t nLength );
void BroadcastNewCell( SCROW nRow );
bool UpdateScriptType( sc::CellTextAttr rAttr, SCROW nRow, const
sc::CellStoreType::iterator itr );
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 150d609..8b6fa92 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -375,13 +375,13 @@ sc::CellStoreType::iterator
ScColumn::GetPositionToInsert( const sc::CellStoreTy
}
void ScColumn::AttachNewFormulaCell(
-const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin )
+const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin, bool bSingle )
{
-AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
+AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin, bSingle);
}
void ScColumn::AttachNewFormulaCell(
-const sc::CellStoreType::position_type aPos, ScFormulaCell rCell, bool
bJoin )
+const sc::CellStoreType::position_type aPos, ScFormulaCell rCell, bool
bJoin, bool bSingle )
{
if (bJoin)
// See if this new formula cell can join an existing shared formula
group.
@@ -394,7 +394,17 @@ void ScColumn::AttachNewFormulaCell(
// After Import we call CalcAfterLoad and in there Listening.
if (!pDocument-IsClipOrUndo() !pDocument-IsInsertingFromOtherDoc())
{
-rCell.StartListeningTo(pDocument);
+if (bSingle)
+{
+boost::shared_ptrsc::ColumnBlockPositionSet pPosSet(new
sc::ColumnBlockPositionSet(*pDocument));
+sc::StartListeningContext aStartCxt(*pDocument, pPosSet);
+sc::EndListeningContext aEndCxt(*pDocument, pPosSet);
+SCROW nRow = aPos.first-position + aPos.second;
+StartListeningFormulaCells(aStartCxt, aEndCxt, nRow, nRow);
+}
+else
+rCell.StartListeningTo(pDocument);
+
if (!pDocument-IsCalcingAfterLoad())
rCell.SetDirty();
}
@@ -1822,7 +1832,7 @@ void ScColumn::SetFormula( SCROW nRow, const OUString
rFormula, formula::Formul
AttachNewFormulaCell(it, nRow, *pCell);
}
-ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell )
+ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell,
bool bSingle )
{
sc::CellStoreType::iterator it = GetPositionToInsert(nRow);
sal_uInt32 nCellFormat = GetNumberFormat(nRow);
@@ -1833,7 +1843,7 @@ ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow,
ScFormulaCell* pCell )
CellStorageModified();
-AttachNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell, true, bSingle);
return pCell;
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0856454..ef81e6d 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1409,7 +1409,7 @@ ScFormulaCell* ScTable::SetFormulaCell( SCCOL nCol, SCROW
nRow, ScFormulaCell* p
[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/human icon-themes/oxygen icon-themes/sifr
icon-themes/crystal/links.txt|1 + icon-themes/galaxy/cmd/lc_showsinglepage.png |binary icon-themes/galaxy/links.txt |1 - icon-themes/human/links.txt |1 + icon-themes/oxygen/links.txt |1 + icon-themes/sifr/links.txt |1 + 6 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 691f11eb6ec0cb51ae835badd60ed09acd4ec44e Author: Yousuf Philips philip...@hotmail.com Date: Thu Nov 20 07:36:11 2014 +0400 TANGO: fix galaxy so print preview single page view icon shows Change-Id: Ie7c335def446bc663f63a58bfc91d44386c2f30e Reviewed-on: https://gerrit.libreoffice.org/12978 Reviewed-by: Matthew Francis mjay.fran...@gmail.com Tested-by: Matthew Francis mjay.fran...@gmail.com diff --git a/icon-themes/crystal/links.txt b/icon-themes/crystal/links.txt index 7e5bb94f..5c8bad3 100644 --- a/icon-themes/crystal/links.txt +++ b/icon-themes/crystal/links.txt @@ -1,4 +1,5 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png diff --git a/icon-themes/galaxy/cmd/lc_showsinglepage.png b/icon-themes/galaxy/cmd/lc_showsinglepage.png new file mode 100644 index 000..8e18798 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_showsinglepage.png differ diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 337374d..37bbd64 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -2,7 +2,6 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png cmd/sc_datastreamsplay.png avmedia/res/av02049.png cmd/lc_datastreamsstop.png avmedia/res/avl02051.png cmd/sc_datastreamsstop.png avmedia/res/av02051.png -cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png cmd/sc_zoommode.png cmd/sc_zoomoptimal.png cmd/sc_nexttrackedchange.png cmd/sc_arrowshapes.right-arrow.png diff --git a/icon-themes/human/links.txt b/icon-themes/human/links.txt index 7e5bb94f..5c8bad3 100644 --- a/icon-themes/human/links.txt +++ b/icon-themes/human/links.txt @@ -1,4 +1,5 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png diff --git a/icon-themes/oxygen/links.txt b/icon-themes/oxygen/links.txt index 7e5bb94f..5c8bad3 100644 --- a/icon-themes/oxygen/links.txt +++ b/icon-themes/oxygen/links.txt @@ -1,4 +1,5 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 7e5bb94f..5c8bad3 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1,4 +1,5 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png +cmd/lc_showsinglepage.png cmd/lc_adddirect.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
UNCONFIRMED Unit Test/Compiling Bugs
Hi All, This set of bugs would be probably most manageable by developers Compiling/unit tests: Bug 83241 https://bugs.freedesktop.org/show_bug.cgi?id=83241 - Failing unit test sw_ooxmlimport building master on OSX 10.9.4 / Xcode 5.1.1 Bug 82694 https://bugs.freedesktop.org/show_bug.cgi?id=82694 - libreoffice can be built only with internal coinmp (patched in 4.4) Bug 82695 https://bugs.freedesktop.org/show_bug.cgi?id=82695 - Libreoffice use only bundled components when building ftgl (seems like it can be closed) Bug 85365 https://bugs.freedesktop.org/show_bug.cgi?id=85365 - Build failure: assertion failed in CppunitTest_writerperfect_stream with clang 3.5 Bug 85803 https://bugs.freedesktop.org/show_bug.cgi?id=85803 - Missing lodevbasis4.1-images deb package while building libreoffice headless with epm Bug 69333 https://bugs.freedesktop.org/show_bug.cgi?id=69333 - Other: Compiler failure on filter/source/svg/svgexport.cxx and svgfilter.cxx Bug 74308 https://bugs.freedesktop.org/show_bug.cgi?id=74308 - CppunitTest_dbaccess_firebird_test fails with: double free or corruption (out) Bug 78858 https://bugs.freedesktop.org/show_bug.cgi?id=78858 - Test testOLEObjectInHeader throws NoSuchElementException Thanks! Best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||50430 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|50430 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|37315 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||37315 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2014-11-20
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + fdo#84227 Use only last patchset for modules in https://gerrit.libreoffice.org/11614 from Mathias M * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-11-20
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#85594 enabling date format and pivot table and adding a more hidden o in https://gerrit.libreoffice.org/12977 from Yousuf Philips about module sc + Removed useless includes in accessibility/ tree in https://gerrit.libreoffice.org/12948 from Andrea Gelmini about module accessibility + Removed useless includes in basctl/source/basicide/ tree in https://gerrit.libreoffice.org/12963 from Andrea Gelmini about module basctl + fdo#85486 - Clean up unnecessary enumerations from xenum.hxx in https://gerrit.libreoffice.org/12507 from Ioan Radu about module basctl, cui, filter, include, sd, svx, sw End of freshness + fix memory leaks caused with SmNodeStack in https://gerrit.libreoffice.org/12970 from Takeshi Abe about module starmath + fdo#85347 Make file picker modal again in https://gerrit.libreoffice.org/12974 from Adolfo Jayme Barrientos about module fpicker + HIG fixes for basctl in https://gerrit.libreoffice.org/12971 from Adolfo Jayme Barrientos about module basctl, officecfg + Fix typo in updaterequireddialog.ui in https://gerrit.libreoffice.org/12973 from Adolfo Jayme Barrientos about module desktop + pyuno: move officehelper.py from scripting to pyuno in https://gerrit.libreoffice.org/12968 from Michael Stahl about module pyuno, scripting * Merged changes on master for project core changed in the last 25 hours: + TANGO: fix galaxy so print preview single page view icon shows in https://gerrit.libreoffice.org/12978 from Yousuf Philips + Remove hardcoded “LibreOffice” name in https://gerrit.libreoffice.org/12972 from Adolfo Jayme Barrientos + Fix typo in deletelangdialog.ui in https://gerrit.libreoffice.org/12969 from Adolfo Jayme Barrientos + Fix rtf outline importing issue. in https://gerrit.libreoffice.org/12960 from Mark Hung + add clang plugin for detecting cascading condops in https://gerrit.libreoffice.org/12967 from Björn Michaelsen + coinmp: conditional patch in https://gerrit.libreoffice.org/12040 from Robert Antoni Buj i Gelonch + changed type of parameters from rtl_uString to OUString in https://gerrit.libreoffice.org/12964 from Michael Weghorn + fdo#86298 Avoid crash blending upside down Bitmaps of differing size in https://gerrit.libreoffice.org/12961 from Matthew Francis + Add small icons for conditional formatting to galaxy so they show in tang in https://gerrit.libreoffice.org/12959 from Yousuf Philips + add an icon for calc's time number format in https://gerrit.libreoffice.org/12962 from Yousuf Philips * Abandoned changes on master for project core changed in the last 25 hours: + Removed toolkit/awt/vclxaccessiblecomponent.hxx in https://gerrit.libreoffice.org/12839 from Andrea Gelmini * Open changes needing tweaks, but being untouched for more than a week: + fdo#77569 - Add Choose Theme to Format Menu in https://gerrit.libreoffice.org/12275 from Joel Madero + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan + android: Show document browser back in the menu in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez + coverity#1242459 Identical code for different branches in https://gerrit.libreoffice.org/11772 from Caolán McNamara + jvmfwk: Apple Oracle's JRE detection for OS X 10.8+ in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + WIP: fdo#43090: Add an option to disable autoclose brackets in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji 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
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||44621 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|44621 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FDO - New Milestone
On 20/11/2014 04:38, Robinson Tryon wrote: Oh, certainly -- there a number of different groups of bugs on which we can focus :-) The 'preBibisect' bugs are always a great group to QA to tackle. Currently we have 17 bugs that need sleuthing to figure out where in the [OOo - LO 3.5] range they first appeared, and the OSX bibisect repo is perfect for that purpose: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOlist_id=495684product=LibreOfficequery_format=advancedversion=PreBibisect Aside from prioritizing bugs and putting them on MAB lists, is there anything specific QA can do to highlight specific bugs for the devs? Hi Robinson, Just rethinking about all this, I realize I forgot the fact that it was corresponding from QA point of view. I mean, role of QA team is to confirm bugs and provide additional info like bt, bibisect, etc. then role of dev team is to fix them. So once a bug is confirmed with perhaps additional info, QA role is finished (except perhaps retesting with a newer version if it hasn't been touched during lots of time) and it's normal. At first sight, since I was reading dev forum, I had thought that the dev team should consider in priority to reduce UNCONFIRMED bugs. Sorry for the noise. Julien (simple contributor who juust tries to triage/ask or provide additional info like bt and sometimes fix just easy bugs) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - include/rtl sal/osl sal/rtl
include/rtl/strbuf.h |4 +++-
include/rtl/strbuf.hxx| 24
include/rtl/ustrbuf.h |4 +++-
include/rtl/ustrbuf.hxx | 24
sal/osl/unx/nlsupport.cxx | 22 ++
sal/osl/unx/nlsupport.hxx |4 +++-
sal/osl/unx/osxlocale.cxx | 25 +++--
sal/rtl/math.cxx |4
sal/rtl/strbuf.cxx| 16 +++-
sal/rtl/ustrbuf.cxx | 17 -
10 files changed, 105 insertions(+), 39 deletions(-)
New commits:
commit 5252652ac57b3358db6cc0d423cc3d67882b5e90
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Nov 20 08:32:37 2014 +0100
Introduce OStringBuffer::appendUninitialized
...corresponding to the OUStringBuffer couterpart
Change-Id: I3ab03343696e6755cf1ccc470e4decc2f41d2558
diff --git a/include/rtl/strbuf.h b/include/rtl/strbuf.h
index 403d53c..3f682db 100644
--- a/include/rtl/strbuf.h
+++ b/include/rtl/strbuf.h
@@ -101,7 +101,9 @@ SAL_DLLPUBLIC void SAL_CALL rtl_stringbuffer_ensureCapacity(
@param[in,out] Thisthe String to operate on.
@param[in,out] capacitythe capacity of the string buffer
@param[in] offset the offset.
-@param[in] str a character array.
+@param[in] str a character array. Since LibreOffice 4.4, as a
+special case, if str is null then the len added
+characters are left uninitialized.
@param[in] len the number of characters to append.
*/
SAL_DLLPUBLIC void SAL_CALL rtl_stringbuffer_insert(
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index c089d61..b135298 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -490,6 +490,7 @@ public:
OStringBuffer append( const sal_Char * str, sal_Int32 len)
{
assert( len = 0 );
+assert( len == 0 || str != 0 );
rtl_stringbuffer_insert( pData, nCapacity, getLength(), str, len );
return *this;
}
@@ -645,6 +646,28 @@ public:
}
/**
+ Unsafe way to make space for a fixed amount of characters to be appended
+ into this OStringBuffer.
+
+ A call to this function must immediately be followed by code that
+ completely fills the uninitialized block pointed to by the return value.
+
+ @param length the length of the uninitialized block of char entities;
+ must be non-negative
+
+ @return a pointer to the start of the uninitialized block; only valid
+ until this OStringBuffer's capacity changes
+
+ @since LibreOffice 4.4
+*/
+char * appendUninitialized(sal_Int32 length) {
+assert(length = 0);
+sal_Int32 n = getLength();
+rtl_stringbuffer_insert(pData, nCapacity, n, 0, length);
+return pData-buffer + n;
+}
+
+/**
Inserts the string into this string buffer.
The characters of the codeString/code argument are inserted, in
@@ -729,6 +752,7 @@ public:
{
assert( offset = 0 offset = pData-length );
assert( len = 0 );
+assert( len == 0 || str != 0 );
rtl_stringbuffer_insert( pData, nCapacity, offset, str, len );
return *this;
}
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index ac5a793..d74f502 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -222,6 +222,7 @@ struct StringTraits
sal_Int32 * pOffset, sal_Char const *
pChars,
sal_Int32 nLen)
{
+assert(pChars != nullptr);
rtl_stringbuffer_insert(pBuffer, pCapacity, *pOffset, pChars, nLen);
*pOffset += nLen;
}
@@ -230,6 +231,7 @@ struct StringTraits
sal_Int32 * pOffset, sal_Char const * pStr,
sal_Int32 nLen)
{
+assert(pStr != nullptr);
rtl_stringbuffer_insert(pBuffer, pCapacity, *pOffset, pStr, nLen);
*pOffset += nLen;
}
diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx
index f8b1f9c..f75d0cc 100644
--- a/sal/rtl/strbuf.cxx
+++ b/sal/rtl/strbuf.cxx
@@ -114,11 +114,14 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
memmove( pBuf + offset + len, pBuf + offset, n * sizeof(sal_Char)
);
/* insert the new characters */
-if( len == 1 )
+if( str != nullptr )
+{
+if( len == 1 )
/* optimized for 1 character */
-pBuf[offset] = *str;
-else
-memcpy( pBuf + offset, str, len * sizeof(sal_Char) );
+pBuf[offset] = *str;
+else
+memcpy( pBuf + offset, str, len * sizeof(sal_Char) );
+}
(*This)-length = nOldLen + len;
pBuf[ nOldLen + len ] = 0;
}
commit 04ae3d0cc9b671729deabf33c2cea1031d72e6ae
Author: Stephan Bergmann
[Libreoffice-commits] core.git: framework/source
framework/source/services/modulemanager.cxx | 86
1 file changed, 38 insertions(+), 48 deletions(-)
New commits:
commit 9dc7bae64d1c08e06c755ea97c21e50bd6a8eec1
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 19 18:36:49 2014 +0100
Revert coverity#1169848 Uncaught exception
This reverts commit b0a7722ebfa720255b6ce1e383a3aacae0ce5e9f, now that
fced31697bcc2a2a4da34d804582002de0320302 comphelper::SequenceAsHashMap:
throw
IllegalArgumentException made the underlying problem go away.
Conflicts:
framework/source/services/modulemanager.cxx
Change-Id: I6599cf25d4f28d2bab19da67d5de5caacd84a622
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index 7a3cee7..cdb1763 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -235,59 +235,49 @@ void SAL_CALL ModuleManager::replaceByName(const
OUString sName ,
css::lang::WrappedTargetException ,
css::uno::RuntimeException, std::exception)
{
-try
+::comphelper::SequenceAsHashMap lProps(aValue);
+if (lProps.empty() )
{
-::comphelper::SequenceAsHashMap lProps(aValue);
-if (lProps.empty() )
-{
-throw css::lang::IllegalArgumentException(
-OUString(No properties given to replace part of module.),
-static_cast cppu::OWeakObject * (this),
-2);
-}
-
-// get access to the element
-// Note: Dont use impl_getConfig() method here. Because it creates a
readonly access only, further
-// it cache it as a member of this module manager instance. If we
change some props there ... but dont
-// flush changes (because an error occurred) we will read them later.
If we use a different config access
-// we can close it without a flush ... and our read data wont be
affected .-)
-css::uno::Reference css::uno::XInterface xCfg =
::comphelper::ConfigurationHelper::openConfig(
-
m_xContext,
-
/org.openoffice.Setup/Office/Factories,
-
::comphelper::ConfigurationHelper::E_STANDARD);
-css::uno::Reference css::container::XNameAccess xModules (xCfg,
css::uno::UNO_QUERY_THROW);
-css::uno::Reference css::container::XNameReplace xModule;
-
-xModules-getByName(sName) = xModule;
-if (!xModule.is())
-{
-throw css::uno::RuntimeException(
-OUString(Was not able to get write access to the
requested module entry inside configuration.),
-static_cast cppu::OWeakObject * (this));
-}
-
-::comphelper::SequenceAsHashMap::const_iterator pProp;
-for ( pProp = lProps.begin();
- pProp != lProps.end();
- ++pProp )
-{
-const OUString sPropName = pProp-first;
-const css::uno::Any aPropValue = pProp-second;
-
-// let NoSuchElementException out ! We support the same API ...
-// and without a flush() at the end all changed data before will
be ignored !
-xModule-replaceByName(sPropName, aPropValue);
-}
+throw css::lang::IllegalArgumentException(
+OUString(No properties given to replace part of module.),
+static_cast cppu::OWeakObject * (this),
+2);
+}
-::comphelper::ConfigurationHelper::flush(xCfg);
+// get access to the element
+// Note: Dont use impl_getConfig() method here. Because it creates a
readonly access only, further
+// it cache it as a member of this module manager instance. If we change
some props there ... but dont
+// flush changes (because an error occurred) we will read them later. If
we use a different config access
+// we can close it without a flush ... and our read data wont be affected
.-)
+css::uno::Reference css::uno::XInterface xCfg =
::comphelper::ConfigurationHelper::openConfig(
+
m_xContext,
+
/org.openoffice.Setup/Office/Factories,
+
::comphelper::ConfigurationHelper::E_STANDARD);
+css::uno::Reference css::container::XNameAccess xModules (xCfg,
css::uno::UNO_QUERY_THROW);
+css::uno::Reference css::container::XNameReplace xModule ;
+
+xModules-getByName(sName) = xModule;
+if (!xModule.is())
+{
+throw css::uno::RuntimeException(
+OUString(Was
[Libreoffice-commits] core.git: Branch 'feature/priorities' - avmedia/source cui/source sc/source sfx2/source sw/source
avmedia/source/framework/mediacontrol.cxx |1 -
cui/source/options/optjava.cxx|1 -
sc/source/core/tool/chartlis.cxx |1 -
sfx2/source/control/dispatch.cxx |2 --
sw/source/uibase/utlui/navipi.cxx |2 --
5 files changed, 7 deletions(-)
New commits:
commit 6f4487a6ae7f5fab02d87ad80404381a4731c9b8
Author: Tobias Madl tobias.madl@gmail.com
Date: Thu Nov 20 07:51:46 2014 +
removed unused timeout defines
Change-Id: I1ebada7b06657e0ac294e60bca5d6dd5b45e9d04
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index 5d64845..9c92ffa 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -33,7 +33,6 @@
#include math.h
#include algorithm
-#define AVMEDIA_TIMEOUT 100
#define AVMEDIA_TIME_RANGE 2048
#define AVMEDIA_DB_RANGE-40
#define AVMEDIA_LINEINCREMENT 1.0
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 242ac08..ef7b7c3 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -53,7 +53,6 @@
// define
#define CLASSPATH_DELIMITER SAL_PATHSEPARATOR
-#define RESET_TIMEOUT 300
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index c3c2905..bf16b3e 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -34,7 +34,6 @@ using ::std::for_each;
// Update chart listeners quickly, to get a similar behavior to loaded charts
// which register UNO listeners.
-#define SC_CHARTTIMEOUT 10
class ScChartUnoData
{
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 96c2d29..849ac8b 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -140,8 +140,6 @@ struct SfxDispatcher_Impl
std::deque std::dequeSfxToDo_Impl aToDoCopyStack;
};
-#define SFX_FLUSH_TIMEOUT50
-
/** This method checks if the stack of the SfxDispatchers is flushed, or if
push- or pop- commands are pending.
*/
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 79110f7..a677d1d 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -56,8 +56,6 @@
#include unomid.h
#include boost/scoped_ptr.hpp
-#define PAGE_CHANGE_TIMEOUT 1000
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] QA Meeting Minutes - 2014-11-19
Hello! This week we had another great QA meeting! We covered a number of different topics, and brainstormed some ideas about how we can encourage better communication, identify potential regressions earlier in the release process, and attack our set of open bugs from a bunch of different angles! :-) Thanks to all of your hard work, we saw another precipitous drop in our UNCONFIRMED bug count this week, dropping below 600 before settling around 615. Getting that number down and *keeping* it down is a really important piece of us being able to respond to new bug reports in a timely fashion. I can't wait to see the numbers in December! All the gory details are available on the wiki/in the meeting notes here: https://wiki.documentfoundation.org/QA/Meetings/2014/November_19 http://pumbaa.documentfoundation.org/meetbot/libreoffice-qa/2014/libreoffice-qa.2014-11-19-18.41.html Our next meeting is in (surprise, surprise!) 2 weeks: https://wiki.documentfoundation.org/QA/Meetings/2014/December_03 Here in the US we'll be celebrating Thanksgiving next week. For all those who live elsewhere in the world, it might be hard find turkey and cranberries in your region, but they're a really delicious combination, especially in a sandwich! To quote the call of the turkey, let's get out there and 'gobble gobble' some bugs! :-) Best, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Moztrap 4.4.0 beta1 test
Hi Sophie Japanese Team is planning several events (including BugHunting Session) this weekend in Japan. We want to try using Moztrap in BugHunting Session 4.4.0.0. Can you set up 4.4.0 beta1 test in Moztrap? Event lists: * Kanto LibreOffice HackFest #2 (2014-11-22) Organizer : Ogasawara-san * OpenSource Conference 2014 Fukuoka (2014-11-22) A little test at LibreOffice booth Member: Omori-san, Annoura-san, Enoki * Kyushu LibreOffice Study Party #5 (2014-11-23) Organizer : Enoki Kind regards Shinji Enoki ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Remaining Unconfirmed Bugs - Useful Categorization
Hi All, Well thanks to some amazing work by multiple new and old faces - our bug count has reached record lows :) To simplify things, Beluga went ahead and made some cool grouping (no clue howbut it's cool none the less) that might help experienced developers and QA members target the harder bugs to triage. Help is appreciated as always. Best, Joel Accessibility: Bug 77679 - Accessibility support for replaced objects is incomplete Bug 81168 - Remove placeholder names for accessible objects AOO: Bug 76657 - compatibility problem: paste copied cells from LO to AOO (notourbug?) API: Bug 67336 - The footer in libreoffice impress is not modifiable programmatically. Bug 79941 - com.sun.star.io.TextInputStream incorrectly detects permanent EOF when working with partial reads from readSomeBytes Bug 67538 - XTypeDetection::queryTypeByDescriptor poor performance Bug 81717 - FILESAVE: Headless mode java concurrent request to convert odt to doc, XOutputStream used to write doc result in document mixup Bug 81749 - Java UNO deadlock on document close Bug 63026 - FILEOPEN: OLE-Objects cannot be opened within a Writer-Document if loaded via Java and loadComponentFromUrl Change a default behavior: Bug 82633 - a new document has regular _expression_ enabled in formulas by default Bug 82857 - FORMATTING: Formatted text in cell contents not replicated when another cell "targets" those contents Bug 46988 - VIEWING: Screen jumps when scrolling down with arrow keys Bug 76346 - FORMATTING: the page number in the view-> page break preview does not show correctly Bug 85773 - Auto-filter uses wrong, extended range for filtering Bug 34686 - Option to turn off Paste mode for Return Bug 82684 - TABLE: Table shows fake border lines on page breaks CMIS: Bug 72881 - LO CMIS fileopen does not lock or open in readonly mode Bug 72832 - CMIS check out process overwrites document's title property Compiling/unit tests: Bug 83241 - Failing unit test sw_ooxmlimport building master on OSX 10.9.4 / Xcode 5.1.1 Bug 82694 - libreoffice can be built only with internal coinmp (patched in 4.4) Bug 82695 - Libreoffice use only bundled components when building ftgl (seems like it can be closed) Bug 85365 - Build failure: assertion failed in CppunitTest_writerperfect_stream with clang 3.5 Bug 85803 - Missing lodevbasis4.1-images deb package while building libreoffice headless with epm Bug 69333 - Other: Compiler failure on filter/source/svg/svgexport.cxx and svgfilter.cxx Bug 74308 - CppunitTest_dbaccess_firebird_test fails with: double free or corruption (out) Bug 78858 - Test testOLEObjectInHeader throws NoSuchElementException Dependencies: Bug 81983 - UI: libobases4.3-es broked in libobasis4.3-es-help_4.3.0.4-4_amd64.deb (looks like this Fedora problem: 76227) Bug 76227 - Other: Problem with last version report, and now latest which isn't listed in menu above Bug 71289 - External dependencies fail to build due to outdated libtool version Bug 77185 - libreoffice nvidia separate xscreens no text menus Development related: Bug 82359 - Deprecate/Drop gstreamer 0.10 support Bug 84237 - Method setErrorHandler in documentbuilder not working Bug 85743 - libreoffice configure.ac - turn valgrind automagic into --enable-valgrind option (patch included) Files over network: Bug 77902 - Device I/O error when appending to log file from Linux to Samba share Bug 75488 - Other: Filesystem lock on shared Calc Documents in Excel-format not released Bug 84873 - Commandline parameter "--nolockcheck" don't works for readonly shared folder. (Windows server) Bug 72364 - PDF import fails on Unix on CIFS mounts (windows shares) Bug 85512 - Printing to archive a series from a document in a smb share Bug 72337 - Other: Unable to open document on a network share Bug 36827 - Cant save Libreoffice file into SSHFS share (a comment from 2014 has a workaround) Bug 78129 - LTSP + Libreoffice + network share + open an already opened file = file damaged warning Bug 74721 - Some server connection types don't work (WebDAV, SSH, Windows share) Bug 65854 - Open read only fails when trying to open an already open document on a samba share (reporter used mailinator.com email address so is unlikely to respond) Bug 80923 - FILEOPEN: LO proplem open file in Win Server 2008 Bug 81640 - Very slow and lagging if open file stored on network Bug 82329 - FILEOPEN: In Kubuntu 14.04 LibreOffice hangs when opening a flie from a mounted nfs drive and the file path contains spezial german chars Fonts: Bug 75553 - Font embedding corrupts asian font and includes in western document Bug 85238 - Libreoffice takes built-in font preference list as precedence instead of fontconfig Bug 34525 - fontwork problem: font URW Chancery L renders not correct when bold Bug 37573 - Exporting to PDF with
Re: [Libreoffice-qa] FDO - New Milestone
[adding QA list back to cc] On Sun, Nov 16, 2014 at 4:50 PM, julien2412 serval2...@yahoo.fr wrote: Hi Joel, Great news indeed. But is there a milestone for : - oldest bugs, there are more than 500 bugs older than 2011-06 (3 years ago!) We've got 564 bugs in that range https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOf1=creation_tslimit=0list_id=495680o1=lessthanorder=changeddate%20DESC%2Cop_sys%2Cbug_status%2Cpriority%2Cassigned_to%2Cbug_idproduct=LibreOfficequery_format=advancedv1=2011-06-01 Of those, 21 are UNCONFIRMED/NEEDINFO (mostly UNCONFIRMED). Older open bugs that aren't yet triaged are definitely on the radar of QA. - bug marked as regression (didn't play with search options to know the number) ? We've got several stats on regressions. We have some in the ESC minutes each week, and we also keep track of stats in the QA minutes: https://wiki.documentfoundation.org/QA/Meetings/2014/December_03#IRC_Minutes I mean, why to focus only about unconfirmed ones even if they're important of course? Oh, certainly -- there a number of different groups of bugs on which we can focus :-) The 'preBibisect' bugs are always a great group to QA to tackle. Currently we have 17 bugs that need sleuthing to figure out where in the [OOo - LO 3.5] range they first appeared, and the OSX bibisect repo is perfect for that purpose: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOlist_id=495684product=LibreOfficequery_format=advancedversion=PreBibisect Aside from prioritizing bugs and putting them on MAB lists, is there anything specific QA can do to highlight specific bugs for the devs? Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] 4.2.x EOL and mab4.2
On Mon, 17 Nov 2014 13:21:13 +0100, Tommy ba...@quipo.it wrote: hi there, according to the release plan the 4.2.x EOL will be november 19th https://wiki.documentfoundation.org/ReleasePlan#4.2_release after that day I'll start migrating all the still existing mab4.2 bugs to the mab4.3 list did that. the mab4.2 tracker has been closed and a message expaining that has been added here: https://bugs.freedesktop.org/show_bug.cgi?id=65675#c235 I hope you like I added the full list of still living mab4.2 at the time of the EOL. I also started the first migrations to mab4.3 of the still reproducible ones I've already noticed that a few mab4.2 that have turned into WFM thanks to 4.3.x and 4.4.x improvement. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Moztrap 4.4.0 beta1 test
Hi Shinji, Le 19/11/2014 22:39, Shinji Enoki a écrit : Hi Sophie Japanese Team is planning several events (including BugHunting Session) this weekend in Japan. Wonderful! it's great to see your team so active and I wish you all very nice times together :) We want to try using Moztrap in BugHunting Session 4.4.0.0. Can you set up 4.4.0 beta1 test in Moztrap? I'll activate the tests run tomorrow morning. Note that the beta1 may not be ready, but that should not prevent you to test the alpha2 anyway, the earlier it is tested, the better. Event lists: * Kanto LibreOffice HackFest #2 (2014-11-22) Organizer : Ogasawara-san * OpenSource Conference 2014 Fukuoka (2014-11-22) A little test at LibreOffice booth Member: Omori-san, Annoura-san, Enoki * Kyushu LibreOffice Study Party #5 (2014-11-23) Organizer : Enoki Congrats to your team for this work! Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Co-founder - Release coordinator The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 86448] Crashes importing malformed .rtf -- DoS
https://bugs.freedesktop.org/show_bug.cgi?id=86448 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added CC||vmik...@collabora.co.uk --- Comment #5 from Miklos Vajna vmik...@collabora.co.uk --- 'OOO_EXIT_POST_STARTUP=1 ./soffice fdo86448.rtf' hangs here on master, but it does not crash. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86449] Crash importing malformed .rtf -- potentially exploitable
https://bugs.freedesktop.org/show_bug.cgi?id=86449 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added CC||vmik...@collabora.co.uk --- Comment #4 from Miklos Vajna vmik...@collabora.co.uk --- No crash on master, FWIW. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86451] Crash importing malformed .rtf
https://bugs.freedesktop.org/show_bug.cgi?id=86451 Miklos Vajna vmik...@collabora.co.uk changed: What|Removed |Added Status|NEEDINFO|NEW CC||vmik...@collabora.co.uk --- Comment #6 from Miklos Vajna vmik...@collabora.co.uk --- Yes, this is still an issue on master. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86457] New: Error when creating subform: can not be represented as java.sql.Timestamp
https://bugs.freedesktop.org/show_bug.cgi?id=86457 Bug ID: 86457 Summary: Error when creating subform: can not be represented as java.sql.Timestamp Product: LibreOffice Version: 4.2.7.2 rc Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Database Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: sjoerd-freedesk...@linuxonly.nl In LibreOffice Base, I get an error when using a form with a subform based on a relation with a specific table. The database is an existing MySQL database on a remote host. I connect to it using the JDBC driver. I created the form like this: * Use Wizard to Create Form... * In 1. Field selection, select on table and all fields. * In 2. Set up a subform, add subform based on existing relation. * In 3, add all fields. * In 5, click next. * In 6, check all checkboxes. * In 7, click next. * In 8, click finish. The error message is: The data content could not be loaded. SQL Status: S1009 Value '214twente-online.nltwent43038��� -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86457] Error when creating subform: can not be represented as java.sql.Timestamp
https://bugs.freedesktop.org/show_bug.cgi?id=86457 --- Comment #1 from Sjoerd sjoerd-freedesk...@linuxonly.nl --- Created attachment 109717 -- https://bugs.freedesktop.org/attachment.cgi?id=109717action=edit Screenshot of error message -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86457] Error when creating subform: can not be represented as java.sql.Timestamp
https://bugs.freedesktop.org/show_bug.cgi?id=86457 --- Comment #2 from Sjoerd sjoerd-freedesk...@linuxonly.nl --- I have tried this with two versions, both give the error message: Version: 4.3.4.1 Build ID: bc356b2f991740509f321d70e4512a6a54c5f24 Version: 4.2.7.2 Build ID: 420m0(Build:2) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83141] Calc Find Replace extremely slow / freeze with large spreadsheet
https://bugs.freedesktop.org/show_bug.cgi?id=83141 --- Comment #21 from pg...@ecoledesloisirs.com --- Hi Work fine with Version: libreofficedev 4.4.0.0.alpha2 windows 7 64 bit best regard -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86444] Add option for LO version number to menu bar
https://bugs.freedesktop.org/show_bug.cgi?id=86444 --- Comment #4 from Michael Meeks michael.me...@collabora.com --- I can see this being useful for testers; but I'd never want an end-user to see that =) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75467] OS X integration: selecting a file in Open File dialog adds resource fork, changes size and mod date
https://bugs.freedesktop.org/show_bug.cgi?id=75467 --- Comment #40 from Anastasius anastasius_zw...@hotmail.com --- (In reply to tommy27 from comment #38) @Anastasius do not put a bug in multiple MAB lists it already belongs to the MAB 4.2 list. Incredible. This bug is corrupting whole directories, thousands of files on my computer and I have lost already much work because sync/backup was overwriting new with old versions due to that bug, and I can't find related files (having the same creation dates) any more. And then people care whether the report appears in one or two MAB lists and discuss whether it's critical or not, instead of fixing it! There is absolutely no use developing any new features as long as this is not fixed. 4.1.6 is not available any more (and I don't have a backup of it); so I will have to move to Apache OO to prevent further havoc. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76868] Data Analysis Toolkit - chi square-test
https://bugs.freedesktop.org/show_bug.cgi?id=76868 Tomaz Vajngerl qui...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86407] Chart crash with logarithmic axis when DS 0
https://bugs.freedesktop.org/show_bug.cgi?id=86407 --- Comment #3 from Domenico Somma domenico.so...@gmail.com --- Created attachment 109718 -- https://bugs.freedesktop.org/attachment.cgi?id=109718action=edit ods bug file -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86412] Print Preview causing Writer to Crash
https://bugs.freedesktop.org/show_bug.cgi?id=86412 Chris Sherlock chris.sherloc...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |chris.sherloc...@gmail.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86458] New: calculations in doc, docx tables are lost, formatting backgrounds are lost
https://bugs.freedesktop.org/show_bug.cgi?id=86458 Bug ID: 86458 Summary: calculations in doc, docx tables are lost, formatting backgrounds are lost Product: LibreOffice Version: 4.3.4.1 release Hardware: Other OS: All Status: UNCONFIRMED Severity: major Priority: medium Component: Libreoffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mi_...@arcor.de when saving a document in doc or docx, the calculation inside a table is lost, no more formula exists inside a table and it is not possible to save changes of the surrounding lines of a table Systems Ubuntu 14.10 and Windows 8.1 both 64bit libreoffice 4.3.3 and 4.3.4 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65328] FILESAVE: after particular XLSX saving document structure is lost and it could not be opened in MSO
https://bugs.freedesktop.org/show_bug.cgi?id=65328 Uldis Kalniņš uldis+libreoff...@rom.lv changed: What|Removed |Added Hardware|x86 (IA32) |x86-64 (AMD64) Version|4.0.3.3 release |4.3.4.1 release --- Comment #4 from Uldis Kalniņš uldis+libreoff...@rom.lv --- Bug still present in LO 4.3.4.1 . Saved *.xlsx fails to open in Microsoft office 2007 and 2010. Added more files for testing - original *.ods, resulting *.xlsx and *.xls - just in case. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65328] FILESAVE: after particular XLSX saving document structure is lost and it could not be opened in MSO
https://bugs.freedesktop.org/show_bug.cgi?id=65328 Uldis Kalniņš uldis+libreoff...@rom.lv changed: What|Removed |Added CC||uldis+libreoff...@rom.lv --- Comment #5 from Uldis Kalniņš uldis+libreoff...@rom.lv --- Created attachment 109719 -- https://bugs.freedesktop.org/attachment.cgi?id=109719action=edit Additional files for testing More files for testing - original *.ods, resulting *.xlsx and *.xls - just in case. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75467, which changed state. Bug 75467 Summary: OS X integration: selecting a file in Open File dialog adds resource fork, changes size and mod date (10.6/10.7) https://bugs.freedesktop.org/show_bug.cgi?id=75467 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75467] OS X integration: selecting a file in Open File dialog adds resource fork, changes size and mod date (10.6/10.7)
https://bugs.freedesktop.org/show_bug.cgi?id=75467 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX Summary|OS X integration: selecting |OS X integration: selecting |a file in Open File dialog |a file in Open File dialog |adds resource fork, changes |adds resource fork, changes |size and mod date |size and mod date ||(10.6/10.7) --- Comment #41 from Alex Thurgood ipla...@yahoo.co.uk --- This is unlikely to be fixed : - the problem does not appear to manifest itself on OSX 10.8, 10.9 or 10.10. - 10.6 is no longer the baseline SDK for 64bit releases, rather the baseline sdk is 10.8 - no developer resources are around to fix bugs for OS versions that are already no longer officially supported by Apple (update support) Setting as wontfix -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 86460] New: soffice.bin crash with SEGFAULT in libuno_sal.so.3
https://bugs.freedesktop.org/show_bug.cgi?id=86460 Bug ID: 86460 Summary: soffice.bin crash with SEGFAULT in libuno_sal.so.3 Product: LibreOffice Version: 4.0.4.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: critical Priority: medium Component: Libreoffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: marcosol...@gmail.com I use soffice server-side, essentially to convert ODT documents (after executing some Basic macro inside the document) to PDF format. This is the command line: /usr/lib64/libreoffice/program/soffice.bin --accept=socket,host=0.0.0.0,port=8100;urp;StarOffice.ServiceManager --headless --nodefault --nofirststartwizard --nolockcheck --nologo --norestore The problem: quite regularly (once/twice a day) it crashes. These are the lines I get in /var/log/messages.log file for each crash: Nov 14 23:36:19 MY_HOSTNAME kernel: soffice.bin[6587]: segfault at 18 ip 00310b616410 sp 7f5a2fdd1a68 error 6 in libuno_sal.so.3[310b60+52000] Nov 14 23:36:20 MY_HOSTNAME abrt[22154]: Saved core dump of pid 6583 (/usr/lib64/libreoffice/program/soffice.bin) to /var/spool/abrt/ccpp-2014-11-14-23:36:19-6583 (207622144 bytes) The service here is restored after every crash by a 'monit' running service. This is the 'top' command output (ordered by VIRT size) while soffice.bin is running: top - 10:47:38 up 8 days, 17:03, 3 users, load average: 0.00, 0.00, 0.00 Tasks: 184 total, 1 running, 183 sleeping, 0 stopped, 0 zombie Cpu(s): 0.0%us, 0.0%sy, 0.0%ni,100.0%id, 0.0%wa, 0.0%hi, 0.0%si, 0.0%st Mem: 3822240k total, 1695140k used, 2127100k free,77296k buffers Swap: 6012920k total,0k used, 6012920k free, 874476k cached PID USER PR NI VIRT RES SHR S %CPU %MEMTIME+ COMMAND 14173 root 20 0 1077m 109m 55m S 0.0 2.9 0:03.28 soffice.bin ... I suspect the crashes are coupled with the slow but steady increase of memory footprint of soffice.bin process. The same problem arises on at least four different physical servers, so an hardware problem is unlikely. This is some additional info about our server: # uname -a Linux MY_HOSTNAME 2.6.32-358.23.2.el6.x86_64 #1 SMP Wed Oct 16 18:37:12 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux # /usr/lib64/libreoffice/program/soffice.bin --version LibreOffice 4.0.4.2 # head -n 1 /proc/meminfo MemTotal:3822240 kB # file /etc/alternatives/java /etc/alternatives/java: symbolic link to `/usr/lib/jvm/jre-1.6.0-openjdk.x86_64/bin/java' I add the sosreport.tar.xz file in /var/spool/abrt/ccpp-2014-11-14-23:36:19-6583/ directory as an attachment to the bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
