[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter.cxx |7 +++
sw/source/core/unocore/unofield.cxx | 14 ++
2 files changed, 21 insertions(+)
New commits:
commit 2608512056b706bab57e36765e15f5c00668577a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 18 09:05:12 2014 +0100
fdo#86131 SwXTextField::getAnchor: handle postit field with annotation mark
Change-Id: I3881c4577375a2eda053f64800d0991de6f009ad
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3165de7..4fa1680 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -443,6 +443,13 @@ void SwUiWriterTest::testCommentedWord()
SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false);
// This was 9, only word, not wordanchor character was selected.
CPPUNIT_ASSERT_EQUAL(sal_Int32(10),
pShellCrsr-End()-nContent.GetIndex());
+
+// Test that getAnchor() points to word, not to an empty string.
+uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xFieldsAccess(xTextFieldsSupplier-getTextFields());
+uno::Referencecontainer::XEnumeration
xFields(xFieldsAccess-createEnumeration());
+uno::Referencetext::XTextContent xField(xFields-nextElement(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(word), xField-getAnchor()-getString());
}
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index fce4fff..07a996c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2078,6 +2078,20 @@ SwXTextField::getAnchor() throw (uno::RuntimeException,
std::exception)
if (pPamForTxtFld.get() == NULL)
return 0;
+// If this is a postit field, then return the range of its annotation mark
if it has one.
+if (const SwPostItField* pPostItField = dynamic_castconst
SwPostItField*(pField))
+{
+IDocumentMarkAccess* pMarkAccess =
m_pImpl-m_pDoc-getIDocumentMarkAccess();
+for (IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-getAnnotationMarksBegin(); ppMark !=
pMarkAccess-getAnnotationMarksEnd(); ++ppMark)
+{
+if (ppMark-get()-GetName() == pPostItField-GetName())
+{
+pPamForTxtFld.reset(new SwPaM(ppMark-get()-GetMarkStart(),
ppMark-get()-GetMarkEnd()));
+break;
+}
+}
+}
+
uno::Referencetext::XTextRange xRange = SwXTextRange::CreateXTextRange(
*m_pImpl-m_pDoc, *(pPamForTxtFld-GetPoint()),
pPamForTxtFld-GetMark());
return xRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java |9 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java | 14 +++--- nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java | 21 -- nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java |4 - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java |4 - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java |4 - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/SRComparator.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/ILibEngine.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/Library.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/knowledge/SearchPoint.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/ProblemEncoder.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/problem/UnconstrainedProblemEncoder.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/BasicPoint.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignDim.java |2 nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/DesignSpace.java |4 - nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/space/ILocationEngine.java |2 30 files changed, 41 insertions(+), 65 deletions(-) New commits: commit 79c6aff069a9593571226bb32e907f837a203b7c Author: Noel Grandin n...@peralex.com Date: Wed Nov 12 15:50:43 2014 +0200 java: fix some javadoc errors Eclipse was flagging this text as invalid javadoc tags Change-Id: I09e090c6cc49366191f96d34bd51f6ba68cf18aa Reviewed-on: https://gerrit.libreoffice.org/12524 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java index b4b9b4c..60f438c 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java @@ -2,7 +2,7 @@ * Description: The description of generate-and-test behavior. * * - * @ AuthorCreate/Modi Note + * Author Create/Modi Note * Xiaofeng XieMay 17, 2004 * Xiaofeng XieJul 01, 2008 * diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java index 3e7b32e..c9879c0 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
[Libreoffice-commits] core.git: bean/com qadevOOo/runner qadevOOo/tests ridljar/com wizards/com
bean/com/sun/star/comp/beans/ContainerFactory.java |5 +
bean/com/sun/star/comp/beans/InvalidArgumentException.java |3 +--
bean/com/sun/star/comp/beans/OOoBean.java |8 +++-
bean/com/sun/star/comp/beans/OfficeConnection.java |3 +--
bean/com/sun/star/comp/beans/OfficeWindow.java |3 +--
qadevOOo/runner/complexlib/MethodThread.java |2 +-
qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java |1 -
ridljar/com/sun/star/uno/Union.java|3 +--
wizards/com/sun/star/wizards/common/UCB.java |4 +---
9 files changed, 10 insertions(+), 22 deletions(-)
New commits:
commit 757748180971ee9ecb5feb1bb6364844da9992c0
Author: Noel Grandin n...@peralex.com
Date: Wed Nov 12 15:53:15 2014 +0200
java: rather use @Deprecated annotation
than an empty @deprecated tag
Change-Id: I1646ce1c0c8823ac5be0153aeb8eb2b830e7ebfa
Reviewed-on: https://gerrit.libreoffice.org/12525
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java
b/bean/com/sun/star/comp/beans/ContainerFactory.java
index d06a082..d7ebfba 100644
--- a/bean/com/sun/star/comp/beans/ContainerFactory.java
+++ b/bean/com/sun/star/comp/beans/ContainerFactory.java
@@ -22,11 +22,8 @@ import java.awt.Container;
/**
* This interface represents an AWT container factory.
- *
- * @deprecated
- *
*/
-
+@Deprecated
public interface ContainerFactory
{
/**
diff --git a/bean/com/sun/star/comp/beans/InvalidArgumentException.java
b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
index cfb288f..2c15f2d 100644
--- a/bean/com/sun/star/comp/beans/InvalidArgumentException.java
+++ b/bean/com/sun/star/comp/beans/InvalidArgumentException.java
@@ -19,9 +19,8 @@
package com.sun.star.comp.beans;
/** indicates an invalid argument in a function call.
- *
- * @deprecated
*/
+@Deprecated
public class InvalidArgumentException extends Exception
{
}
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 04abd76..ddf20b2 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -82,8 +82,8 @@ public class OOoBean
// @requirement FUNC.PER/0.2
/** @internal
- * @deprecated
*/
+@Deprecated
public void writeExternal( java.io.ObjectOutput aObjOut )
{
// TBD
@@ -91,8 +91,8 @@ public class OOoBean
// @requirement FUNC.PER/0.2
/** @internal
- * @deprecated
*/
+@Deprecated
public void readExternal( java.io.ObjectInput aObjIn )
{
// TBD
@@ -1312,9 +1312,7 @@
xLayoutManager.showElement(private:resource/menubar/menubar);
setLayout(new java.awt.BorderLayout());
}
-/**
-@deprecated
- */
+@Deprecated
@Override
public void paint( java.awt.Graphics aGraphics )
{
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java
b/bean/com/sun/star/comp/beans/OfficeConnection.java
index 2786810..a2960d9 100644
--- a/bean/com/sun/star/comp/beans/OfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/OfficeConnection.java
@@ -26,9 +26,8 @@ import com.sun.star.uno.XComponentContext;
/**
* This abstract class represents a connection to the office
* application.
-
-@deprecated
*/
+@Deprecated
public interface OfficeConnection
extends XComponent
{
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java
b/bean/com/sun/star/comp/beans/OfficeWindow.java
index 599bf02..a28489e 100644
--- a/bean/com/sun/star/comp/beans/OfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/OfficeWindow.java
@@ -26,9 +26,8 @@ import com.sun.star.awt.XWindowPeer;
* The concrete implementation of the OfficeWindow extends an
* appropriate type of visual component (java.awt.Canvas for local
* and java.awt.Container for remote).
-
-@deprecated
*/
+@Deprecated
public interface OfficeWindow
{
/**
diff --git a/qadevOOo/runner/complexlib/MethodThread.java
b/qadevOOo/runner/complexlib/MethodThread.java
index b6f1b81..11bdcb6 100644
--- a/qadevOOo/runner/complexlib/MethodThread.java
+++ b/qadevOOo/runner/complexlib/MethodThread.java
@@ -114,8 +114,8 @@ public class MethodThread extends Thread
/**
* Stop the running method.
- * @deprecated
*/
+@Deprecated
@Override
public void destroy()
{
diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
index 4b52450..9409cf3 100644
--- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
@@ -49,7 +49,6 @@ public class _XTasksSupplier extends MultiMethodTest {
/**
* DEPRECATED. p
* Has b OK /b status.
-* @deprecated
*/
@Deprecated
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - vcl/inc vcl/opengl vcl/source vcl/unx
vcl/inc/opengl/contextprovider.hxx | 28
vcl/inc/opengl/salbmp.hxx |2 +-
vcl/inc/salgdi.hxx |4
vcl/inc/unx/salgdi.h |2 +-
vcl/opengl/salbmp.cxx | 23 ++-
vcl/opengl/texture.cxx |8
vcl/source/gdi/salgdilayout.cxx| 13 -
vcl/unx/generic/gdi/salgdi.cxx |9 -
8 files changed, 24 insertions(+), 65 deletions(-)
New commits:
commit a33aaf1c3f43725594448c76b072c3100a7d8dbf
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 09:17:01 2014 +0100
Revert vcl: Fix crash when requesting coordonnates for empty texture
Not necessary any more.
This reverts commit 2195500d40055a182c573da074e61ddf0a2b4d5a.
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 5afb611..938de54 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -173,14 +173,6 @@ int OpenGLTexture::GetHeight() const
void OpenGLTexture::GetCoord( GLfloat* pCoord, const SalTwoRect rPosAry, bool
bInverted ) const
{
SAL_INFO( vcl.opengl, Getting coord Id() [ maRect.Left()
, maRect.Top() ] GetWidth() x GetHeight() );
-
-if( mpImpl == NULL )
-{
-pCoord[0] = pCoord[1] = pCoord[2] = pCoord[3] = 0.0f;
-pCoord[4] = pCoord[5] = pCoord[6] = pCoord[7] = 0.0f;
-return;
-}
-
pCoord[0] = pCoord[2] = (maRect.Left() + rPosAry.mnSrcX) / (double)
mpImpl-mnWidth;
pCoord[4] = pCoord[6] = (maRect.Left() + rPosAry.mnSrcX +
rPosAry.mnSrcWidth) / (double) mpImpl-mnWidth;
commit d09f827b1d33ca001ebfa55bdecca1b3437e53ec
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 09:07:31 2014 +0100
windows opengl: Provide the context to textures everywhere where we have it.
Change-Id: Ib820326fdc752d0893840bad3eb7f1369469f796
diff --git a/vcl/inc/opengl/contextprovider.hxx
b/vcl/inc/opengl/contextprovider.hxx
deleted file mode 100644
index 47eb98c..000
--- a/vcl/inc/opengl/contextprovider.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- 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_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX
-#define INCLUDED_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX
-
-#include vclpluginapi.h
-
-#include vcl/opengl/OpenGLContext.hxx
-
-class VCLPLUG_GEN_PUBLIC OpenGLContextProvider
-{
-public:
-virtual ~OpenGLContextProvider() {};
-
-/* Get the OpenGL context provided by this instance */
-virtual OpenGLContext* GetOpenGLContext() const = 0;
-};
-
-#endif // INCLUDED_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 98fc2fe..c862672 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -52,7 +52,7 @@ private:
int mnBufHeight;
std::deque OpenGLSalBitmapOp* maPendingOps;
-bool makeCurrent();
+void makeCurrent();
public:
OpenGLSalBitmap();
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 4a567f5..95920a0 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -44,6 +44,7 @@ class SalLayout;
class ImplLayoutArgs;
class Rectangle;
class FontSubsetInfo;
+class OpenGLContext;
class OutputDevice;
class ServerFontLayout;
struct SystemGraphicsData;
@@ -85,6 +86,9 @@ public:
virtual SalGraphicsImpl*GetImpl() const = 0;
+/// Check that our mpImpl is OpenGL and return the context, otherwise NULL.
+virtual OpenGLContext* GetOpenGLContext() const;
+
voidsetAntiAliasB2DDraw(bool bNew) {
m_bAntiAliasB2DDraw = bNew; }
boolgetAntiAliasB2DDraw() const { return
m_bAntiAliasB2DDraw; }
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 6b0e2be..6bf4c04 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -62,7 +62,7 @@ namespace basegfx {
class B2DTrapezoid;
}
-class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics, public
OpenGLContextProvider
+class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
{
friend class ServerFontLayout;
friend class X11SalGraphicsImpl;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 78bcf07..c664d7e 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -27,7 +27,6 @@
#include svdata.hxx
#include salgdi.hxx
-#include opengl/contextprovider.hxx
#include opengl/salbmp.hxx
static bool isValidBitCount( sal_uInt16 nBitCount )
@@ -407,8 +406,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
}
}
-if( !makeCurrent() )
-return
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source
sd/source/core/drawdoc3.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1e416e9b5b30f9a06114b24284994bc50715e1ba
Author: Muthu Subramanian muthu.subramanian.karunani...@ericsson.com
Date: Thu Oct 23 20:30:26 2014 +0530
fdo#85247: copy and paste of a slide results in a blue slide in
presentation mode.
Seems like Default is handled specially or probably
the copy-buffer is broken
This now checks for slide 'type' as well, before cosidering it a duplicate
Change-Id: If8c472bcefb54cee72e7411f92a76b4e2db2b6ce
(cherry picked from commit 0bab8aee77cfc2ffdbc6d3ef6a869284bc12dff4)
Reviewed-on: https://gerrit.libreoffice.org/12285
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 936a5d5..a3381fc 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -105,9 +105,11 @@ void
InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument rDoc
OUString aTest(aFullTest);
-if (aTest == aLayout)
+if (aTest == aLayout pBMMPage-GetPageKind() ==
pTestPage-GetPageKind())
{
-if( bRenameDuplicates pTestPage-getHash() !=
pBMMPage-getHash() )
+// Ignore Layouts with Default these seem to be special - in the
sense that there are lot of assumption all over Impress
+// about this
+if( bRenameDuplicates aTest != OUString( SdResId(
STR_LAYOUT_DEFAULT_NAME ) ) pTestPage-getHash() != pBMMPage-getHash() )
{
pBookmarkDoc-RenameLayoutTemplate( pBMMPage-GetLayoutName(),
OUString(pBMMPage-GetName())+=OUString(_) );
aLayout = pBMMPage-GetName();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/source
sc/inc/address.hxx |8
sc/source/filter/excel/excform.cxx | 10 ++
sc/source/filter/excel/xihelper.cxx | 10 ++
sc/source/filter/excel/xilink.cxx | 11 +++
4 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit 8921054fe8b819ef52d0e0b6aee84314677e90f2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 17 20:40:12 2014 +
Related: coverity#1242793 Untrusted value as argument
why doesn't coverity consider that Valid[Tab|Row|Col] check the lower bound
of
nPos.
Could it need to be as simple as naively looking for a =
Change-Id: Id80f9d30b9166caef20b74569f7b50a569189d71
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 7fcdee1..07ebe02 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -110,22 +110,22 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1;
// old stuff defines end
inline bool ValidCol( SCCOL nCol )
{
-return static_castSCCOL(0) = nCol nCol = MAXCOL;
+return nCol = static_castSCCOL(0) nCol = MAXCOL;
}
inline bool ValidRow( SCROW nRow )
{
-return static_castSCROW(0) = nRow nRow = MAXROW;
+return nRow = static_castSCROW(0) nRow = MAXROW;
}
inline bool ValidTab( SCTAB nTab )
{
-return static_castSCTAB(0) = nTab nTab = MAXTAB;
+return nTab = static_castSCTAB(0) nTab = MAXTAB;
}
inline bool ValidTab( SCTAB nTab, SCTAB nMaxTab )
{
-return static_castSCTAB(0) = nTab nTab = nMaxTab;
+return nTab = static_castSCTAB(0) nTab = nMaxTab;
}
inline bool ValidColRow( SCCOL nCol, SCROW nRow )
commit 206d68d587ee106c1a51db8507268fdf21fa1ddc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 17 20:34:55 2014 +
coverity#1242538 Untrusted loop bound
Change-Id: I663f70d6324c6dd42208aa3804edfe3680881ea1
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index eda4134..630997a 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1791,6 +1791,16 @@ void ExcelToSc::ReadExtensionArray( unsigned int n,
XclImpStream aIn )
OSL_FAIL( ExcelToSc::ReadExtensionArray - missing matrix );
}
+//assuming worse case scenario of unknown types
+const size_t nMinRecordSize = 1;
+const size_t nMaxRows = aIn.GetRecLeft() / (nMinRecordSize * nCols);
+if (nRows nMaxRows)
+{
+SAL_WARN(sc, Parsing error: nMaxRows
+ max possible rows, but nRows claimed,
truncating);
+nRows = nMaxRows;
+}
+
svl::SharedStringPool rPool = GetDoc().GetSharedStringPool();
for( nR = 0 ; nR nRows; nR++ )
{
commit 07ec99d307925b33d13b40d9a0a44ef029025ecc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 17 20:32:31 2014 +
coverity#1242628 Untrusted loop bound
Change-Id: Ifabdfab76279e4417642ce10cb86a43184b94629
diff --git a/sc/source/filter/excel/xihelper.cxx
b/sc/source/filter/excel/xihelper.cxx
index 6a98771..37e8d0e 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -838,6 +838,16 @@ XclImpCachedMatrix::XclImpCachedMatrix( XclImpStream
rStrm ) :
++mnScRows;
}
+//assuming worse case scenario of unknown types
+const size_t nMinRecordSize = 1;
+const size_t nMaxRows = rStrm.GetRecLeft() / (nMinRecordSize * mnScCols);
+if (mnScRows nMaxRows)
+{
+SAL_WARN(sc, Parsing error: nMaxRows
+ max possible rows, but mnScRows claimed,
truncating);
+mnScRows = nMaxRows;
+}
+
for( SCSIZE nScRow = 0; nScRow mnScRows; ++nScRow )
for( SCSIZE nScCol = 0; nScCol mnScCols; ++nScCol )
maValueList.push_back( new XclImpCachedValue( rStrm ) );
commit 5aa174b08489f1f217546966d2396bdf56842dca
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 17 20:28:55 2014 +
coverity#1242631 Untrusted loop bound
Change-Id: Ib034582fa4fa6e8149db2e45491230b4900c4d08
diff --git a/sc/source/filter/excel/xilink.cxx
b/sc/source/filter/excel/xilink.cxx
index 75bf324..52e8a5a 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -634,6 +634,17 @@ XclImpSupbook::XclImpSupbook( XclImpStream rStrm ) :
else if( nSBTabCnt )
{
meType = EXC_SBTYPE_EXTERN;
+
+//assuming all empty strings with just len header of 0
+const size_t nMinRecordSize = sizeof(sal_Int16);
+const size_t nMaxRecords = rStrm.GetRecLeft() / nMinRecordSize;
+if (nSBTabCnt nMaxRecords)
+{
+SAL_WARN(sc, Parsing error: nMaxRecords
+ max possible entries, but nSBTabCnt claimed,
truncating);
+nSBTabCnt = nMaxRecords;
+}
+
for( sal_uInt16 nSBTab = 0; nSBTab nSBTabCnt; ++nSBTab )
{
OUString aTabName( rStrm.ReadUniString() );
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b759504c9fb0e505b921c12c5968dba7cec7ae10 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Nov 18 09:54:26 2014 +0100 sw: no matching function for call to assertEquals(sal_Int32, int, ...) Change-Id: I3fc87b89c85bf800bfafccf1c379bc379ebba058 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 3f2dd6b..640e468 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2507,7 +2507,7 @@ DECLARE_OOXMLIMPORT_TEST(testFdo85542, fdo85542.docx) //CPPUNIT_ASSERT_EQUAL(false,true); uno::Referencetext::XBookmarksSupplier xBookmarksSupplier(mxComponent, uno::UNO_QUERY); uno::Referencecontainer::XIndexAccess xBookmarksByIdx(xBookmarksSupplier-getBookmarks(), uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx-getCount(), 3); +CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx-getCount(), static_castsal_Int32(3)); uno::Referencecontainer::XNameAccess xBookmarksByName(xBookmarksSupplier-getBookmarks(), uno::UNO_QUERY); CPPUNIT_ASSERT(xBookmarksByName-hasByName(B1)); CPPUNIT_ASSERT(xBookmarksByName-hasByName(B2)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpfrib.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5c339be474c93c0bf42c593b48fd683ea4614250 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 18 09:11:06 2014 + tweak for future null deref warning Change-Id: I38590e08a6bd03a2ddfeda466b9cee7128c62aa7 diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index 1d614aa..bc404aa 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -263,8 +263,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) pFont = pFoundry-GetFontManger().CreateOverrideFont(pCharStyle-GetFinalFontID(),m_pModifiers-FontID); pStyle-SetFont(pFont); IXFStyleRet aNewStyle = pXFStyleManager-AddStyle(pStyle); +m_StyleName = aNewStyle.m_pStyle-GetStyleName(); pStyle = dynamic_castXFTextStyle*(aNewStyle.m_pStyle); -m_StyleName = pStyle-GetStyleName(); if (aNewStyle.m_bOrigDeleted) pStyle = NULL; } @@ -279,8 +279,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) pFont = pFoundry-GetFontManger().CreateFont(m_pModifiers-FontID); pStyle-SetFont(pFont); IXFStyleRet aNewStyle = pXFStyleManager-AddStyle(pStyle); +m_StyleName = aNewStyle.m_pStyle-GetStyleName(); pStyle = dynamic_castXFTextStyle*(aNewStyle.m_pStyle); -m_StyleName = pStyle-GetStyleName(); if (aNewStyle.m_bOrigDeleted) pStyle = NULL; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 sc/Library_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/inc/sc.hrc |3 sc/sdi/cellsh.sdi |1 sc/sdi/scalc.sdi | 24 sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx| 97 +++ sc/source/ui/app/scdll.cxx|1 sc/source/ui/inc/ChiSquareTestDialog.hxx | 34 + sc/source/ui/inc/DescriptiveStatisticsDialog.hxx |8 sc/source/ui/inc/reffact.hxx |7 sc/source/ui/view/cellsh1.cxx | 10 sc/source/ui/view/tabvwsh.cxx |1 sc/source/ui/view/tabvwshc.cxx|7 sc/uiconfig/scalc/menubar/menubar.xml |1 sc/uiconfig/scalc/ui/chisquaretestdialog.ui | 282 ++ 16 files changed, 477 insertions(+), 9 deletions(-) New commits: commit 018ebd146d5d20593063976e3c7042ffd197b5af Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Nov 18 10:15:40 2014 +0100 remove unneeded includes Change-Id: I9ab6fb92aae51aa596a81f002087c92008fcbd8b diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index b455fae..aa6a912 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -11,14 +11,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DESCRIPTIVESTATISTICSDIALOG_HXX #define INCLUDED_SC_SOURCE_UI_INC_DESCRIPTIVESTATISTICSDIALOG_HXX -#include global.hxx -#include address.hxx -#include anyrefdg.hxx - -#include vcl/fixed.hxx -#include vcl/group.hxx -#include vcl/lstbox.hxx - #include StatisticsInputOutputDialog.hxx class ScDescriptiveStatisticsDialog : public ScStatisticsInputOutputDialog commit c080641d2f45c6b455d6a60836f53d054853fc53 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Nov 18 10:13:50 2014 +0100 fdo#76868 Add chi-square test Statistics Dialog Change-Id: I35c115a1f1cb733a0d6841596d8baf2e5ade4a1d diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 1054efc..03d2b84 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -755,6 +755,14 @@ value1/value /prop /node + node oor:name=.uno:ChiSquareTestDialog oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-US~Chi-square Test.../value +/prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop + /node node oor:name=.uno:EditHeaderAndFooter oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Headers amp; Footers.../value diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 2c591c9..3f79a12 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -495,6 +495,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog \ sc/source/ui/StatisticsDialogs/CorrelationDialog \ sc/source/ui/StatisticsDialogs/CovarianceDialog \ +sc/source/ui/StatisticsDialogs/ChiSquareTestDialog \ sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog \ sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog \ sc/source/ui/StatisticsDialogs/FTestDialog \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 9bcc908..5e4be53 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/changesourcedialog \ sc/uiconfig/scalc/ui/chardialog \ + sc/uiconfig/scalc/ui/chisquaretestdialog \ sc/uiconfig/scalc/ui/colorrowdialog \ sc/uiconfig/scalc/ui/colwidthdialog \ sc/uiconfig/scalc/ui/condformatmanager \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 155ef28..bc39f32 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -272,7 +272,8 @@ #define SID_TTEST_DIALOG(SC_MESSAGE_START + 78) #define SID_FTEST_DIALOG(SC_MESSAGE_START + 79) #define SID_ZTEST_DIALOG(SC_MESSAGE_START + 80) -#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 81) +#define SID_CHI_SQUARE_TEST_DIALOG (SC_MESSAGE_START + 81) +#define SID_SEARCH_RESULTS_DIALOG (SC_MESSAGE_START + 82)
[Libreoffice-commits] core.git: include/vcl
include/vcl/sysdata.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 4353fafaf97b6a086fde1e51520f5d205ae90be0 Author: Douglas Mencken dougmenc...@gmail.com Date: Mon Nov 17 13:27:48 2014 -0500 bin confusing comment Change-Id: Idedad17ed2c89613a3f5caeea39f5c47c9856114 Reviewed-on: https://gerrit.libreoffice.org/12516 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 4cfc737..e8b7a25 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -179,7 +179,6 @@ struct SystemWindowData #elif defined( MACOSX ) boolbOpenGL;// create a OpenGL providing NSView boolbLegacy;// create a 2.1 legacy context, only valid if bOpenGL == true -// Nothing #elif defined( ANDROID ) // Nothing #elif defined( IOS ) ___ 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 sw/source
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu| 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 2 +- sc/source/ui/src/popup.src | 2 +- sw/source/uibase/uiview/view.src | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 36b6db7676ba73f87c2c707826aec2500a59bfe7 Author: Yousuf Philips philip...@hotmail.com Date: Sun Nov 16 23:30:13 2014 +0400 fdo#86289 rename 'Page Preview' to 'Print Preview' in toolbar names and popups Change-Id: Ifb4254a044b1aa15b1c3e09d7f662daaf6eb61d7 Reviewed-on: https://gerrit.libreoffice.org/12502 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index 0742238..7997881 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -102,7 +102,7 @@ valuetrue/value /prop prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USPage Preview/value + value xml:lang=en-USPrint Preview/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean valuetrue/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu index 7d02379..45333b8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu @@ -467,7 +467,7 @@ valuetrue/value /prop prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USPage Preview/value + value xml:lang=en-USPrint Preview/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean valuetrue/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu index d2dc9f9..05d1659 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu @@ -461,7 +461,7 @@ valuetrue/value /prop prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USPage Preview/value + value xml:lang=en-USPrint Preview/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean valuetrue/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu index 2573d77..6fe2b60 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu @@ -464,7 +464,7 @@ valuetrue/value /prop prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USPage Preview/value + value xml:lang=en-USPrint Preview/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean valuetrue/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu index 7e8eda4..e6da9a4 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu @@ -467,7 +467,7 @@ valuetrue/value /prop prop oor:name=UIName oor:type=xs:string - value xml:lang=en-USPage Preview/value + value xml:lang=en-USPrint Preview/value /prop prop oor:name=HideFromToolbarMenu oor:type=xs:boolean valuefalse/value diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index 513ec9a..56ea073 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++
[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig
cui/uiconfig/ui/numberingpositionpage.ui | 605 +- sw/uiconfig/swriter/ui/outlinepositionpage.ui | 570 2 files changed, 619 insertions(+), 556 deletions(-) New commits: commit 1d9b9df02d36f3a4135480902e1517501bede6c4 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Mon Nov 17 15:58:46 2014 -0600 fdo#76937 Improve organization and layout in Position tabs Change-Id: I55e08db1c4c32d0e2a1def293d1d42abb6717cb0 Reviewed-on: https://gerrit.libreoffice.org/12520 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index eb807a4..f1fb5d4 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -99,159 +99,333 @@ /packing /child child - object class=GtkFrame id=numberingframe + object class=GtkBox id=box1 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property -property name=label_xalign0/property -property name=shadow_typenone/property +property name=orientationvertical/property +property name=spacing12/property child - object class=GtkAlignment id=alignment6 + object class=GtkFrame id=numberingframe property name=visibleTrue/property property name=can_focusFalse/property -property name=hexpandTrue/property property name=vexpandTrue/property -property name=top_padding6/property -property name=left_padding12/property +property name=label_xalign0/property +property name=shadow_typenone/property child - object class=GtkGrid id=grid1 + object class=GtkAlignment id=alignment6 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property -property name=row_spacing6/property -property name=column_spacing12/property +property name=top_padding6/property +property name=left_padding12/property child - object class=GtkLabel id=numfollowedby + object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property +property name=halignstart/property property name=hexpandTrue/property -property name=xalign0/property -property name=label translatable=yesNumbering followed by:/property -property name=use_underlineTrue/property -property name=mnemonic_widgetnumfollowedbylb/property - /object - packing -property name=left_attach0/property -property name=top_attach0/property - /packing -/child -child - object class=GtkLabel id=num2align -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesN_umbering alignment:/property -property name=use_underlineTrue/property -property name=mnemonic_widgetnum2alignlb/property - /object - packing -property name=left_attach0/property -property name=top_attach2/property - /packing -/child -child - object class=GtkLabel id=alignedat -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesAligned at:/property -property name=use_underlineTrue/property -property name=mnemonic_widgetalignedatmf:0.00cm/property - /object - packing -property name=left_attach0/property -property name=top_attach3/property - /packing -/child -child - object class=GtkLabel id=indentat -property name=visibleTrue/property -property name=can_focusFalse/property -property name=xalign0/property -property name=label translatable=yesIndent at:/property -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo83204.rtf |9 +
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 ++
3 files changed, 17 insertions(+)
New commits:
commit 741be800ff7c6e6979c8b816ac2ceb955e7c303d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sun Nov 16 12:12:43 2014 +0100
fdo#83204 RTF import: handle \pardpara props after \bkmkstart
(cherry picked from commit 8a30ba573470d59dbb0501b488f8a655b015ffd2)
Change-Id: I4f5f0f653f2ce7782ec1d1fc5ef550a21a9c1d35
Reviewed-on: https://gerrit.libreoffice.org/12527
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo83204.rtf
b/sw/qa/extras/rtfimport/data/fdo83204.rtf
new file mode 100644
index 000..39d89b0
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo83204.rtf
@@ -0,0 +1,9 @@
+{\rtf1
+{\stylesheet
+{Normal;}
+{\s1 heading 1;}
+}
+{\*\bkmkstart titlebookmark}
+\pard\s1 Title\par
+{\*\bkmkend titlebookmark}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8a6c6da..9a274fd 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2017,6 +2017,12 @@ DECLARE_RTFIMPORT_TEST(testUnbalancedColumns,
unbalanced-columns.rtf)
CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTextSections-getByIndex(0),
DontBalanceTextColumns));
}
+DECLARE_RTFIMPORT_TEST(testFdo83204, fdo83204.rtf)
+{
+// This was Standard, \sN was ignored after \bkmkstart and \pard.
+CPPUNIT_ASSERT_EQUAL(OUString(Heading 1),
getPropertyOUString(getParagraph(1), ParaStyleName));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b372d34..31ff8b8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2873,6 +2873,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nCurrentStyleIndex = -1;
}
}
+// Need to send paragraph properties again, if there will be any.
+m_bNeedPap = true;
break;
case RTF_SECTD:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_fontheight.png |binary icon-themes/sifr/cmd/lc_grow.png |binary icon-themes/sifr/cmd/lc_scaletext.png |binary icon-themes/sifr/cmd/lc_shrink.png |binary icon-themes/sifr/cmd/sc_fontheight.png |binary icon-themes/sifr/cmd/sc_grow.png |binary icon-themes/sifr/cmd/sc_scaletext.png |binary icon-themes/sifr/cmd/sc_shrink.png |binary 8 files changed New commits: commit 3e3832afcc542f9be6387ebb5a7989abeeadac46 Author: Matthias Freund matti...@secure.mailbox.org Date: Sun Nov 16 23:19:24 2014 +0100 fdo#75256 Improve sifr icontheme Shrink and grow is the way to go... Change-Id: Ie8dfc18ef6b0b9f712dfc6684d0e75eb3b04f0f0 Reviewed-on: https://gerrit.libreoffice.org/12505 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/sifr/cmd/lc_fontheight.png b/icon-themes/sifr/cmd/lc_fontheight.png new file mode 100644 index 000..50b2806 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_fontheight.png differ diff --git a/icon-themes/sifr/cmd/lc_grow.png b/icon-themes/sifr/cmd/lc_grow.png index 68dd110..327b747 100644 Binary files a/icon-themes/sifr/cmd/lc_grow.png and b/icon-themes/sifr/cmd/lc_grow.png differ diff --git a/icon-themes/sifr/cmd/lc_scaletext.png b/icon-themes/sifr/cmd/lc_scaletext.png new file mode 100644 index 000..3f3e7c4 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_scaletext.png differ diff --git a/icon-themes/sifr/cmd/lc_shrink.png b/icon-themes/sifr/cmd/lc_shrink.png index 0a12ac2..d20c10e 100644 Binary files a/icon-themes/sifr/cmd/lc_shrink.png and b/icon-themes/sifr/cmd/lc_shrink.png differ diff --git a/icon-themes/sifr/cmd/sc_fontheight.png b/icon-themes/sifr/cmd/sc_fontheight.png new file mode 100644 index 000..82dcc4d Binary files /dev/null and b/icon-themes/sifr/cmd/sc_fontheight.png differ diff --git a/icon-themes/sifr/cmd/sc_grow.png b/icon-themes/sifr/cmd/sc_grow.png index 1f67f6b..d13f973 100644 Binary files a/icon-themes/sifr/cmd/sc_grow.png and b/icon-themes/sifr/cmd/sc_grow.png differ diff --git a/icon-themes/sifr/cmd/sc_scaletext.png b/icon-themes/sifr/cmd/sc_scaletext.png new file mode 100644 index 000..45207e1 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_scaletext.png differ diff --git a/icon-themes/sifr/cmd/sc_shrink.png b/icon-themes/sifr/cmd/sc_shrink.png index 0dbac3a..2be23fd 100644 Binary files a/icon-themes/sifr/cmd/sc_shrink.png and b/icon-themes/sifr/cmd/sc_shrink.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_insertannotation.png |binary icon-themes/sifr/cmd/lc_overline.png |binary icon-themes/sifr/cmd/sc_insertannotation.png |binary icon-themes/sifr/cmd/sc_overline.png |binary icon-themes/sifr/sfx2/res/closedoc.png |binary icon-themes/sifr/sfx2/res/minus.png |binary icon-themes/sifr/sfx2/res/plus.png |binary 7 files changed New commits: commit fd498c34112a422dd2179b70526144b708eb5fcb Author: Matthias Freund matti...@secure.mailbox.org Date: Sat Nov 15 22:19:03 2014 +0100 fdo#75256 Improve sifr icontheme Modify insertannotation, new minus and plus for the sidepanel, rename upperline to overline Change-Id: Idd3de965cb6be307bf3e8326b854084ad1a7c0af Reviewed-on: https://gerrit.libreoffice.org/12465 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/sifr/cmd/lc_insertannotation.png b/icon-themes/sifr/cmd/lc_insertannotation.png index e40ec49..bc61842 100644 Binary files a/icon-themes/sifr/cmd/lc_insertannotation.png and b/icon-themes/sifr/cmd/lc_insertannotation.png differ diff --git a/icon-themes/sifr/cmd/lc_overline.png b/icon-themes/sifr/cmd/lc_overline.png new file mode 100644 index 000..c0d5157 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_overline.png differ diff --git a/icon-themes/sifr/cmd/sc_insertannotation.png b/icon-themes/sifr/cmd/sc_insertannotation.png index 3b4df97..4e24eb6 100644 Binary files a/icon-themes/sifr/cmd/sc_insertannotation.png and b/icon-themes/sifr/cmd/sc_insertannotation.png differ diff --git a/icon-themes/sifr/cmd/sc_overline.png b/icon-themes/sifr/cmd/sc_overline.png new file mode 100644 index 000..9cd2401 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_overline.png differ diff --git a/icon-themes/sifr/sfx2/res/closedoc.png b/icon-themes/sifr/sfx2/res/closedoc.png new file mode 100644 index 000..1fe5b8c Binary files /dev/null and b/icon-themes/sifr/sfx2/res/closedoc.png differ diff --git a/icon-themes/sifr/sfx2/res/minus.png b/icon-themes/sifr/sfx2/res/minus.png new file mode 100644 index 000..139ff01 Binary files /dev/null and b/icon-themes/sifr/sfx2/res/minus.png differ diff --git a/icon-themes/sifr/sfx2/res/plus.png b/icon-themes/sifr/sfx2/res/plus.png new file mode 100644 index 000..2585154 Binary files /dev/null and b/icon-themes/sifr/sfx2/res/plus.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_apply.png |binary icon-themes/sifr/cmd/lc_cancel.png|binary icon-themes/sifr/cmd/lc_ok.png|binary icon-themes/sifr/cmd/lc_rulerrows.png |binary icon-themes/sifr/cmd/sc_apply.png |binary icon-themes/sifr/cmd/sc_cancel.png|binary icon-themes/sifr/cmd/sc_ok.png|binary 7 files changed New commits: commit 9e1afe84ec73b1eb183ca42204a518d6deede292 Author: Matthias Freund matti...@secure.mailbox.org Date: Mon Nov 17 23:10:32 2014 +0100 fdo#75256 Improve sifr icontheme Modified apply and cancel, new ok, test for rulerrows Change-Id: Ib5255a106390c72bb66bdd4d40e54fc0b33bb264 Reviewed-on: https://gerrit.libreoffice.org/12522 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/sifr/cmd/lc_apply.png b/icon-themes/sifr/cmd/lc_apply.png new file mode 100644 index 000..64edf17 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_apply.png differ diff --git a/icon-themes/sifr/cmd/lc_cancel.png b/icon-themes/sifr/cmd/lc_cancel.png index 059aac2..d1b338f 100644 Binary files a/icon-themes/sifr/cmd/lc_cancel.png and b/icon-themes/sifr/cmd/lc_cancel.png differ diff --git a/icon-themes/sifr/cmd/lc_ok.png b/icon-themes/sifr/cmd/lc_ok.png new file mode 100644 index 000..9139900 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_ok.png differ diff --git a/icon-themes/sifr/cmd/lc_rulerrows.png b/icon-themes/sifr/cmd/lc_rulerrows.png new file mode 100644 index 000..eb643da Binary files /dev/null and b/icon-themes/sifr/cmd/lc_rulerrows.png differ diff --git a/icon-themes/sifr/cmd/sc_apply.png b/icon-themes/sifr/cmd/sc_apply.png new file mode 100644 index 000..e6338b1 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_apply.png differ diff --git a/icon-themes/sifr/cmd/sc_cancel.png b/icon-themes/sifr/cmd/sc_cancel.png index 9e0d3b4..dc85411 100644 Binary files a/icon-themes/sifr/cmd/sc_cancel.png and b/icon-themes/sifr/cmd/sc_cancel.png differ diff --git a/icon-themes/sifr/cmd/sc_ok.png b/icon-themes/sifr/cmd/sc_ok.png new file mode 100644 index 000..5240440 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_ok.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_wraptext.png |binary icon-themes/sifr/cmd/sc_delete.png |binary icon-themes/sifr/cmd/sc_wraptext.png |binary 3 files changed New commits: commit ce0390b8eceaf92d1435f8933e49b79a5e310aaa Author: Matthias Freund matti...@secure.mailbox.org Date: Sun Nov 16 00:32:34 2014 +0100 fdo#75256 Improve sifr icontheme Modify wraptext to match tango, add missing sc_delete.png Change-Id: Ifa4622bd63675204d5e5e9c6ad4d89a1b783d542 Reviewed-on: https://gerrit.libreoffice.org/12468 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/sifr/cmd/lc_wraptext.png b/icon-themes/sifr/cmd/lc_wraptext.png index 0434d8b..99056d8 100644 Binary files a/icon-themes/sifr/cmd/lc_wraptext.png and b/icon-themes/sifr/cmd/lc_wraptext.png differ diff --git a/icon-themes/sifr/cmd/sc_delete.png b/icon-themes/sifr/cmd/sc_delete.png new file mode 100644 index 000..24c7d80 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_delete.png differ diff --git a/icon-themes/sifr/cmd/sc_wraptext.png b/icon-themes/sifr/cmd/sc_wraptext.png index 8f61f38..6c726b52 100644 Binary files a/icon-themes/sifr/cmd/sc_wraptext.png and b/icon-themes/sifr/cmd/sc_wraptext.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/lc_alignbottom.png |binary icon-themes/sifr/cmd/lc_aligntop.png |binary icon-themes/sifr/cmd/lc_alignvcenter.png |binary icon-themes/sifr/cmd/lc_decrementindent.png |binary icon-themes/sifr/cmd/lc_incrementindent.png |binary icon-themes/sifr/cmd/lc_outlinefont.png |binary icon-themes/sifr/cmd/sc_alignblock.png|binary icon-themes/sifr/cmd/sc_alignbottom.png |binary icon-themes/sifr/cmd/sc_alignhorizontalcenter.png |binary icon-themes/sifr/cmd/sc_alignleft.png |binary icon-themes/sifr/cmd/sc_alignright.png|binary icon-themes/sifr/cmd/sc_aligntop.png |binary icon-themes/sifr/cmd/sc_alignvcenter.png |binary icon-themes/sifr/cmd/sc_decrementindent.png |binary icon-themes/sifr/cmd/sc_incrementindent.png |binary icon-themes/sifr/cmd/sc_outlinefont.png |binary 16 files changed New commits: commit 04ba979a24c6669462886421244ae311a859c88c Author: Matthias Freund matti...@secure.mailbox.org Date: Sun Nov 16 15:05:42 2014 +0100 fdo#75256 Update sifr icontheme Modify the align buttons left, center, right block for better visuabiliy, new vertical align icons, increment- and decrementintent Change-Id: I5761272282bf586815bc1b7f2c85f1f0065d7fbc Reviewed-on: https://gerrit.libreoffice.org/12476 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/sifr/cmd/lc_alignbottom.png b/icon-themes/sifr/cmd/lc_alignbottom.png new file mode 100644 index 000..e192101 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_alignbottom.png differ diff --git a/icon-themes/sifr/cmd/lc_aligntop.png b/icon-themes/sifr/cmd/lc_aligntop.png new file mode 100644 index 000..4823820 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_aligntop.png differ diff --git a/icon-themes/sifr/cmd/lc_alignvcenter.png b/icon-themes/sifr/cmd/lc_alignvcenter.png new file mode 100644 index 000..e22825b Binary files /dev/null and b/icon-themes/sifr/cmd/lc_alignvcenter.png differ diff --git a/icon-themes/sifr/cmd/lc_decrementindent.png b/icon-themes/sifr/cmd/lc_decrementindent.png index 804b7cf..71f6889 100644 Binary files a/icon-themes/sifr/cmd/lc_decrementindent.png and b/icon-themes/sifr/cmd/lc_decrementindent.png differ diff --git a/icon-themes/sifr/cmd/lc_incrementindent.png b/icon-themes/sifr/cmd/lc_incrementindent.png index c5d574fb..2311e0f 100644 Binary files a/icon-themes/sifr/cmd/lc_incrementindent.png and b/icon-themes/sifr/cmd/lc_incrementindent.png differ diff --git a/icon-themes/sifr/cmd/lc_outlinefont.png b/icon-themes/sifr/cmd/lc_outlinefont.png new file mode 100644 index 000..6107357 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_outlinefont.png differ diff --git a/icon-themes/sifr/cmd/sc_alignblock.png b/icon-themes/sifr/cmd/sc_alignblock.png index 42977a5..862b6d0 100644 Binary files a/icon-themes/sifr/cmd/sc_alignblock.png and b/icon-themes/sifr/cmd/sc_alignblock.png differ diff --git a/icon-themes/sifr/cmd/sc_alignbottom.png b/icon-themes/sifr/cmd/sc_alignbottom.png new file mode 100644 index 000..7f847b6 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_alignbottom.png differ diff --git a/icon-themes/sifr/cmd/sc_alignhorizontalcenter.png b/icon-themes/sifr/cmd/sc_alignhorizontalcenter.png index de60f2e..50923e2 100644 Binary files a/icon-themes/sifr/cmd/sc_alignhorizontalcenter.png and b/icon-themes/sifr/cmd/sc_alignhorizontalcenter.png differ diff --git a/icon-themes/sifr/cmd/sc_alignleft.png b/icon-themes/sifr/cmd/sc_alignleft.png index b2a3bde..8170a53 100644 Binary files a/icon-themes/sifr/cmd/sc_alignleft.png and b/icon-themes/sifr/cmd/sc_alignleft.png differ diff --git a/icon-themes/sifr/cmd/sc_alignright.png b/icon-themes/sifr/cmd/sc_alignright.png index e01a4c3..a6d157d 100644 Binary files a/icon-themes/sifr/cmd/sc_alignright.png and b/icon-themes/sifr/cmd/sc_alignright.png differ diff --git a/icon-themes/sifr/cmd/sc_aligntop.png b/icon-themes/sifr/cmd/sc_aligntop.png new file mode 100644 index 000..6972e5c Binary files /dev/null and b/icon-themes/sifr/cmd/sc_aligntop.png differ diff --git a/icon-themes/sifr/cmd/sc_alignvcenter.png b/icon-themes/sifr/cmd/sc_alignvcenter.png new file mode 100644 index 000..4278da4 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_alignvcenter.png differ diff --git a/icon-themes/sifr/cmd/sc_decrementindent.png b/icon-themes/sifr/cmd/sc_decrementindent.png index 8ff2437..ba4c6e6 100644 Binary files a/icon-themes/sifr/cmd/sc_decrementindent.png and b/icon-themes/sifr/cmd/sc_decrementindent.png differ diff --git a/icon-themes/sifr/cmd/sc_incrementindent.png b/icon-themes/sifr/cmd/sc_incrementindent.png index 2e17217..ee453c6 100644 Binary files a/icon-themes/sifr/cmd/sc_incrementindent.png and b/icon-themes/sifr/cmd/sc_incrementindent.png differ diff --git
[Libreoffice-commits] core.git: icon-themes/oxygen
icon-themes/oxygen/cmd/lc_deletecolumns.png|binary icon-themes/oxygen/cmd/lc_deleterows.png |binary icon-themes/oxygen/cmd/lc_insertcolumns.png|binary icon-themes/oxygen/cmd/lc_insertrows.png |binary icon-themes/oxygen/cmd/lc_mergecells.png |binary icon-themes/oxygen/cmd/lc_sortascending.png|binary icon-themes/oxygen/cmd/lc_sortdescending.png |binary icon-themes/oxygen/cmd/lc_text.png |binary icon-themes/oxygen/cmd/lc_togglemergecells.png |binary icon-themes/oxygen/cmd/sc_deletecolumns.png|binary icon-themes/oxygen/cmd/sc_deleterows.png |binary icon-themes/oxygen/cmd/sc_insertcolumns.png|binary icon-themes/oxygen/cmd/sc_insertrows.png |binary icon-themes/oxygen/cmd/sc_mergecells.png |binary icon-themes/oxygen/cmd/sc_sortascending.png|binary icon-themes/oxygen/cmd/sc_sortdescending.png |binary icon-themes/oxygen/cmd/sc_text.png |binary icon-themes/oxygen/cmd/sc_togglemergecells.png |binary 18 files changed New commits: commit 4b6946877788244c2b864e8b11a7bba7e9700ee6 Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 14 22:58:01 2014 +0400 OXYGEN: Replaced icons with icons from the icon set sources Change-Id: I169981bff95d93b1a08371c07278b3123374b560 Reviewed-on: https://gerrit.libreoffice.org/12429 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/oxygen/cmd/lc_deletecolumns.png b/icon-themes/oxygen/cmd/lc_deletecolumns.png index d700c2d..6d5a818 100644 Binary files a/icon-themes/oxygen/cmd/lc_deletecolumns.png and b/icon-themes/oxygen/cmd/lc_deletecolumns.png differ diff --git a/icon-themes/oxygen/cmd/lc_deleterows.png b/icon-themes/oxygen/cmd/lc_deleterows.png index 3c6484e..9537003 100644 Binary files a/icon-themes/oxygen/cmd/lc_deleterows.png and b/icon-themes/oxygen/cmd/lc_deleterows.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertcolumns.png b/icon-themes/oxygen/cmd/lc_insertcolumns.png index ea80daa..f66559e 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertcolumns.png and b/icon-themes/oxygen/cmd/lc_insertcolumns.png differ diff --git a/icon-themes/oxygen/cmd/lc_insertrows.png b/icon-themes/oxygen/cmd/lc_insertrows.png index 7c386b2..4973e62 100644 Binary files a/icon-themes/oxygen/cmd/lc_insertrows.png and b/icon-themes/oxygen/cmd/lc_insertrows.png differ diff --git a/icon-themes/oxygen/cmd/lc_mergecells.png b/icon-themes/oxygen/cmd/lc_mergecells.png index 17a56b8..11a2405 100644 Binary files a/icon-themes/oxygen/cmd/lc_mergecells.png and b/icon-themes/oxygen/cmd/lc_mergecells.png differ diff --git a/icon-themes/oxygen/cmd/lc_sortascending.png b/icon-themes/oxygen/cmd/lc_sortascending.png index 907d861..baa659b 100644 Binary files a/icon-themes/oxygen/cmd/lc_sortascending.png and b/icon-themes/oxygen/cmd/lc_sortascending.png differ diff --git a/icon-themes/oxygen/cmd/lc_sortdescending.png b/icon-themes/oxygen/cmd/lc_sortdescending.png index fdf3c93..06ecddf 100644 Binary files a/icon-themes/oxygen/cmd/lc_sortdescending.png and b/icon-themes/oxygen/cmd/lc_sortdescending.png differ diff --git a/icon-themes/oxygen/cmd/lc_text.png b/icon-themes/oxygen/cmd/lc_text.png index 35883c7..b3812a0 100644 Binary files a/icon-themes/oxygen/cmd/lc_text.png and b/icon-themes/oxygen/cmd/lc_text.png differ diff --git a/icon-themes/oxygen/cmd/lc_togglemergecells.png b/icon-themes/oxygen/cmd/lc_togglemergecells.png index ed08f17..11a2405 100644 Binary files a/icon-themes/oxygen/cmd/lc_togglemergecells.png and b/icon-themes/oxygen/cmd/lc_togglemergecells.png differ diff --git a/icon-themes/oxygen/cmd/sc_deletecolumns.png b/icon-themes/oxygen/cmd/sc_deletecolumns.png index a1a27ac..4fe000d 100644 Binary files a/icon-themes/oxygen/cmd/sc_deletecolumns.png and b/icon-themes/oxygen/cmd/sc_deletecolumns.png differ diff --git a/icon-themes/oxygen/cmd/sc_deleterows.png b/icon-themes/oxygen/cmd/sc_deleterows.png index 6b28d7f..b0c86f0 100644 Binary files a/icon-themes/oxygen/cmd/sc_deleterows.png and b/icon-themes/oxygen/cmd/sc_deleterows.png differ diff --git a/icon-themes/oxygen/cmd/sc_insertcolumns.png b/icon-themes/oxygen/cmd/sc_insertcolumns.png index 1d817e9..e995036 100644 Binary files a/icon-themes/oxygen/cmd/sc_insertcolumns.png and b/icon-themes/oxygen/cmd/sc_insertcolumns.png differ diff --git a/icon-themes/oxygen/cmd/sc_insertrows.png b/icon-themes/oxygen/cmd/sc_insertrows.png index fdce5ad..bf36435 100644 Binary files a/icon-themes/oxygen/cmd/sc_insertrows.png and b/icon-themes/oxygen/cmd/sc_insertrows.png differ diff --git a/icon-themes/oxygen/cmd/sc_mergecells.png b/icon-themes/oxygen/cmd/sc_mergecells.png index 2c9e57e..91a9993 100644 Binary files a/icon-themes/oxygen/cmd/sc_mergecells.png and b/icon-themes/oxygen/cmd/sc_mergecells.png differ diff --git a/icon-themes/oxygen/cmd/sc_sortascending.png b/icon-themes/oxygen/cmd/sc_sortascending.png index
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml |2 +- sd/uiconfig/sdraw/toolbar/standardbar.xml |6 +- sd/uiconfig/sdraw/toolbar/textobjectbar.xml| 19 +++ sd/uiconfig/simpress/toolbar/textobjectbar.xml | 17 ++--- 4 files changed, 27 insertions(+), 17 deletions(-) New commits: commit d38f7b74daf91ad47557bf8eca8946fd0ad97cf8 Author: Yousuf Philips philip...@hotmail.com Date: Sun Nov 16 08:26:54 2014 +0400 fdo#84909 more reworking of the toolbars in impress and draw Change-Id: Ib6cdda8081a567fed44b1b78973c9d0b7dc4c4bf Reviewed-on: https://gerrit.libreoffice.org/12470 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml index f9e095c..c6aa88c 100644 --- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml @@ -38,7 +38,7 @@ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:AdvancedMode toolbar:style=radio dropdown/ toolbar:toolbaritem xlink:href=.uno:Mirror toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:TransformDialog toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:TransformDialog/ toolbar:toolbaritem xlink:href=.uno:ObjectAlign toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:ObjectPosition toolbar:style=dropdown/ /toolbar:toolbar diff --git a/sd/uiconfig/sdraw/toolbar/standardbar.xml b/sd/uiconfig/sdraw/toolbar/standardbar.xml index 626da07..601c7f9 100644 --- a/sd/uiconfig/sdraw/toolbar/standardbar.xml +++ b/sd/uiconfig/sdraw/toolbar/standardbar.xml @@ -23,7 +23,7 @@ toolbar:toolbaritem xlink:href=.uno:NewDoc toolbar:visible=false toolbar:helpid=5500/ toolbar:toolbaritem xlink:href=.uno:Open toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:Save toolbar:helpid=5505/ - toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:visible=false toolbar:helpid=5502/ + toolbar:toolbaritem xlink:href=.uno:SaveAs toolbar:helpid=5502/ toolbar:toolbaritem xlink:href=.uno:SendMail toolbar:visible=false toolbar:helpid=5331/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:EditDoc toolbar:helpid=6312 toolbar:visible=false/ @@ -43,12 +43,16 @@ toolbar:toolbaritem xlink:href=.uno:SpellDialog toolbar:helpid=20622/ toolbar:toolbaritem xlink:href=.uno:SpellOnline toolbar:visible=false toolbar:helpid=12021/ toolbar:toolbaritem xlink:href=.uno:ZoomMode/ + toolbar:toolbaritem xlink:href=.uno:ZoomObjects/ toolbar:toolbaritem xlink:href=.uno:ZoomToolBox toolbar:visible=false toolbar:helpid=10096/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ toolbar:toolbaritem xlink:href=.uno:InsertObjectChart toolbar:helpid=10140/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:GridVisible/ + toolbar:toolbaritem xlink:href=.uno:HelplinesMove/ + toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Window3D toolbar:style=auto toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:HelpIndex toolbar:visible=false/ diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml index afbff6a..bfac926 100644 --- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml @@ -21,11 +21,15 @@ toolbar:toolbaritem xlink:href=.uno:CharFontName toolbar:helpid=10007/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:FontHeight toolbar:helpid=10015/ + toolbar:toolbaritem xlink:href=.uno:Grow/ + toolbar:toolbaritem xlink:href=.uno:Shrink/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:Bold toolbar:helpid=10009/ toolbar:toolbaritem xlink:href=.uno:Italic toolbar:helpid=10008/ toolbar:toolbaritem xlink:href=.uno:Underline toolbar:helpid=10014/ toolbar:toolbaritem xlink:href=.uno:Shadowed toolbar:helpid=10010/ + toolbar:toolbaritem xlink:href=.uno:OutlineFont toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:Color toolbar:helpid=10017/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:LeftPara toolbar:helpid=10028/ toolbar:toolbaritem xlink:href=.uno:CenterPara toolbar:helpid=10030/ @@ -35,16 +39,16 @@ toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:helpid=10950/ toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:helpid=10951/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:LineSpacing/ + toolbar:toolbaritem xlink:href=.uno:SpacePara1 toolbar:visible=false toolbar:helpid=10034/ + toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:visible=false toolbar:helpid=10035/ + toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:visible=false toolbar:helpid=10036/ + toolbar:toolbarseparator/ toolbar:toolbaritem
[Libreoffice-commits] core.git: framework/source svx/source sw/source
framework/source/classes/resource.src |2 +-
svx/source/stbctrls/stbctrls.src | 12 ++--
sw/source/uibase/utlui/statusbar.src | 10 +-
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 62155d261117f1f99c9e494b17286012d9e6908e
Author: Yousuf Philips philip...@hotmail.com
Date: Sat Nov 15 04:22:50 2014 +0400
fdo#82708 editing statusbar tooltip texts
Change-Id: I3ac2e46f89d5c1e4decb6d6aaf8487663e904a43
Reviewed-on: https://gerrit.libreoffice.org/12433
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/framework/source/classes/resource.src
b/framework/source/classes/resource.src
index 8411220..c54eaa3 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -192,7 +192,7 @@ String STR_SET_LANGUAGE_FOR_ALL_TEXT
String STR_LANGSTATUS_HINT
{
-Text [ en-US ] = Text Language. Right-click to set selection or paragraph
language ;
+Text [ en-US ] = Text Language. Right-click to set character or paragraph
language ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 3a997bc..3ad69cf 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -24,11 +24,11 @@
// Strings ---
String RID_SVXSTR_INSERT_HELPTEXT
{
-Text [ en-US ] = Insert mode. ;
+Text [ en-US ] = Insert mode. Click to change to overwrite mode. ;
};
String RID_SVXSTR_OVERWRITE_HELPTEXT
{
-Text [ en-US ] = Overwrite mode, text will be overwritten when typing. ;
+Text [ en-US ] = Overwrite mode. Click to change to insert mode. ;
};
String RID_SVXSTR_OVERWRITE_TEXT
{
@@ -123,7 +123,7 @@ String RID_SVXSTR_FIT_SLIDE
String RID_SVXSTR_ZOOMTOOL_HINT
{
-Text [ en-US ] = Zoom level. Click for dialog box and right-click for
zoom list;
+Text [ en-US ] = Zoom level. Right-click to change zoom level or click to
open Zoom dialog.;
};
String RID_SVXSTR_ZOOM
@@ -133,12 +133,12 @@ String RID_SVXSTR_ZOOM
String RID_SVXSTR_ZOOM_IN
{
-Text [ en-US ] = Zoom in;
+Text [ en-US ] = Zoom In;
};
String RID_SVXSTR_ZOOM_OUT
{
-Text [ en-US ] = Zoom out;
+Text [ en-US ] = Zoom Out;
};
// PopupMenu -
@@ -162,7 +162,7 @@ Menu RID_SVXMNU_ZOOM
{
Identifier = ZOOM_OPTIMAL ;
HelpId = HID_MNU_ZOOM_OPTIMAL ;
-Text [ en-US ] = Optimal ;
+Text [ en-US ] = Optimal View ;
};
MenuItem
{
diff --git a/sw/source/uibase/utlui/statusbar.src
b/sw/source/uibase/utlui/statusbar.src
index dcb5bba..493beb3 100644
--- a/sw/source/uibase/utlui/statusbar.src
+++ b/sw/source/uibase/utlui/statusbar.src
@@ -11,11 +11,11 @@
String STR_WORDCOUNT_HINT
{
-Text [ en-US ] = Word and character count. Click for more extensive
stats;
+Text [ en-US ] = Word and character count. Click to open Word Count
dialog.;
};
String STR_VIEWLAYOUT_ONE
{
-Text [ en-US ] = Single page view;
+Text [ en-US ] = Single-page view;
};
String STR_VIEWLAYOUT_TWO
@@ -29,15 +29,15 @@ String STR_VIEWLAYOUT_BOOK
};
String STR_BOOKCTRL_HINT
{
-Text [ en-US ] = Page number/Total pages. Click to show Navigator;
+Text [ en-US ] = Page number in document. Click to open Navigator
window.;
};
String STR_BOOKCTRL_HINT_EXTENDED
{
-Text [ en-US ] = Document page number/Total pages (Print page number).
Click to show Navigator;
+Text [ en-US ] = Page number in document (Page number on printed
document). Click to open Navigator window.;
};
String STR_TMPLCTRL_HINT
{
-Text [ en-US ] = Page Style. Right-click to change style and click to
modify style;
+Text [ en-US ] = Page Style. Right-click to change style or click to open
Style dialog.;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/toolbar/previewobjectbar.xml | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) New commits: commit 747ed5793cbcf7b7a98b33ba4001d0fe20812921 Author: Yousuf Philips philip...@hotmail.com Date: Wed Nov 12 21:30:47 2014 +0400 fdo#80838 rearranging the buttons in the toolbar Change-Id: I4452374d372ff49533cea4d07fc79c3adb730f84 Reviewed-on: https://gerrit.libreoffice.org/12390 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index e140b40..47479e5 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -18,25 +18,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- toolbar:toolbar xmlns:toolbar=http://openoffice.org/2001/toolbar; xmlns:xlink=http://www.w3.org/1999/xlink; - toolbar:toolbaritem xlink:href=.uno:PageUp toolbar:helpid=20937/ - toolbar:toolbaritem xlink:href=.uno:PageDown toolbar:helpid=20938/ - toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:GoToStartOfDoc toolbar:helpid=20907/ - toolbar:toolbaritem xlink:href=.uno:GoToEndOfDoc toolbar:helpid=20908/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ShowSinglePage/ toolbar:toolbaritem xlink:href=.uno:ShowTwoPages toolbar:helpid=21251/ - toolbar:toolbaritem xlink:href=.uno:ShowMultiplePages toolbar:helpid=21252/ toolbar:toolbaritem xlink:href=.uno:ShowBookview/ + toolbar:toolbaritem xlink:href=.uno:ShowMultiplePages toolbar:helpid=21252/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:ZoomPlus toolbar:helpid=10097/ + toolbar:toolbaritem xlink:href=.uno:GoToStartOfDoc toolbar:helpid=20907/ + toolbar:toolbaritem xlink:href=.uno:PageUp toolbar:helpid=20937/ + toolbar:toolbaritem xlink:href=.uno:PageDown toolbar:helpid=20938/ + toolbar:toolbaritem xlink:href=.uno:GoToEndOfDoc toolbar:helpid=20908/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:ZoomPlus toolbar:helpid=10097/ toolbar:toolbaritem xlink:href=.uno:PreviewZoom toolbar:helpid=53071/ - toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ZoomMinus toolbar:helpid=10098/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:FullScreen toolbar:helpid=5627/ toolbar:toolbaritem xlink:href=.uno:Print toolbar:helpid=21253/ + toolbar:toolbaritem xlink:href=.uno:FullScreen toolbar:helpid=5627/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ClosePreview toolbar:style=image text toolbar:helpid=5325/ /toolbar:toolbar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy officecfg/registry sd/uiconfig
icon-themes/galaxy/cmd/lc_distributeselection.png|binary icon-themes/galaxy/cmd/sc_distributeselection.png|binary officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++ sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml |1 + sd/uiconfig/simpress/toolbar/drawingobjectbar.xml|1 + 5 files changed, 5 insertions(+) New commits: commit d72e987c545a56284047b5a70deea1bf99e55062 Author: Yousuf Philips philip...@hotmail.com Date: Sun Nov 16 09:55:23 2014 +0400 fdo#84909 add distribution selection to drawing toolbar Change-Id: I26ee0cb8529b0a1bea354d2ac003cfc1efb9ced3 Reviewed-on: https://gerrit.libreoffice.org/12471 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/galaxy/cmd/lc_distributeselection.png b/icon-themes/galaxy/cmd/lc_distributeselection.png new file mode 100644 index 000..d7470f1 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_distributeselection.png differ diff --git a/icon-themes/galaxy/cmd/sc_distributeselection.png b/icon-themes/galaxy/cmd/sc_distributeselection.png new file mode 100644 index 000..8d3030a Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_distributeselection.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index c94a35d..8b15921 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3353,6 +3353,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-US~Distribution.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:ParagraphDialog oor:op=replace prop oor:name=Label oor:type=xs:string diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml index c6aa88c..ea0b79c 100644 --- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml @@ -41,4 +41,5 @@ toolbar:toolbaritem xlink:href=.uno:TransformDialog/ toolbar:toolbaritem xlink:href=.uno:ObjectAlign toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:ObjectPosition toolbar:style=dropdown/ + toolbar:toolbaritem xlink:href=.uno:DistributeSelection/ /toolbar:toolbar diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml index 4049f90..79a037f 100644 --- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml @@ -41,6 +41,7 @@ toolbar:toolbaritem xlink:href=.uno:Mirror toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ObjectAlign toolbar:style=dropdown/ toolbar:toolbaritem xlink:href=.uno:ObjectPosition toolbar:style=dropdown/ + toolbar:toolbaritem xlink:href=.uno:DistributeSelection/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:CustomAnimation toolbar:style=auto toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:AnimationEffects/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 18db9ba9891df7c909dc1f67bbfe9ef25620f816 Author: Yousuf Philips philip...@hotmail.com Date: Thu Nov 13 01:36:13 2014 +0400 revert change made in fdo#86040 as agreed on by design team Change-Id: Ibdf8ad1518751a1c811d4b8960a0dc66fb906910 Reviewed-on: https://gerrit.libreoffice.org/12395 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index b66ab22..0b3cf4d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -43,7 +43,7 @@ node oor:name=GalleryDeck oor:op=replace prop oor:name=Title oor:type=xs:string - value xml:lang=en-USClip Art Gallery/value + value xml:lang=en-USGallery/value /prop prop oor:name=Id oor:type=xs:string valueGalleryDeck/value @@ -373,7 +373,7 @@ node oor:name=GalleryPanel oor:op=replace prop oor:name=Title oor:type=xs:string - value xml:lang=en-USClip Art Gallery/value + value xml:lang=en-USGallery/value /prop prop oor:name=TitleBarIsOptional oor:type=xs:boolean valuetrue/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: codemaker/source idlc/inc include/salhelper sal/osl sal/qa sal/rtl sal/textenc store/source vcl/generic vcl/inc
codemaker/source/codemaker/unotype.cxx|1 -
codemaker/source/cppumaker/dumputils.cxx |1 -
idlc/inc/idlc/aststructinstance.hxx |1 -
include/salhelper/simplereferenceobject.hxx |1 -
sal/osl/unx/file_path_helper.hxx |1 -
sal/qa/osl/process/osl_process_child.cxx |2 --
sal/rtl/digest.cxx|1 -
sal/rtl/hash.hxx |1 -
sal/rtl/strimp.hxx|1 -
sal/textenc/context.hxx |1 -
sal/textenc/convertisciidevangari.cxx |1 +
sal/textenc/convertiso2022cn.cxx |1 -
sal/textenc/convertiso2022jp.cxx |1 -
sal/textenc/convertiso2022kr.cxx |1 -
sal/textenc/convertsinglebytetobmpunicode.cxx |1 -
sal/textenc/convertsinglebytetobmpunicode.hxx |1 -
store/source/object.cxx |4
store/source/object.hxx |1 -
vcl/generic/fontmanager/parseAFM.cxx |3 ---
vcl/generic/fontmanager/parseAFM.hxx |1 -
vcl/inc/bmpfast.hxx |2 --
21 files changed, 1 insertion(+), 27 deletions(-)
New commits:
commit 2c1bf30bda6b914611134317b652402e4488fd03
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Fri Nov 14 12:07:01 2014 +0100
More iwyu suggested headers removal
Signed-off-by: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com, undid one remove
that was
detrimental to loplugin:unreffun
Change-Id: I18d8252084d828f94ef7a954e1dbfb45743d7970
diff --git a/codemaker/source/codemaker/unotype.cxx
b/codemaker/source/codemaker/unotype.cxx
index 5b76a04..38de2a7 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -24,7 +24,6 @@
#include rtl/string.hxx
#include sal/types.h
-#include vector
OString codemaker::UnoType::decompose(
OString const type, sal_Int32 * rank,
diff --git a/codemaker/source/cppumaker/dumputils.cxx
b/codemaker/source/cppumaker/dumputils.cxx
index 4c82824..8f720f6 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -21,7 +21,6 @@
#include dumputils.hxx
#include codemaker/global.hxx
-#include codemaker/commoncpp.hxx
#include rtl/ustring.hxx
#include sal/types.h
diff --git a/idlc/inc/idlc/aststructinstance.hxx
b/idlc/inc/idlc/aststructinstance.hxx
index ebc7f6c..706d6cb 100644
--- a/idlc/inc/idlc/aststructinstance.hxx
+++ b/idlc/inc/idlc/aststructinstance.hxx
@@ -23,7 +23,6 @@
#include idlc/asttype.hxx
#include idlc/idlctypes.hxx
-class AstDeclaration;
class AstScope;
class AstStructInstance: public AstType {
diff --git a/include/salhelper/simplereferenceobject.hxx
b/include/salhelper/simplereferenceobject.hxx
index b150fb2..67626b1 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX
#include osl/interlck.h
-#include sal/types.h
#include salhelper/salhelperdllapi.h
#include cstddef
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 6b1418d..6396ddbe 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SAL_OSL_UNX_FILE_PATH_HELPER_HXX
#include file_path_helper.h
-
#include rtl/ustring.hxx
namespace osl
diff --git a/sal/qa/osl/process/osl_process_child.cxx
b/sal/qa/osl/process/osl_process_child.cxx
index ee5ecf5..feabd1d 100644
--- a/sal/qa/osl/process/osl_process_child.cxx
+++ b/sal/qa/osl/process/osl_process_child.cxx
@@ -29,11 +29,9 @@
#include stdio.h
#include stdlib.h
-#include iostream
#include fstream
#include string.h
-#include rtl/ustring.hxx
#ifdef UNX
#if defined( MACOSX )
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index 75cf209..b35700e 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -20,7 +20,6 @@
#include string.h
#include sal/types.h
-#include sal/macros.h
#include osl/endian.h
#include rtl/alloc.h
#include rtl/digest.h
diff --git a/sal/rtl/hash.hxx b/sal/rtl/hash.hxx
index 5997118..9f80448 100644
--- a/sal/rtl/hash.hxx
+++ b/sal/rtl/hash.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SAL_RTL_HASH_HXX
#define INCLUDED_SAL_RTL_HASH_HXX
-#include sal/types.h
#include rtl/ustring.h
/* These functions are not multi-thread safe: */
diff --git a/sal/rtl/strimp.hxx b/sal/rtl/strimp.hxx
index d737077..b7589cd 100644
--- a/sal/rtl/strimp.hxx
+++ b/sal/rtl/strimp.hxx
@@ -25,7 +25,6 @@
#include sys/sdt.h
#endif
-#include osl/interlck.h
#include sal/types.h
diff --git a/sal/textenc/context.hxx b/sal/textenc/context.hxx
index 1f8eb48..83b4d1e 100644
--- a/sal/textenc/context.hxx
+++ b/sal/textenc/context.hxx
@@ -20,7 +20,6 @@
#ifndef
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #46 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e5a221f4e530873b19df1b280bb19124b8d8c68 fdo#75757 remove inheritance from std::vector It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/textdat2.hxx | 19 ++---
vcl/source/edit/textdata.cxx | 30 +++---
vcl/source/edit/texteng.cxx | 87 ++-
vcl/source/edit/textview.cxx | 34
4 files changed, 75 insertions(+), 95 deletions(-)
New commits:
commit 9e5a221f4e530873b19df1b280bb19124b8d8c68
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 09:47:07 2014 +0100
fdo#75757 remove inheritance from std::vector
Removing TextLines class by the way
Change-Id: Ic491af976d61cac8e4b37857ff3a76570611d90d
Reviewed-on: https://gerrit.libreoffice.org/12474
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index b5e2118..2834f08 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -24,7 +24,7 @@
#include vcl/virdev.hxx
#include vcl/cursor.hxx
-#include vector
+#include boost/ptr_container/ptr_vector.hpp
class TextNode;
class TextView;
@@ -162,15 +162,6 @@ public:
inline bool operator != ( const TextLine rLine ) const;
};
-class TextLines : public std::vectorTextLine* {
-public:
-~TextLines()
-{
-for( iterator it = begin(); it != end(); ++it )
-delete *it;
-}
-};
-
inline bool TextLine::operator == ( const TextLine rLine ) const
{
return (( mnStart == rLine.mnStart )
@@ -189,15 +180,15 @@ class TEParaPortion
private:
TextNode* mpNode;
-TextLines maLines;
+boost::ptr_vectorTextLine maLines;
TETextPortionList maTextPortions;
std::vectorTEWritingDirectionInfo maWritingDirectionInfos;
-sal_uInt16 mnInvalidPosStart;
+sal_uInt16 mnInvalidPosStart;
short mnInvalidDiff;
boolmbInvalid;
-boolmbSimple; // nur lineares Tippen
+boolmbSimple; // only type linearly
TEParaPortion( const TEParaPortion ) {;}
@@ -217,7 +208,7 @@ public:
short GetInvalidDiff() const { return mnInvalidDiff; }
TextNode* GetNode() const { return mpNode; }
-TextLines GetLines() { return maLines; }
+boost::ptr_vectorTextLine GetLines() { return maLines; }
TETextPortionList GetTextPortions() { return maTextPortions; }
std::vectorTEWritingDirectionInfo GetWritingDirectionInfos() { return
maWritingDirectionInfos; }
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index e6bebd2..a6bd6ac 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -163,16 +163,16 @@ sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16
nChar, bool bInclEnd )
{
for ( sal_uInt16 nLine = 0; nLine maLines.size(); nLine++ )
{
-TextLine* pLine = maLines[ nLine ];
-if ( ( bInclEnd ( pLine-GetEnd() = nChar ) ) ||
- ( pLine-GetEnd() nChar ) )
+TextLine pLine = maLines[ nLine ];
+if ( ( bInclEnd ( pLine.GetEnd() = nChar ) ) ||
+ ( pLine.GetEnd() nChar ) )
{
return nLine;
}
}
// Then it should be at the end of the last line
-OSL_ENSURE(nChar == maLines[maLines.size() - 1]-GetEnd(), wrong Index);
+OSL_ENSURE(nChar == maLines.back().GetEnd(), wrong Index);
OSL_ENSURE(!bInclEnd, Line not found: FindLine);
return ( maLines.size() - 1 );
}
@@ -183,11 +183,11 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine(
sal_uInt16 nLastFormat
DBG_ASSERT( nLines, CorrectPortionNumbersFromLine: Leere Portion? );
if ( nLastFormattedLine ( nLines - 1 ) )
{
-const TextLine* pLastFormatted = maLines[ nLastFormattedLine ];
-const TextLine* pUnformatted = maLines[ nLastFormattedLine+1 ];
-short nPortionDiff = pUnformatted-GetStartPortion() -
pLastFormatted-GetEndPortion();
-short nTextDiff = pUnformatted-GetStart() - pLastFormatted-GetEnd();
-nTextDiff++;// LastFormatted-GetEnd() was inclusive = subtracted
one too much!
+const TextLine pLastFormatted = maLines[ nLastFormattedLine ];
+const TextLine pUnformatted = maLines[ nLastFormattedLine+1 ];
+short nPortionDiff = pUnformatted.GetStartPortion() -
pLastFormatted.GetEndPortion();
+short nTextDiff = pUnformatted.GetStart() - pLastFormatted.GetEnd();
+nTextDiff++;// LastFormatted.GetEnd() was inclusive = subtracted
one too much!
// The first unformated one has to start exactly one portion past the
last
// formated one.
@@ -198,15 +198,15 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine(
sal_uInt16 nLastFormat
{
for ( sal_uInt16 nL = nLastFormattedLine+1; nL nLines; nL++ )
{
-
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/cmd/lc_deletecolumns-lc_insertcolumns.xcf.bz2 |binary icon-themes/tango/cmd/lc_deletecolumns.png |binary icon-themes/tango/cmd/lc_deleterows-lc_insertrows.xcf.bz2 |binary icon-themes/tango/cmd/lc_deleterows.png |binary icon-themes/tango/cmd/lc_insertcolumns.png |binary icon-themes/tango/cmd/lc_insertrows.png |binary icon-themes/tango/cmd/lc_numberformatdecdecimals.png|binary icon-themes/tango/cmd/lc_numberformatdecdecimals.xcf.bz2|binary icon-themes/tango/cmd/lc_numberformatincdecimals.png|binary icon-themes/tango/cmd/lc_numberformatincdecimals.xcf.bz2|binary icon-themes/tango/cmd/lc_numberformatpercent.png|binary icon-themes/tango/cmd/lc_numberformatpercent.xcf.bz2|binary icon-themes/tango/cmd/lc_sortdescending.png |binary icon-themes/tango/cmd/lc_sortdown.png |binary icon-themes/tango/cmd/lc_wraptext-alt.png |binary icon-themes/tango/cmd/lc_wraptext.png |binary icon-themes/tango/cmd/sc_wraptext.png |binary 17 files changed New commits: commit 4326108aa53838701f81600b3a979fee2b8ff1c2 Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 14 06:39:35 2014 +0400 TANGO: improve existing icons used in calc's toolbar and provide sources Change-Id: I03ea3037f40bd1a0c30dff456df3fe75978c44bd Reviewed-on: https://gerrit.libreoffice.org/12418 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/icon-themes/tango/cmd/lc_deletecolumns-lc_insertcolumns.xcf.bz2 b/icon-themes/tango/cmd/lc_deletecolumns-lc_insertcolumns.xcf.bz2 new file mode 100644 index 000..fd9cd92 Binary files /dev/null and b/icon-themes/tango/cmd/lc_deletecolumns-lc_insertcolumns.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_deletecolumns.png b/icon-themes/tango/cmd/lc_deletecolumns.png index 7608873..1fad59e 100644 Binary files a/icon-themes/tango/cmd/lc_deletecolumns.png and b/icon-themes/tango/cmd/lc_deletecolumns.png differ diff --git a/icon-themes/tango/cmd/lc_deleterows-lc_insertrows.xcf.bz2 b/icon-themes/tango/cmd/lc_deleterows-lc_insertrows.xcf.bz2 new file mode 100644 index 000..31cf09c Binary files /dev/null and b/icon-themes/tango/cmd/lc_deleterows-lc_insertrows.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_deleterows.png b/icon-themes/tango/cmd/lc_deleterows.png index 8024638d..45aa921 100644 Binary files a/icon-themes/tango/cmd/lc_deleterows.png and b/icon-themes/tango/cmd/lc_deleterows.png differ diff --git a/icon-themes/tango/cmd/lc_insertcolumns.png b/icon-themes/tango/cmd/lc_insertcolumns.png index 37e990e..5185000 100644 Binary files a/icon-themes/tango/cmd/lc_insertcolumns.png and b/icon-themes/tango/cmd/lc_insertcolumns.png differ diff --git a/icon-themes/tango/cmd/lc_insertrows.png b/icon-themes/tango/cmd/lc_insertrows.png index 2d20747..bb38916 100644 Binary files a/icon-themes/tango/cmd/lc_insertrows.png and b/icon-themes/tango/cmd/lc_insertrows.png differ diff --git a/icon-themes/tango/cmd/lc_numberformatdecdecimals.png b/icon-themes/tango/cmd/lc_numberformatdecdecimals.png new file mode 100644 index 000..658383c Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatdecdecimals.png differ diff --git a/icon-themes/tango/cmd/lc_numberformatdecdecimals.xcf.bz2 b/icon-themes/tango/cmd/lc_numberformatdecdecimals.xcf.bz2 new file mode 100644 index 000..4be2abf Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatdecdecimals.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_numberformatincdecimals.png b/icon-themes/tango/cmd/lc_numberformatincdecimals.png new file mode 100644 index 000..b903ebe Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatincdecimals.png differ diff --git a/icon-themes/tango/cmd/lc_numberformatincdecimals.xcf.bz2 b/icon-themes/tango/cmd/lc_numberformatincdecimals.xcf.bz2 new file mode 100644 index 000..3633d9e Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatincdecimals.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_numberformatpercent.png b/icon-themes/tango/cmd/lc_numberformatpercent.png new file mode 100644 index 000..bf0c435 Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatpercent.png differ diff --git a/icon-themes/tango/cmd/lc_numberformatpercent.xcf.bz2 b/icon-themes/tango/cmd/lc_numberformatpercent.xcf.bz2 new file mode 100644 index 000..4cb9930 Binary files /dev/null and b/icon-themes/tango/cmd/lc_numberformatpercent.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_sortdescending.png b/icon-themes/tango/cmd/lc_sortdescending.png index 71fea35..c2fc959 100644 Binary files a/icon-themes/tango/cmd/lc_sortdescending.png and
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/toolbar/formatobjectbar.xml |2 +- sc/uiconfig/scalc/toolbar/standardbar.xml |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 124f5f0d14e1609c4a70d0573f10b669506c1d6f Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 14 04:49:55 2014 +0400 fdo#85594 moving merge cells to standard toolbar Change-Id: I73b199458e23ffafc269c9683ca30ec87b41f770 Reviewed-on: https://gerrit.libreoffice.org/12417 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index 77e8ecd..d6d7c2a 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -41,7 +41,7 @@ toolbar:toolbaritem xlink:href=.uno:AlignRight toolbar:style=radio auto/ toolbar:toolbaritem xlink:href=.uno:AlignBlock toolbar:style=radio auto toolbar:visible=false/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells/ + toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:WrapText/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ParaLeftToRight toolbar:style=radio/ diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml index 23b6927..7cce2b2 100644 --- a/sc/uiconfig/scalc/toolbar/standardbar.xml +++ b/sc/uiconfig/scalc/toolbar/standardbar.xml @@ -46,6 +46,7 @@ toolbar:toolbaritem xlink:href=.uno:SearchDialog/ toolbar:toolbaritem xlink:href=.uno:Navigator toolbar:visible=false/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:ToggleMergeCells/ toolbar:toolbaritem xlink:href=.uno:InsertRows/ toolbar:toolbaritem xlink:href=.uno:DeleteRows/ toolbar:toolbaritem xlink:href=.uno:InsertColumns/ @@ -55,12 +56,12 @@ toolbar:toolbaritem xlink:href=.uno:SortAscending/ toolbar:toolbaritem xlink:href=.uno:SortDescending/ toolbar:toolbaritem xlink:href=.uno:DataFilterAutoFilter/ - toolbar:toolbaritem xlink:href=.uno:DataDataPilotRun toolbar:visible=false/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:InsertGraphic/ toolbar:toolbaritem xlink:href=.uno:InsertObjectChart/ toolbar:toolbaritem xlink:href=.uno:Gallery toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog/ + toolbar:toolbaritem xlink:href=.uno:DataDataPilotRun toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:InsertAnnotation toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:InsertDraw toolbar:visible=false/ toolbar:toolbarseparator/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml |4 ++-- sw/uiconfig/swriter/toolbar/textobjectbar.xml | 13 - 2 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 2a29fa312cb71616ca90d71eb61c80d54e1cf086 Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 14 07:36:19 2014 +0400 fdo#81475 moving alignment buttons back to original place Change-Id: I10f9d4423ae039f304ff1e29e98eda21c961a93e Reviewed-on: https://gerrit.libreoffice.org/12420 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index 4b84923..0f4ec8e 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -61,11 +61,11 @@ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog toolbar:helpid=5678/ toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:helpid=20328/ toolbar:toolbaritem xlink:href=.uno:InsertFieldCtrl toolbar:helpid=52824/ - toolbar:toolbaritem xlink:href=.uno:InsertAnnotation toolbar:helpid=20329/ toolbar:toolbaritem xlink:href=.uno:InsertDraw toolbar:helpid=10244/ + toolbar:toolbaritem xlink:href=.uno:InsertAnnotation toolbar:helpid=20329/ toolbar:toolbaritem xlink:href=.uno:DrawText toolbar:helpid=10253/ toolbar:toolbaritem xlink:href=.uno:Line toolbar:visible=false toolbar:helpid=10102/ - toolbar:toolbaritem xlink:href=.uno:BasicShapes toolbar:visible=false toolbar:helpid=11002/ + toolbar:toolbaritem xlink:href=.uno:BasicShapes toolbar:helpid=11002/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:ViewDataSourceBrowser toolbar:visible=false toolbar:helpid=6660/ toolbar:toolbaritem xlink:href=.uno:Zoom toolbar:visible=false/ diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml b/sw/uiconfig/swriter/toolbar/textobjectbar.xml index a254d59..d5adc59 100644 --- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml @@ -43,11 +43,6 @@ toolbar:toolbaritem xlink:href=.uno:BackColor/ toolbar:toolbaritem xlink:href=.uno:BackgroundColor toolbar:visible=false/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:DefaultBullet/ - toolbar:toolbaritem xlink:href=.uno:DefaultNumbering/ - toolbar:toolbaritem xlink:href=.uno:IncrementIndent/ - toolbar:toolbaritem xlink:href=.uno:DecrementIndent/ - toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:LeftPara toolbar:style=radio/ toolbar:toolbaritem xlink:href=.uno:CenterPara toolbar:style=radio/ toolbar:toolbaritem xlink:href=.uno:RightPara toolbar:style=radio/ @@ -57,6 +52,14 @@ toolbar:toolbaritem xlink:href=.uno:ParaRightToLeft toolbar:style=radio/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:LineSpacing/ + toolbar:toolbaritem xlink:href=.uno:SpacePara1 toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:SpacePara15 toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:SpacePara2 toolbar:visible=false/ + toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:DefaultBullet/ + toolbar:toolbaritem xlink:href=.uno:DefaultNumbering/ + toolbar:toolbaritem xlink:href=.uno:IncrementIndent/ + toolbar:toolbaritem xlink:href=.uno:DecrementIndent/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:FontDialog toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ParagraphDialog toolbar:visible=false/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/menubar/menubar.xml| 22 +++--- sd/uiconfig/simpress/menubar/menubar.xml | 30 +++--- 2 files changed, 26 insertions(+), 26 deletions(-) New commits: commit 7a0b2698b4f92cbc64869e4ff34bcb2fad9e1c98 Author: Yousuf Philips philip...@hotmail.com Date: Fri Nov 14 08:00:50 2014 +0400 fdo#86209 reorganized the view menu in impress and draw Change-Id: If37554f66fd329818437863447222a5667740a0c Reviewed-on: https://gerrit.libreoffice.org/12421 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index caa9662..6ecab9e 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -101,19 +101,12 @@ menu:menuitem menu:id=.uno:PageMode menu:style=radio/ menu:menuitem menu:id=.uno:MasterPage menu:style=radio/ menu:menuseparator/ - menu:menu menu:id=.uno:DisplayQualityMenu -menu:menupopup - menu:menuitem menu:id=.uno:OutputQualityColor menu:style=radio/ - menu:menuitem menu:id=.uno:OutputQualityGrayscale menu:style=radio/ - menu:menuitem menu:id=.uno:OutputQualityBlackWhite menu:style=radio/ -/menu:menupopup - /menu:menu - menu:menuseparator/ - menu:menuitem menu:id=.uno:LeftPaneDraw/ menu:menuitem menu:id=.uno:AvailableToolbars/ menu:menuitem menu:id=.uno:StatusBarVisible/ menu:menuitem menu:id=.uno:ShowImeStatusWindow/ menu:menuitem menu:id=.uno:ShowRuler/ + menu:menuitem menu:id=.uno:LeftPaneDraw/ + menu:menuseparator/ menu:menu menu:id=.uno:GridMenu menu:menupopup menu:menuitem menu:id=.uno:GridVisible/ @@ -128,11 +121,18 @@ menu:menuitem menu:id=.uno:HelplinesFront/ /menu:menupopup /menu:menu + menu:menu menu:id=.uno:DisplayQualityMenu +menu:menupopup + menu:menuitem menu:id=.uno:OutputQualityColor menu:style=radio/ + menu:menuitem menu:id=.uno:OutputQualityGrayscale menu:style=radio/ + menu:menuitem menu:id=.uno:OutputQualityBlackWhite menu:style=radio/ +/menu:menupopup + /menu:menu menu:menuitem menu:id=.uno:ShowAnnotations/ menu:menuseparator/ - menu:menuitem menu:id=.uno:Navigator/ - menu:menuitem menu:id=.uno:Gallery/ menu:menuitem menu:id=.uno:Sidebar/ + menu:menuitem menu:id=.uno:Gallery/ + menu:menuitem menu:id=.uno:Navigator/ menu:menuseparator/ menu:menu menu:id=.uno:ZoomMenu menu:menupopup diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 7416134..ee0be14 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -101,11 +101,10 @@ menu:menupopup menu:menuitem menu:id=.uno:NormalMultiPaneGUI menu:style=radio/ menu:menuitem menu:id=.uno:OutlineMode menu:style=radio/ -menu:menuitem menu:id=.uno:DiaMode menu:style=radio/ -menu:menuitem menu:id=.uno:Presentation menu:style=radio/ menu:menuitem menu:id=.uno:NotesMode menu:style=radio/ menu:menuitem menu:id=.uno:HandoutMode menu:style=radio/ - menu:menuseparator/ +menu:menuitem menu:id=.uno:DiaMode menu:style=radio/ +menu:menuseparator/ menu:menu menu:id=.uno:MasterPageMenu menu:menupopup menu:menuitem menu:id=.uno:SlideMasterPage menu:style=radio/ @@ -114,20 +113,13 @@ menu:menuitem menu:id=.uno:MasterLayouts/ /menu:menupopup /menu:menu -menu:menu menu:id=.uno:DisplayQualityMenu -menu:menupopup -menu:menuitem menu:id=.uno:OutputQualityColor menu:style=radio/ -menu:menuitem menu:id=.uno:OutputQualityGrayscale menu:style=radio/ -menu:menuitem menu:id=.uno:OutputQualityBlackWhite menu:style=radio/ -/menu:menupopup -/menu:menu menu:menuseparator/ - menu:menuitem menu:id=.uno:Sidebar/ - menu:menuitem menu:id=.uno:LeftPaneImpress/ menu:menuitem menu:id=.uno:AvailableToolbars/ menu:menuitem menu:id=.uno:StatusBarVisible/ menu:menuitem menu:id=.uno:ShowImeStatusWindow/ menu:menuitem menu:id=.uno:ShowRuler/ +menu:menuitem menu:id=.uno:LeftPaneImpress/ +menu:menuseparator/ menu:menu menu:id=.uno:GridMenu menu:menupopup menu:menuitem menu:id=.uno:GridVisible/ @@ -142,10 +134,18 @@ menu:menuitem menu:id=.uno:HelplinesFront/ /menu:menupopup /menu:menu - menu:menuitem
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 26 ++ sc/uiconfig/scalc/menubar/menubar.xml | 11 2 files changed, 28 insertions(+), 9 deletions(-) New commits: commit 3ec607fbb2bc98924126a0098fbef88c87305ddf Author: Yousuf Philips philip...@hotmail.com Date: Tue Nov 11 22:17:23 2014 +0400 fdo#86086 addition of number format submenu and simplifying items Change-Id: Ic65cb86872241b0b9425e65883a75b1e7382522e Reviewed-on: https://gerrit.libreoffice.org/12367 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 03d2b84..7c8766a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1585,9 +1585,17 @@ value1/value /prop /node + node oor:name=.uno:NumberFormatMenu oor:op=replace +prop oor:name=Label oor:type=xs:string + value xml:lang=en-USNumber Format/value +/prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop + /node node oor:name=.uno:NumberFormatCurrency oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Currency/value + value xml:lang=en-USCurrency/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1595,7 +1603,7 @@ /node node oor:name=.uno:NumberFormatPercent oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Percent/value + value xml:lang=en-USPercent/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1603,7 +1611,7 @@ /node node oor:name=.uno:NumberFormatStandard oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Standard/value + value xml:lang=en-USGeneral/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1611,7 +1619,7 @@ /node node oor:name=.uno:NumberFormatDate oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format : Date/value + value xml:lang=en-USDate/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1619,7 +1627,7 @@ /node node oor:name=.uno:NumberFormatDecimal oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Decimal/value + value xml:lang=en-USNumber/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1627,7 +1635,7 @@ /node node oor:name=.uno:NumberFormatScientific oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Exponential/value + value xml:lang=en-USScientific/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1635,12 +1643,12 @@ /node node oor:name=.uno:NumberFormatTime oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Time/value + value xml:lang=en-USTime/value /prop /node node oor:name=.uno:NumberFormatIncDecimals oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Add Decimal Place/value + value xml:lang=en-USAdd Decimal Place/value /prop prop oor:name=Properties oor:type=xs:int value1/value @@ -1648,7 +1656,7 @@ /node node oor:name=.uno:NumberFormatDecDecimals oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USNumber Format: Delete Decimal Place/value + value xml:lang=en-USDelete Decimal Place/value /prop prop oor:name=Properties oor:type=xs:int value1/value diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 758dba6..02f8779 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -248,6 +248,17 @@ menu:menupopup menu:menuitem menu:id=.uno:ResetAttributes/ menu:menuseparator/ +menu:menu menu:id=.uno:NumberFormatMenu +menu:menupopup +menu:menuitem menu:id=.uno:NumberFormatStandard/ +menu:menuitem menu:id=.uno:NumberFormatDecimal/ +menu:menuitem menu:id=.uno:NumberFormatPercent/ +menu:menuitem menu:id=.uno:NumberFormatCurrency/ +
[Libreoffice-commits] core.git: sc/source sw/source
sc/source/ui/view/cellsh3.cxx |3 --
sc/source/ui/view/tabvwsh3.cxx|3 --
sw/source/uibase/uiview/view2.cxx | 53 --
3 files changed, 59 deletions(-)
New commits:
commit ebabf6d1fa648d62dd63529e9fe64dcb631caee8
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Sat Nov 8 23:02:11 2014 +0100
fdo#86018 Don't do anything when clicked on placeholder in statusbar
No idea why this code got executed in sw, it has no action in sd and sc.
Change-Id: I1d2b4b049f6ae6d117e7bf3464ae993c6951f1dc
Reviewed-on: https://gerrit.libreoffice.org/12314
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index a94de11..a302534 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -101,9 +101,6 @@ void ScCellShell::Execute( SfxRequest rReq )
switch ( nSlot )
{
-case SID_ATTR_SIZE://XXX ???
-break;
-
case SID_COLLABORATION:
#if ENABLE_TELEPATHY
GetViewData()-GetDocShell()-GetCollaboration()-DisplayContacts();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 6b0cb71..312ff21 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -473,9 +473,6 @@ void ScTabViewShell::Execute( SfxRequest rReq )
rReq.Ignore();//XXX wird von SFX erledigt
}
-case SID_ATTR_SIZE://XXX ???
-break;
-
case SID_PRINTPREVIEW:
{
if ( !pThisFrame-GetFrame().IsInPlace() ) // nicht
bei OLE
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 7aca2c1..7dcde99 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1485,26 +1485,6 @@ void SwView::StateStatusLine(SfxItemSet rSet)
rSet.DisableItem( SID_ATTR_ZOOMSLIDER );
}
break;
-case SID_ATTR_POSITION:
-case SID_ATTR_SIZE:
-{
-if( !rShell.IsFrmSelected() !rShell.IsObjSelected() )
-SwBaseShell::_SetFrmMode( FLY_DRAG_END );
-else
-{
-FlyMode eFrameMode = SwBaseShell::GetFrmMode();
-if ( eFrameMode == FLY_DRAG_START || eFrameMode ==
FLY_DRAG )
-{
-if ( nWhich == SID_ATTR_POSITION )
-rSet.Put( SfxPointItem( SID_ATTR_POSITION,
-
rShell.GetAnchorObjDiff()));
-else
-rSet.Put( SvxSizeItem( SID_ATTR_SIZE,
- rShell.GetObjSize()));
-}
-}
-}
-break;
case SID_TABLE_CELL:
if( rShell.IsFrmSelected() || rShell.IsObjSelected() )
@@ -1796,39 +1776,6 @@ void SwView::ExecuteStatusLine(SfxRequest rReq)
}
break;
-case SID_ATTR_SIZE:
-{
-sal_uInt16 nId = FN_INSERT_FIELD;
-if( rSh.IsCrsrInTbl() )
-nId = FN_FORMAT_TABLE_DLG;
-else if( rSh.GetCurTOX() )
-nId = FN_INSERT_MULTI_TOX;
-else if( rSh.GetCurrSection() )
-nId = FN_EDIT_REGION;
-else
-{
-const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCrsrPos();
-if( pNumRule ) // cursor in numbering
-{
-if( pNumRule-IsAutoRule() )
-nId = FN_NUMBER_BULLETS;
-else
-{
-// start dialog of the painter
-nId = 0;
-}
-}
-else if( rSh.IsFrmSelected() )
-nId = FN_FORMAT_FRAME_DLG;
-else if( rSh.IsObjSelected() )
-nId = SID_ATTR_TRANSFORM;
-}
-if( nId )
-GetViewFrame()-GetDispatcher()-Execute(nId,
-SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
-}
-break;
-
case FN_STAT_SELMODE:
{
if ( pArgs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/apache-commons
external/apache-commons/ExternalProject_apache_commons_codec.mk | 11 +++--- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 04d4b703a0cad67ddbb149303e73bc722cd06884 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Mon Oct 27 19:52:51 2014 +0100 Apache Commons Codec 1.9 at least requires Java 1.6 and non debug version Change-Id: Ie7834a908c8b19cfa46d71ff6fd712e10bbe8fbb Reviewed-on: https://gerrit.libreoffice.org/12115 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/apache-commons/ExternalProject_apache_commons_codec.mk b/external/apache-commons/ExternalProject_apache_commons_codec.mk index 2135cb4..aedda04 100644 --- a/external/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/external/apache-commons/ExternalProject_apache_commons_codec.mk @@ -22,10 +22,15 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) : -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ,$(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,-Dcompile.source=1.6 -Dcompile.target=1.6 \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ ) \ - $(if $(debug),-Dbuild.debug=on) \ + $(if $(filter TRUE,$(HAVE_JAVA6)) \ + ,$(if $(debug),-Dcompile.debug=true,-Dcompile.debug=false) \ + ,$(if $(debug),-Dbuild.debug=on) \ +) \ jar \ ) ___ 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' - svtools/source sw/source
svtools/source/misc/embedtransfer.cxx |5 +
sw/source/core/uibase/dochdl/swdtflvr.cxx | 18 ++
2 files changed, 23 insertions(+)
New commits:
commit 4ab54cf64ff194fa2f53f2f0d2512a4fc267674c
Author: Muthu Subramanian muthu.subramanian.karunani...@ericsson.com
Date: Fri Oct 10 22:58:00 2014 +0530
Enable copy-paste of charts/ole as bitmaps.
Cherry-picked from 6296c64fb0ed8bce61eb6303920f952eda65de71
Change-Id: I0e074da34ff1a11c223994dcf373bf60af7cd271
Reviewed-on: https://gerrit.libreoffice.org/11911
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svtools/source/misc/embedtransfer.cxx
b/svtools/source/misc/embedtransfer.cxx
index 7792f84..7c99085 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -76,6 +76,7 @@ void SvEmbedTransferHelper::AddSupportedFormats()
AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( FORMAT_GDIMETAFILE );
+AddFormat( FORMAT_BITMAP );
}
@@ -169,6 +170,10 @@ bool SvEmbedTransferHelper::GetData( const
css::datatransfer::DataFlavor rFlavo
SetAny( aAny, rFlavor );
bRet = true;
}
+else if ( ( nFormat == FORMAT_BITMAP || nFormat ==
SOT_FORMATSTR_ID_PNG ) m_pGraphic )
+{
+bRet = SetBitmapEx( m_pGraphic-GetBitmapEx(), rFlavor );
+}
else if ( m_xObj.is() ::
svt::EmbeddedObjectRef::TryRunningState( m_xObj ) )
{
uno::Reference datatransfer::XTransferable
xTransferable( m_xObj-getComponent(), uno::UNO_QUERY );
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx
b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 3cdd21a..3db9338 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -495,6 +495,7 @@ bool SwTransferable::GetData( const DataFlavor rFlavor,
const OUString rDestDo
// the following solution will be used in the case when the object can
not generate the image
// TODO/LATER: in future the transferhelper must probably be created
based on object and the replacement stream
+// TODO: Block not required now, SvEmbedTransferHelper should be able
to handle GDIMetaFile format
if ( nFormat == SOT_FORMAT_GDIMETAFILE )
{
pOLEGraph = FindOLEReplacementGraphic();
@@ -828,6 +829,23 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
AddFormat( FORMAT_GDIMETAFILE );
+
+// Fetch the formats supported via embedtransferhelper as well
+sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
+uno::Reference embed::XEmbeddedObject xObj = FindOLEObj( nAspect );
+const Graphic* pOLEGraph = FindOLEReplacementGraphic();
+if( xObj.is() )
+{
+TransferableDataHelper aD( new SvEmbedTransferHelper( xObj,
pOLEGraph, nAspect ) );
+if ( aD.GetTransferable().is() )
+{
+DataFlavorExVector aVector(
aD.GetDataFlavorExVector() );
+DataFlavorExVector::iteratoraIter( aVector.begin() ),
aEnd( aVector.end() );
+
+while( aIter != aEnd )
+AddFormat( *aIter++ );
+}
+}
eBufferType = TRNSFR_OLE;
}
// Is there anything to provide anyway?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: license
Added to https://wiki.documentfoundation.org/Development/Developers Michaël 2014-11-18 1:43 GMT+01:00 TANAKA Hidemune i...@tanaka-cs.co.jp: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. TANAKA Hidemune ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: registry/source
registry/source/reflread.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 24714f5eaa08016da3f8a74f4842b25eb37ad814
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 11:18:04 2014 +0100
Fix memchr checks
(thanks caolan for spotting)
Change-Id: I17093b4173b9a2fca2760240375bcb14313224ef
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index e226fbf..838010c 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -363,7 +363,8 @@ const sal_Char*
ConstantPool::readUTF8NameConstant(sal_uInt16 index)
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) ==
CP_TAG_UTF8_NAME)
{
sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA;
-if (n m_bufferLen std::memchr(m_pBuffer, 0, n) != nullptr)
+if (n m_bufferLen
+ std::memchr(m_pBuffer + n, 0, m_bufferLen - n) != nullptr)
{
aName = (const sal_Char*) (m_pBuffer + n);
}
@@ -564,7 +565,9 @@ const sal_Unicode*
ConstantPool::readStringConstant(sal_uInt16 index)
if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) ==
CP_TAG_CONST_STRING)
{
sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA;
-if (n = m_bufferLen || std::memchr(m_pBuffer, 0, n) ==
nullptr)
+if (n = m_bufferLen
+|| (std::memchr(m_pBuffer + n, 0, m_bufferLen - n)
+== nullptr))
{
throw BoundsError();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 83141, which changed state. Bug 83141 Summary: Calc Find Replace extremely slow / freeze with large spreadsheet https://bugs.freedesktop.org/show_bug.cgi?id=83141 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/chtoutline.docx|binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 24 +++
writerfilter/source/dmapper/NumberingManager.cxx | 10 -
3 files changed, 29 insertions(+), 5 deletions(-)
New commits:
commit 29a91e4739496e1db5995fdece6a3ffa89e42774
Author: Mark Hung mark...@gmail.com
Date: Mon Nov 17 13:13:10 2014 -0800
Fix outline numbering for ooxml import filter.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/12519
Change-Id: Ifd8a562bcee4f57cc99ed3215e6d8d6dd95216b0
diff --git a/sw/qa/extras/ooxmlimport/data/chtoutline.docx
b/sw/qa/extras/ooxmlimport/data/chtoutline.docx
new file mode 100644
index 000..92fdaf7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/chtoutline.docx
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 640e468..a0650a1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2532,6 +2532,30 @@ DECLARE_OOXMLIMPORT_TEST(testFdo85542, fdo85542.docx)
uno::Referencetext::XTextRange xTextNeighborhood(xNeighborhoodCursor,
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(xTextNeighborhood-getString(), OUString(AB));
}
+
+DECLARE_OOXMLIMPORT_TEST(testChtOutlineNumberingOoxml, chtoutline.docx)
+{
+const sal_Unicode aExpectedPrefix[2] = { 0x7b2c, 0x0020 };
+const sal_Unicode aExpectedSuffix[2] = { 0x0020, 0x7ae0 };
+uno::Reference text::XChapterNumberingSupplier
xChapterNumberingSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference container::XIndexAccess
xLevels(xChapterNumberingSupplier-getChapterNumberingRules());
+uno::Sequencebeans::PropertyValue aProps;
+xLevels-getByIndex(0) = aProps; // 1st level
+
+OUString aSuffix,aPrefix;
+for (int i = 0; i aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if (rProp.Name == Suffix)
+aSuffix = rProp.Value.getOUString();
+if (rProp.Name == Prefix)
+aPrefix = rProp.Value.getOUString();
+}
+
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedPrefix,SAL_N_ELEMENTS(aExpectedPrefix)),
aPrefix);
+
CPPUNIT_ASSERT_EQUAL(OUString(aExpectedSuffix,SAL_N_ELEMENTS(aExpectedSuffix)),
aSuffix);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 586b9a1..2d5618d 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -147,11 +147,11 @@ void ListLevel::SetParaStyle( boost::shared_ptr
StyleSheetEntry pStyle )
// AFAICT .docx spec does not identify which numberings or paragraph
// styles are actually the ones to be used for outlines (chapter
numbering),
// it only kind of says somewhere that they should be named Heading1 to
Heading9.
-const OUString styleId = pStyle-sStyleIdentifierD;
-m_outline = ( styleId.getLength() == RTL_CONSTASCII_LENGTH( Heading1 )
- styleId.match( Heading, 0 )
- styleId[ RTL_CONSTASCII_LENGTH( Heading ) ] = '1'
- styleId[ RTL_CONSTASCII_LENGTH( Heading ) ] = '9' );
+const OUString styleId= pStyle-sConvertedStyleName;
+m_outline = ( styleId.getLength() == RTL_CONSTASCII_LENGTH( Heading 1 )
+ styleId.match( Heading , 0 )
+ styleId[ RTL_CONSTASCII_LENGTH( Heading ) ] = '1'
+ styleId[ RTL_CONSTASCII_LENGTH( Heading ) ] = '9' );
}
sal_Int16 ListLevel::GetParentNumbering( const OUString sText, sal_Int16
nLevel,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 58 +
1 file changed, 34 insertions(+), 24 deletions(-)
New commits:
commit b66f1edef2a64803b8ebde913c26a3c0727e9186
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 11:38:35 2014 +0100
Put properties in their own structure
The structure will be the entry point for static variables in latter patches
Change-Id: Iaa072591b1c900598c4f8ebf386e9b51342967dd
Reviewed-on: https://gerrit.libreoffice.org/12477
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 98cb0a4..bd691d5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -352,10 +352,9 @@ void SwCalcPixStatics( OutputDevice *pOut )
}
/**
- * To be able to save the statics so the paint is more or lees reentrant
+ *
*/
-class SwSavePaintStatics
-{
+struct SwPaintProperties {
boolbSFlyMetafile;
SwViewShell*pSGlobalShell;
OutputDevice *pSFlyMetafileOut;
@@ -376,33 +375,43 @@ class SwSavePaintStatics
Color aSGlobalRetoucheColor;
double aSScaleX,
aSScaleY;
+};
+
+/**
+ * To be able to save the statics so the paint is more or lees reentrant
+ */
+class SwSavePaintStatics : public SwPaintProperties
+{
public:
SwSavePaintStatics();
~SwSavePaintStatics();
};
-SwSavePaintStatics::SwSavePaintStatics() :
-bSFlyMetafile ( bFlyMetafile ),
-pSGlobalShell ( pGlobalShell ),
-pSFlyMetafileOut( pFlyMetafileOut ),
-pSRetoucheFly ( pRetoucheFly ),
-pSRetoucheFly2 ( pRetoucheFly2 ),
-pSFlyOnlyDraw ( pFlyOnlyDraw ),
-pBLines ( g_pBorderLines),
-pSLines ( pLines),
-pSSubsLines ( pSubsLines),
-pSSpecSubsLines ( pSpecSubsLines),
-pSProgress ( pProgress ),
-nSPixelSzW ( nPixelSzW ),
-nSPixelSzH ( nPixelSzH ),
-nSHalfPixelSzW ( nHalfPixelSzW ),
-nSHalfPixelSzH ( nHalfPixelSzH ),
-nSMinDistPixelW ( nMinDistPixelW),
-nSMinDistPixelH ( nMinDistPixelH),
-aSGlobalRetoucheColor( aGlobalRetoucheColor ),
-aSScaleX( aScaleX ),
-aSScaleY( aScaleY )
+SwSavePaintStatics::SwSavePaintStatics()
{
+// Saving globales
+bSFlyMetafile = bFlyMetafile;
+pSGlobalShell = pGlobalShell;
+pSFlyMetafileOut = pFlyMetafileOut;
+pSRetoucheFly = pRetoucheFly;
+pSRetoucheFly2 = pRetoucheFly2;
+pSFlyOnlyDraw = pFlyOnlyDraw;
+pBLines = g_pBorderLines;
+pSLines = pLines;
+pSSubsLines = pSubsLines;
+pSSpecSubsLines = pSpecSubsLines;
+pSProgress = pProgress;
+nSPixelSzW = nPixelSzW;
+nSPixelSzH = nPixelSzH;
+nSHalfPixelSzW = nHalfPixelSzW;
+nSHalfPixelSzH = nHalfPixelSzH;
+nSMinDistPixelW = nMinDistPixelW;
+nSMinDistPixelH = nMinDistPixelH ;
+aSGlobalRetoucheColor = aGlobalRetoucheColor;
+aSScaleX = aScaleX;
+aSScaleY = aScaleY;
+
+// Restoring globales to default
bFlyMetafile = false;
pFlyMetafileOut = 0;
pRetoucheFly = 0;
@@ -422,6 +431,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
SwSavePaintStatics::~SwSavePaintStatics()
{
+// Restoring globales to saved one
pGlobalShell = pSGlobalShell;
bFlyMetafile = bSFlyMetafile;
pFlyMetafileOut= pSFlyMetafileOut;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 612a5f54015eedf832ce1d0ff9062ba819976ea6 Author: Michaël Lefèvre lefevr...@yahoo.fr Date: Sun Nov 16 12:10:28 2014 +0100 Make const variables const Change-Id: Ib29fa559028327ffb8835daf271da0769fecaa2a Reviewed-on: https://gerrit.libreoffice.org/12478 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index bd691d5..a5b5d73 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -246,8 +246,8 @@ static long nMinDistPixelW = 0, nMinDistPixelH = 0; // Current zoom factor static double aScaleX = 1.0; static double aScaleY = 1.0; -static double aMinDistScale = 0.73; -static double aEdgeScale = 0.5; +const static double aMinDistScale = 0.73; +const static double aEdgeScale = 0.5; // The borders will be collected in pLines during the Paint and later // possibly merge them. @@ -420,8 +420,6 @@ SwSavePaintStatics::SwSavePaintStatics() nHalfPixelSzW = nHalfPixelSzH = nMinDistPixelW = nMinDistPixelH = 0; aScaleX = aScaleY = 1.0; -aMinDistScale = 0.73; -aEdgeScale = 0.5; g_pBorderLines = 0; pLines = 0; pSubsLines = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 17 ++---
1 file changed, 2 insertions(+), 15 deletions(-)
New commits:
commit 7ad6eb2c9b0b6e7f6d3993d293d8ee0cf3dcbc7f
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 12:13:23 2014 +0100
Remove dead code
Change-Id: Ieac5dec327f5203221e31c50d679ef3ffa1ce8e4
Reviewed-on: https://gerrit.libreoffice.org/12479
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index a5b5d73..b70bb6e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -265,9 +265,6 @@ static SfxProgress *pProgress = 0;
static SwFlyFrm *pFlyOnlyDraw = 0;
-//So the flys can also be painted right for the hack.
-static bool bTableHack = false;
-
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -4016,18 +4013,9 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const
SwViewShell *pSh )
//HACK: exception: printing of frames in tables, those can overlap
//a page once in a while when dealing with oversized tables (HTML).
SwPageFrm *pPage = pFly-FindPageFrm();
-if ( pPage )
+if ( pPage pPage-Frm().IsOver( pFly-Frm() ) )
{
-if ( pPage-Frm().IsOver( pFly-Frm() ) )
-pAnch = pFly-AnchorFrm();
-else if ( bTableHack
- pFly-Frm().Top() =
pFly-GetAnchorFrm()-Frm().Top()
- pFly-Frm().Top()
pFly-GetAnchorFrm()-Frm().Bottom()
- sal_IntPtr(pSh-GetOut()) ==
-
sal_IntPtr(pSh-getIDocumentDeviceAccess()-getPrinter( false ) ) )
-{
pAnch = pFly-AnchorFrm();
-}
}
}
@@ -4049,8 +4037,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const
SwViewShell *pSh )
//right now. Afterwards they must not be printed if the
//page over which they float position wise gets printed.
const SwPageFrm *pPage = pAnch-FindPageFrm();
-if ( !bTableHack
- !pPage-Frm().IsOver( pObj-GetCurrentBoundRect() ) )
+if ( !pPage-Frm().IsOver( pObj-GetCurrentBoundRect() ) )
pAnch = 0;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 78826] UI: inconsistent fields labeling. Text: or Text?
https://bugs.freedesktop.org/show_bug.cgi?id=78826 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #17 from Adolfo Jayme f...@libreoffice.org --- Most dialogs are fixed now, including the one shown in this bug’s screenshots. The remaining dialogs will be fixed after branching 4.4. -- 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: cui/source
cui/source/customize/cfg.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit cf26921658c0905a4d2dda13f91e3db99c76ade6
Author: Maxim Monastirsky momonas...@gmail.com
Date: Tue Nov 18 01:24:31 2014 +0200
fdo#80280 Don't add items with no bitmaps
Change-Id: I625aff5d2dcae0b1491fa77b04605d4579ec8530
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b00dcd0..b015f08 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4887,17 +4887,20 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(
vcl::Window *pWindow,
if ( graphics.getLength() 0 )
{
Image img = Image( graphics[ 0 ] );
-pTbSymbol-InsertItem( nId, img, pConstIter-first );
+if ( !img.GetBitmapEx().IsEmpty() )
+{
+pTbSymbol-InsertItem( nId, img, pConstIter-first );
-uno::Reference graphic::XGraphic xGraphic = graphics[ 0 ];
+uno::Reference graphic::XGraphic xGraphic = graphics[ 0 ];
-if ( xGraphic.is() )
-xGraphic-acquire();
+if ( xGraphic.is() )
+xGraphic-acquire();
-pTbSymbol-SetItemData(
-nId, static_cast void * ( xGraphic.get() ) );
+pTbSymbol-SetItemData(
+nId, static_cast void * ( xGraphic.get() ) );
-++nId;
+++nId;
+}
}
++pConstIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 76 ++---
1 file changed, 39 insertions(+), 37 deletions(-)
New commits:
commit 39fe63b8b998894f4f7c3736188bdde1b4cc6c71
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 13:51:18 2014 +0100
Move scale factors inside the properties container
Change-Id: Ic2417796d1e1cf150124ede660b53d3a01d70aab
Reviewed-on: https://gerrit.libreoffice.org/12480
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b70bb6e..4b35217 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -244,8 +244,6 @@ static long nHalfPixelSzW = 0, nHalfPixelSzH = 0;
static long nMinDistPixelW = 0, nMinDistPixelH = 0;
// Current zoom factor
-static double aScaleX = 1.0;
-static double aScaleY = 1.0;
const static double aMinDistScale = 0.73;
const static double aEdgeScale = 0.5;
@@ -290,6 +288,36 @@ bool isTableBoundariesEnabled()
}
/**
+ * Container for static properties
+ */
+struct SwPaintProperties {
+boolbSFlyMetafile;
+SwViewShell*pSGlobalShell;
+OutputDevice *pSFlyMetafileOut;
+SwFlyFrm *pSRetoucheFly,
+ *pSRetoucheFly2,
+ *pSFlyOnlyDraw;
+BorderLines*pBLines;
+SwLineRects*pSLines;
+SwSubsRects*pSSubsLines;
+SwSubsRects*pSSpecSubsLines;
+SfxProgress*pSProgress;
+longnSPixelSzW,
+nSPixelSzH,
+nSHalfPixelSzW,
+nSHalfPixelSzH,
+nSMinDistPixelW,
+nSMinDistPixelH;
+Color aSGlobalRetoucheColor;
+
+// Current zoom factor
+double aSScaleX = 1;
+double aSScaleY = 1;
+};
+
+static SwPaintProperties gProp;
+
+/**
* Set borders alignment statics
* Adjustment for 'small' twip-to-pixel relations:
* For 'small' twip-to-pixel relations (less then 2:1)
@@ -344,37 +372,11 @@ void SwCalcPixStatics( OutputDevice *pOut )
nMinDistPixelH = nPixelSzH * 2 + 1;
const MapMode rMap = pOut-GetMapMode();
-aScaleX = rMap.GetScaleX();
-aScaleY = rMap.GetScaleY();
+gProp.aSScaleX = rMap.GetScaleX();
+gProp.aSScaleY = rMap.GetScaleY();
}
/**
- *
- */
-struct SwPaintProperties {
-boolbSFlyMetafile;
-SwViewShell*pSGlobalShell;
-OutputDevice *pSFlyMetafileOut;
-SwFlyFrm *pSRetoucheFly,
- *pSRetoucheFly2,
- *pSFlyOnlyDraw;
-BorderLines*pBLines;
-SwLineRects*pSLines;
-SwSubsRects*pSSubsLines;
-SwSubsRects*pSSpecSubsLines;
-SfxProgress*pSProgress;
-longnSPixelSzW,
-nSPixelSzH,
-nSHalfPixelSzW,
-nSHalfPixelSzH,
-nSMinDistPixelW,
-nSMinDistPixelH;
-Color aSGlobalRetoucheColor;
-double aSScaleX,
-aSScaleY;
-};
-
-/**
* To be able to save the statics so the paint is more or lees reentrant
*/
class SwSavePaintStatics : public SwPaintProperties
@@ -405,8 +407,8 @@ SwSavePaintStatics::SwSavePaintStatics()
nSMinDistPixelW = nMinDistPixelW;
nSMinDistPixelH = nMinDistPixelH ;
aSGlobalRetoucheColor = aGlobalRetoucheColor;
-aSScaleX = aScaleX;
-aSScaleY = aScaleY;
+aSScaleX = gProp.aSScaleX;
+aSScaleY = gProp.aSScaleY;
// Restoring globales to default
bFlyMetafile = false;
@@ -416,7 +418,7 @@ SwSavePaintStatics::SwSavePaintStatics()
nPixelSzW = nPixelSzH =
nHalfPixelSzW = nHalfPixelSzH =
nMinDistPixelW = nMinDistPixelH = 0;
-aScaleX = aScaleY = 1.0;
+gProp.aSScaleX = gProp.aSScaleY = 1.0;
g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
@@ -445,8 +447,8 @@ SwSavePaintStatics::~SwSavePaintStatics()
nMinDistPixelW = nSMinDistPixelW;
nMinDistPixelH = nSMinDistPixelH;
aGlobalRetoucheColor = aSGlobalRetoucheColor;
-aScaleX= aSScaleX;
-aScaleY= aSScaleY;
+gProp.aSScaleX = aSScaleX;
+gProp.aSScaleY = aSScaleY;
}
/**
@@ -677,7 +679,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( pOut-GetOutDevType() != OUTDEV_PRINTER )
{
// I'm not doing anything for a too small zoom
-if ( aScaleX aEdgeScale || aScaleY aEdgeScale )
+if ( gProp.aSScaleX aEdgeScale || gProp.aSScaleY aEdgeScale )
return;
}
@@ -1392,7 +1394,7 @@ static long lcl_AlignHeight( const long nHeight )
static long lcl_MinHeightDist( const long nDist )
{
-if ( aScaleX
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 250391009aec9930abcc57930ddd4b6f56f4df9c
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 14:18:49 2014 +0100
Move pFlyOnly into properties container
Change-Id: I64dcaba589f77cc5bd9241c6adb34dbe029ad9f1
Reviewed-on: https://gerrit.libreoffice.org/12481
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 4b35217..29acc70 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -261,8 +261,6 @@ static SwSubsRects *pSpecSubsLines = 0;
static SfxProgress *pProgress = 0;
-static SwFlyFrm *pFlyOnlyDraw = 0;
-
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -295,8 +293,8 @@ struct SwPaintProperties {
SwViewShell*pSGlobalShell;
OutputDevice *pSFlyMetafileOut;
SwFlyFrm *pSRetoucheFly,
- *pSRetoucheFly2,
- *pSFlyOnlyDraw;
+ *pSRetoucheFly2;
+SwFlyFrm *pSFlyOnlyDraw = 0;
BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
@@ -394,7 +392,7 @@ SwSavePaintStatics::SwSavePaintStatics()
pSFlyMetafileOut = pFlyMetafileOut;
pSRetoucheFly = pRetoucheFly;
pSRetoucheFly2 = pRetoucheFly2;
-pSFlyOnlyDraw = pFlyOnlyDraw;
+pSFlyOnlyDraw = gProp.pSFlyOnlyDraw;
pBLines = g_pBorderLines;
pSLines = pLines;
pSSubsLines = pSubsLines;
@@ -434,7 +432,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pFlyMetafileOut= pSFlyMetafileOut;
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
-pFlyOnlyDraw = pSFlyOnlyDraw;
+gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
@@ -3990,7 +3988,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const
SwViewShell *pSh )
return true;
//Attribute dependent, don't paint for printer or Preview
-bool bPaint = pFlyOnlyDraw ||
+bool bPaint = gProp.pSFlyOnlyDraw ||
((SwContact*)pUserCall)-GetFmt()-GetPrint().GetValue();
if ( !bPaint )
bPaint = pSh-GetWin() !pSh-IsPreview();
@@ -4006,7 +4004,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const
SwViewShell *pSh )
if ( pObj-ISA(SwVirtFlyDrawObj) )
{
SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)-GetFlyFrm();
-if ( pFlyOnlyDraw pFlyOnlyDraw == pFly )
+if ( gProp.pSFlyOnlyDraw gProp.pSFlyOnlyDraw == pFly )
return true;
//Try to avoid displaying the intermediate stage, Flys which don't
@@ -4057,7 +4055,7 @@ bool SwFlyFrm::IsPaint( SdrObject *pObj, const
SwViewShell *pSh )
if ( pAnch-IsInFly() )
bPaint = SwFlyFrm::IsPaint(
pAnch-FindFlyFrm()-GetVirtDrawObj(),
pSh );
-else if ( pFlyOnlyDraw )
+else if ( gProp.pSFlyOnlyDraw )
bPaint = false;
}
else
@@ -7651,7 +7649,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
pFlyMetafileOut = pWin;
SwViewImp *pImp = pSh-Imp();
-pFlyOnlyDraw = pFly;
+gProp.pSFlyOnlyDraw = pFly;
pLines = new SwLineRects;
// OD 09.12.2002 #103045# - determine page, fly frame is on
@@ -7674,7 +7672,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
aSwRedirector );
pLines-PaintLines( aDev );
DELETEZ( pLines );
-pFlyOnlyDraw = 0;
+gProp.pSFlyOnlyDraw = 0;
pFlyMetafileOut = 0;
bFlyMetafile = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 234 ++---
1 file changed, 116 insertions(+), 118 deletions(-)
New commits:
commit 7b2985edba87c8b4c081611beeef0d597a826032
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 14:26:15 2014 +0100
Move pGlobalShell into properties container
Change-Id: I10eca8c422f8242a892a0c6608a874ed8a37dd46
Reviewed-on: https://gerrit.libreoffice.org/12482
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 29acc70..b513329 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -108,18 +108,18 @@ using ::std::pair;
using ::std::make_pair;
//other subsidiary lines enabled?
-#define IS_SUBS (!pGlobalShell-GetViewOptions()-IsPagePreview() \
-!pGlobalShell-GetViewOptions()-IsReadonly() \
-!pGlobalShell-GetViewOptions()-IsFormView() \
+#define IS_SUBS (!gProp.pSGlobalShell-GetViewOptions()-IsPagePreview() \
+!gProp.pSGlobalShell-GetViewOptions()-IsReadonly() \
+!gProp.pSGlobalShell-GetViewOptions()-IsFormView() \
SwViewOption::IsDocBoundaries())
//subsidiary lines for sections
-#define IS_SUBS_SECTION (!pGlobalShell-GetViewOptions()-IsPagePreview() \
- !pGlobalShell-GetViewOptions()-IsReadonly()\
- !pGlobalShell-GetViewOptions()-IsFormView() \
+#define IS_SUBS_SECTION
(!gProp.pSGlobalShell-GetViewOptions()-IsPagePreview() \
+
!gProp.pSGlobalShell-GetViewOptions()-IsReadonly()\
+ !gProp.pSGlobalShell-GetViewOptions()-IsFormView()
\
SwViewOption::IsSectionBoundaries())
-#define IS_SUBS_FLYS (!pGlobalShell-GetViewOptions()-IsPagePreview() \
- !pGlobalShell-GetViewOptions()-IsReadonly()\
- !pGlobalShell-GetViewOptions()-IsFormView() \
+#define IS_SUBS_FLYS (!gProp.pSGlobalShell-GetViewOptions()-IsPagePreview()
\
+ !gProp.pSGlobalShell-GetViewOptions()-IsReadonly()\
+ !gProp.pSGlobalShell-GetViewOptions()-IsFormView() \
SwViewOption::IsObjectBoundaries())
//Class declaration; here because they are only used in this file
@@ -224,8 +224,6 @@ public:
}
};
-static SwViewShell *pGlobalShell = 0;
-
//Only repaint the Fly content as well as the background of the Fly content if
//a metafile is taken of the Fly.
static bool bFlyMetafile = false;
@@ -264,33 +262,12 @@ static SfxProgress *pProgress = 0;
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
-namespace {
-
-bool isTableBoundariesEnabled()
-{
-if (!pGlobalShell-GetViewOptions()-IsTable())
-return false;
-
-if (pGlobalShell-GetViewOptions()-IsPagePreview())
-return false;
-
-if (pGlobalShell-GetViewOptions()-IsReadonly())
-return false;
-
-if (pGlobalShell-GetViewOptions()-IsFormView())
-return false;
-
-return SwViewOption::IsTableBoundaries();
-}
-
-}
-
/**
* Container for static properties
*/
struct SwPaintProperties {
boolbSFlyMetafile;
-SwViewShell*pSGlobalShell;
+SwViewShell*pSGlobalShell = 0;
OutputDevice *pSFlyMetafileOut;
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2;
@@ -315,6 +292,27 @@ struct SwPaintProperties {
static SwPaintProperties gProp;
+namespace {
+
+bool isTableBoundariesEnabled()
+{
+if (!gProp.pSGlobalShell-GetViewOptions()-IsTable())
+return false;
+
+if (gProp.pSGlobalShell-GetViewOptions()-IsPagePreview())
+return false;
+
+if (gProp.pSGlobalShell-GetViewOptions()-IsReadonly())
+return false;
+
+if (gProp.pSGlobalShell-GetViewOptions()-IsFormView())
+return false;
+
+return SwViewOption::IsTableBoundaries();
+}
+
+}
+
/**
* Set borders alignment statics
* Adjustment for 'small' twip-to-pixel relations:
@@ -388,7 +386,7 @@ SwSavePaintStatics::SwSavePaintStatics()
{
// Saving globales
bSFlyMetafile = bFlyMetafile;
-pSGlobalShell = pGlobalShell;
+pSGlobalShell = gProp.pSGlobalShell;
pSFlyMetafileOut = pFlyMetafileOut;
pSRetoucheFly = pRetoucheFly;
pSRetoucheFly2 = pRetoucheFly2;
@@ -427,7 +425,7 @@ SwSavePaintStatics::SwSavePaintStatics()
SwSavePaintStatics::~SwSavePaintStatics()
{
// Restoring globales to saved one
-pGlobalShell = pSGlobalShell;
+gProp.pSGlobalShell = pSGlobalShell;
bFlyMetafile = bSFlyMetafile;
pFlyMetafileOut= pSFlyMetafileOut;
pRetoucheFly = pSRetoucheFly;
@@ -1048,7 +1046,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
pLast = rLRect.GetColor();
sal_uLong nOldDrawMode =
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 50 +
1 file changed, 24 insertions(+), 26 deletions(-)
New commits:
commit 86662e137726ce7f13da9d116b9ce97e374322fd
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 14:40:09 2014 +0100
Move bFlyMetafile and pFlyMetafileOut into properties container
Change-Id: I88b9a193a790fd1985bdd0f83d7b75993a746c0e
Reviewed-on: https://gerrit.libreoffice.org/12483
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b513329..492dc85 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -224,11 +224,6 @@ public:
}
};
-//Only repaint the Fly content as well as the background of the Fly content if
-//a metafile is taken of the Fly.
-static bool bFlyMetafile = false;
-static OutputDevice *pFlyMetafileOut = 0;
-
//Retouch for transparent Flys is done by the background of the Flys.
//The Fly itself should certainly not be spared out. See PaintBackground and
//lcl_SubtractFlys()
@@ -266,9 +261,12 @@ Color aGlobalRetoucheColor;
* Container for static properties
*/
struct SwPaintProperties {
-boolbSFlyMetafile;
+//Only repaint the Fly content as well as the background of the Fly
content if
+//a metafile is taken of the Fly.
+boolbSFlyMetafile = false;
+OutputDevice *pSFlyMetafileOut = 0;
+
SwViewShell*pSGlobalShell = 0;
-OutputDevice *pSFlyMetafileOut;
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2;
SwFlyFrm *pSFlyOnlyDraw = 0;
@@ -385,9 +383,9 @@ public:
SwSavePaintStatics::SwSavePaintStatics()
{
// Saving globales
-bSFlyMetafile = bFlyMetafile;
+bSFlyMetafile = gProp.bSFlyMetafile;
pSGlobalShell = gProp.pSGlobalShell;
-pSFlyMetafileOut = pFlyMetafileOut;
+pSFlyMetafileOut = gProp.pSFlyMetafileOut;
pSRetoucheFly = pRetoucheFly;
pSRetoucheFly2 = pRetoucheFly2;
pSFlyOnlyDraw = gProp.pSFlyOnlyDraw;
@@ -407,8 +405,8 @@ SwSavePaintStatics::SwSavePaintStatics()
aSScaleY = gProp.aSScaleY;
// Restoring globales to default
-bFlyMetafile = false;
-pFlyMetafileOut = 0;
+gProp.bSFlyMetafile = false;
+gProp.pSFlyMetafileOut = 0;
pRetoucheFly = 0;
pRetoucheFly2 = 0;
nPixelSzW = nPixelSzH =
@@ -426,8 +424,8 @@ SwSavePaintStatics::~SwSavePaintStatics()
{
// Restoring globales to saved one
gProp.pSGlobalShell = pSGlobalShell;
-bFlyMetafile = bSFlyMetafile;
-pFlyMetafileOut= pSFlyMetafileOut;
+gProp.bSFlyMetafile = bSFlyMetafile;
+gProp.pSFlyMetafileOut= pSFlyMetafileOut;
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
@@ -1222,14 +1220,14 @@ void SwAlignRect( SwRect rRect, const SwViewShell *pSh
)
// Make sure that view shell (parameter pSh) exists, if the output device
// is taken from this view shell -- no output device, no alignment
-// Output device taken from view shell pSh, if bFlyMetafile not set
-if ( !bFlyMetafile !pSh )
+// Output device taken from view shell pSh, if gProp.bSFlyMetafile not
set
+if ( !gProp.bSFlyMetafile !pSh )
{
return;
}
-const OutputDevice *pOut = bFlyMetafile ?
-pFlyMetafileOut : pSh-GetOut();
+const OutputDevice *pOut = gProp.bSFlyMetafile ?
+gProp.pSFlyMetafileOut : pSh-GetOut();
// Hold original rectangle in pixel
const Rectangle aOrgPxRect = pOut-LogicToPixel( rRect.SVRect() );
@@ -1687,9 +1685,9 @@ static void lcl_implDrawGraphicBackgrd( const
SvxBrushItem _rBackgrdBrush,
{
/// determine color of background
/// If color of background brush is not no fill/auto fill or
-/// bFlyMetafile is set, use color of background brush, otherwise
+/// gProp.bSFlyMetafile is set, use color of background brush,
otherwise
/// use global retouche color.
-const Color aColor( ( (_rBackgrdBrush.GetColor() != COL_TRANSPARENT) ||
bFlyMetafile )
+const Color aColor( ( (_rBackgrdBrush.GetColor() != COL_TRANSPARENT) ||
gProp.bSFlyMetafile )
? _rBackgrdBrush.GetColor()
: aGlobalRetoucheColor );
@@ -2140,7 +2138,7 @@ void DrawGraphic(
// instead of checking, if transparency is not set.
const Color aColor( pBrush
( !(pBrush-GetColor() == COL_TRANSPARENT) ||
- bFlyMetafile )
+ gProp.bSFlyMetafile )
? pBrush-GetColor()
: aGlobalRetoucheColor );
@@ -6463,7 +6461,7 @@ void SwFrm::PaintBackground( const SwRect rRect, const
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 55 ++---
1 file changed, 27 insertions(+), 28 deletions(-)
New commits:
commit 69881c0fabe1c37d3564735d13210d1b14e8b153
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 15:10:59 2014 +0100
Move *RetoucheFly* into properties container
Change-Id: I07c1751848c55c12bad16735b7f83ea07b150080
Reviewed-on: https://gerrit.libreoffice.org/12484
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 492dc85..9102c65 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -224,12 +224,6 @@ public:
}
};
-//Retouch for transparent Flys is done by the background of the Flys.
-//The Fly itself should certainly not be spared out. See PaintBackground and
-//lcl_SubtractFlys()
-static SwFlyFrm *pRetoucheFly = 0;
-static SwFlyFrm *pRetoucheFly2 = 0;
-
// Sizes of a pixel and the corresponding halves. Will be reset when
// entering SwRootFrm::Paint
static long nPixelSzW = 0, nPixelSzH = 0;
@@ -267,8 +261,13 @@ struct SwPaintProperties {
OutputDevice *pSFlyMetafileOut = 0;
SwViewShell*pSGlobalShell = 0;
-SwFlyFrm *pSRetoucheFly,
- *pSRetoucheFly2;
+
+//Retouch for transparent Flys is done by the background of the Flys.
+//The Fly itself should certainly not be spared out. See PaintBackground
and
+//lcl_SubtractFlys()
+SwFlyFrm *pSRetoucheFly = 0;
+SwFlyFrm *pSRetoucheFly2 = 0;
+
SwFlyFrm *pSFlyOnlyDraw = 0;
BorderLines*pBLines;
SwLineRects*pSLines;
@@ -386,8 +385,8 @@ SwSavePaintStatics::SwSavePaintStatics()
bSFlyMetafile = gProp.bSFlyMetafile;
pSGlobalShell = gProp.pSGlobalShell;
pSFlyMetafileOut = gProp.pSFlyMetafileOut;
-pSRetoucheFly = pRetoucheFly;
-pSRetoucheFly2 = pRetoucheFly2;
+pSRetoucheFly = gProp.pSRetoucheFly;
+pSRetoucheFly2 = gProp.pSRetoucheFly2;
pSFlyOnlyDraw = gProp.pSFlyOnlyDraw;
pBLines = g_pBorderLines;
pSLines = pLines;
@@ -407,8 +406,8 @@ SwSavePaintStatics::SwSavePaintStatics()
// Restoring globales to default
gProp.bSFlyMetafile = false;
gProp.pSFlyMetafileOut = 0;
-pRetoucheFly = 0;
-pRetoucheFly2 = 0;
+gProp.pSRetoucheFly = 0;
+gProp.pSRetoucheFly2 = 0;
nPixelSzW = nPixelSzH =
nHalfPixelSzW = nHalfPixelSzH =
nMinDistPixelW = nMinDistPixelH = 0;
@@ -426,8 +425,8 @@ SwSavePaintStatics::~SwSavePaintStatics()
gProp.pSGlobalShell = pSGlobalShell;
gProp.bSFlyMetafile = bSFlyMetafile;
gProp.pSFlyMetafileOut= pSFlyMetafileOut;
-pRetoucheFly = pSRetoucheFly;
-pRetoucheFly2 = pSRetoucheFly2;
+gProp.pSRetoucheFly = pSRetoucheFly;
+gProp.pSRetoucheFly2 = pSRetoucheFly2;
gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
g_pBorderLines = pBLines;
pLines = pSLines;
@@ -1515,9 +1514,9 @@ static void lcl_ExtendLeftAndRight( SwRect
_rRect,
// const SwRect rRect, SwRegionRects rRegion )
//{
//const SwSortedObjs rObjs = *pPage-GetSortedObjs();
-//const SwFlyFrm* pSelfFly = pFrm-IsInFly() ? pFrm-FindFlyFrm() :
pRetoucheFly2;
-//if ( !pRetoucheFly )
-//pRetoucheFly = pRetoucheFly2;
+//const SwFlyFrm* pSelfFly = pFrm-IsInFly() ? pFrm-FindFlyFrm() :
gProp.pSRetoucheFly2;
+//if ( !gProp.pSRetoucheFly )
+//gProp.pSRetoucheFly = gProp.pSRetoucheFly2;
//
//for ( sal_uInt16 j = 0; (j rObjs.Count()) !rRegion.empty(); ++j )
//{
@@ -1533,7 +1532,7 @@ static void lcl_ExtendLeftAndRight( SwRect
_rRect,
//
//const SwFlyFrm *pFly = static_castconst SwFlyFrm*(pAnchoredObj);
//
-//if ( pSelfFly == pFly || pRetoucheFly == pFly || !rRect.IsOver(
pFly-Frm() ) )
+//if ( pSelfFly == pFly || gProp.pSRetoucheFly == pFly ||
!rRect.IsOver( pFly-Frm() ) )
//continue;
//
//if ( !pFly-GetFmt()-GetPrint().GetValue()
@@ -1551,7 +1550,7 @@ static void lcl_ExtendLeftAndRight( SwRect
_rRect,
//continue;
//
////Any why does it not apply for the RetoucheFly too?
-//if ( pRetoucheFly pRetoucheFly-IsLowerOf( pFly ) )
+//if ( gProp.pSRetoucheFly gProp.pSRetoucheFly-IsLowerOf( pFly ) )
//continue;
//
//#if OSL_DEBUG_LEVEL 0
@@ -1584,9 +1583,9 @@ static void lcl_ExtendLeftAndRight( SwRect
_rRect,
//bStopOnHell = false;
//}
//}
-//if ( pRetoucheFly )
+//if ( gProp.pSRetoucheFly )
//{
-//const SdrObject *pTmp = pRetoucheFly-GetVirtDrawObj();
+//const SdrObject *pTmp = gProp.pSRetoucheFly-GetVirtDrawObj();
//
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 122 ++---
1 file changed, 60 insertions(+), 62 deletions(-)
New commits:
commit fa0f753ec87d279c82680ef661fc47a81e315721
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 15:23:03 2014 +0100
Move static n*Pixel* into properties container
Change-Id: I37d932ceabf50ffad2953d32309a668dbde1469f
Reviewed-on: https://gerrit.libreoffice.org/12485
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 9102c65..64df668 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -224,12 +224,6 @@ public:
}
};
-// Sizes of a pixel and the corresponding halves. Will be reset when
-// entering SwRootFrm::Paint
-static long nPixelSzW = 0, nPixelSzH = 0;
-static long nHalfPixelSzW = 0, nHalfPixelSzH = 0;
-static long nMinDistPixelW = 0, nMinDistPixelH = 0;
-
// Current zoom factor
const static double aMinDistScale = 0.73;
const static double aEdgeScale = 0.5;
@@ -274,12 +268,16 @@ struct SwPaintProperties {
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
SfxProgress*pSProgress;
-longnSPixelSzW,
-nSPixelSzH,
-nSHalfPixelSzW,
-nSHalfPixelSzH,
-nSMinDistPixelW,
-nSMinDistPixelH;
+
+// Sizes of a pixel and the corresponding halves. Will be reset when
+// entering SwRootFrm::Paint
+longnSPixelSzW = 0;
+longnSPixelSzH = 0;
+longnSHalfPixelSzW = 0;
+longnSHalfPixelSzH = 0;
+longnSMinDistPixelW = 0;
+longnSMinDistPixelH = 0;
+
Color aSGlobalRetoucheColor;
// Current zoom factor
@@ -314,7 +312,7 @@ bool isTableBoundariesEnabled()
* Set borders alignment statics
* Adjustment for 'small' twip-to-pixel relations:
* For 'small' twip-to-pixel relations (less then 2:1)
- * values of nHalfPixelSzW and nHalfPixelSzH are set to ZERO
+ * values of gProp.nSHalfPixelSzW and gProp.nSHalfPixelSzH are set to ZERO
*/
void SwCalcPixStatics( OutputDevice *pOut )
{
@@ -335,34 +333,34 @@ void SwCalcPixStatics( OutputDevice *pOut )
Size aSz( pOut-PixelToLogic( Size( 1,1 )) );
-nPixelSzW = aSz.Width();
-if( !nPixelSzW )
-nPixelSzW = 1;
-nPixelSzH = aSz.Height();
-if( !nPixelSzH )
-nPixelSzH = 1;
+gProp.nSPixelSzW = aSz.Width();
+if( !gProp.nSPixelSzW )
+gProp.nSPixelSzW = 1;
+gProp.nSPixelSzH = aSz.Height();
+if( !gProp.nSPixelSzH )
+gProp.nSPixelSzH = 1;
// consider 'small' twip-to-pixel relations
if ( !bSmallTwipToPxRelW )
{
-nHalfPixelSzW = nPixelSzW / 2 + 1;
+gProp.nSHalfPixelSzW = gProp.nSPixelSzW / 2 + 1;
}
else
{
-nHalfPixelSzW = 0;
+gProp.nSHalfPixelSzW = 0;
}
// consider 'small' twip-to-pixel relations
if ( !bSmallTwipToPxRelH )
{
-nHalfPixelSzH = nPixelSzH / 2 + 1;
+gProp.nSHalfPixelSzH = gProp.nSPixelSzH / 2 + 1;
}
else
{
-nHalfPixelSzH = 0;
+gProp.nSHalfPixelSzH = 0;
}
-nMinDistPixelW = nPixelSzW * 2 + 1;
-nMinDistPixelH = nPixelSzH * 2 + 1;
+gProp.nSMinDistPixelW = gProp.nSPixelSzW * 2 + 1;
+gProp.nSMinDistPixelH = gProp.nSPixelSzH * 2 + 1;
const MapMode rMap = pOut-GetMapMode();
gProp.aSScaleX = rMap.GetScaleX();
@@ -393,12 +391,12 @@ SwSavePaintStatics::SwSavePaintStatics()
pSSubsLines = pSubsLines;
pSSpecSubsLines = pSpecSubsLines;
pSProgress = pProgress;
-nSPixelSzW = nPixelSzW;
-nSPixelSzH = nPixelSzH;
-nSHalfPixelSzW = nHalfPixelSzW;
-nSHalfPixelSzH = nHalfPixelSzH;
-nSMinDistPixelW = nMinDistPixelW;
-nSMinDistPixelH = nMinDistPixelH ;
+nSPixelSzW = gProp.nSPixelSzW;
+nSPixelSzH = gProp.nSPixelSzH;
+nSHalfPixelSzW = gProp.nSHalfPixelSzW;
+nSHalfPixelSzH = gProp.nSHalfPixelSzH;
+nSMinDistPixelW = gProp.nSMinDistPixelW;
+nSMinDistPixelH = gProp.nSMinDistPixelH ;
aSGlobalRetoucheColor = aGlobalRetoucheColor;
aSScaleX = gProp.aSScaleX;
aSScaleY = gProp.aSScaleY;
@@ -408,9 +406,9 @@ SwSavePaintStatics::SwSavePaintStatics()
gProp.pSFlyMetafileOut = 0;
gProp.pSRetoucheFly = 0;
gProp.pSRetoucheFly2 = 0;
-nPixelSzW = nPixelSzH =
-nHalfPixelSzW = nHalfPixelSzH =
-nMinDistPixelW = nMinDistPixelH = 0;
+gProp.nSPixelSzW = gProp.nSPixelSzH =
+gProp.nSHalfPixelSzW = gProp.nSHalfPixelSzH =
+gProp.nSMinDistPixelW = gProp.nSMinDistPixelH = 0;
gProp.aSScaleX = gProp.aSScaleY = 1.0;
g_pBorderLines = 0;
pLines = 0;
@@ -433,12 +431,12 @@
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 6a4b21f373739f6aac9a7c4cf70838c265094414
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 15:34:13 2014 +0100
Move static pProgress into properties container
Change-Id: I0e2843327173b9459b1b5bf73277b106c495ecef
Reviewed-on: https://gerrit.libreoffice.org/12486
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 64df668..10614fc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -240,8 +240,6 @@ static SwSubsRects *pSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and footnote
frames.
static SwSubsRects *pSpecSubsLines = 0;
-static SfxProgress *pProgress = 0;
-
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -267,7 +265,7 @@ struct SwPaintProperties {
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
-SfxProgress*pSProgress;
+SfxProgress*pSProgress = 0;
// Sizes of a pixel and the corresponding halves. Will be reset when
// entering SwRootFrm::Paint
@@ -390,7 +388,7 @@ SwSavePaintStatics::SwSavePaintStatics()
pSLines = pLines;
pSSubsLines = pSubsLines;
pSSpecSubsLines = pSpecSubsLines;
-pSProgress = pProgress;
+pSProgress = gProp.pSProgress;
nSPixelSzW = gProp.nSPixelSzW;
nSPixelSzH = gProp.nSPixelSzH;
nSHalfPixelSzW = gProp.nSHalfPixelSzW;
@@ -414,7 +412,7 @@ SwSavePaintStatics::SwSavePaintStatics()
pLines = 0;
pSubsLines = 0;
pSpecSubsLines = 0L;
-pProgress = 0;
+gProp.pSProgress = 0;
}
SwSavePaintStatics::~SwSavePaintStatics()
@@ -430,7 +428,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pLines = pSLines;
pSubsLines = pSSubsLines;
pSpecSubsLines = pSSpecSubsLines;
-pProgress = pSProgress;
+gProp.pSProgress = pSProgress;
gProp.nSPixelSzW = nSPixelSzW;
gProp.nSPixelSzH = nSPixelSzH;
gProp.nSHalfPixelSzW = nSHalfPixelSzW;
@@ -3157,7 +3155,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
gProp.pSGlobalShell = pSh;
if( !pSh-GetWin() )
-pProgress = SfxProgress::GetActiveProgress( (SfxObjectShell*)
pSh-GetDoc()-GetDocShell() );
+gProp.pSProgress = SfxProgress::GetActiveProgress( (SfxObjectShell*)
pSh-GetDoc()-GetDocShell() );
::SwCalcPixStatics( pSh-GetOut() );
aGlobalRetoucheColor = pSh-Imp()-GetRetoucheColor();
@@ -3189,7 +3187,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
SwLayAction aAction( (SwRootFrm*)this, pSh-Imp() );
aAction.SetPaint( false );
aAction.SetComplete( false );
-aAction.SetReschedule( pProgress != nullptr );
+aAction.SetReschedule( gProp.pSProgress != nullptr );
aAction.Action();
((SwRootFrm*)this)-ResetTurboFlag();
if ( !pSh-ActionPend() )
@@ -3473,7 +3471,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
delete pStatics;
else
{
-pProgress = 0;
+gProp.pSProgress = 0;
gProp.pSGlobalShell = 0;
}
@@ -3569,8 +3567,8 @@ void SwLayoutFrm::Paint(SwRect const rRect, SwPrintData
const*const) const
SwRect aPaintRect( pFrm-PaintArea() );
if( aShortCut.Stop( aPaintRect ) )
break;
-if ( bCnt pProgress )
-pProgress-Reschedule();
+if ( bCnt gProp.pSProgress )
+gProp.pSProgress-Reschedule();
//We need to retouch if a frame explicitly requests it.
//First do the retouch, because this could flatten the borders.
@@ -4329,8 +4327,8 @@ void SwFlyFrm::Paint(SwRect const rRect, SwPrintData
const*const) const
pOut-Pop();
-if ( pProgress pNoTxt )
-pProgress-Reschedule();
+if ( gProp.pSProgress pNoTxt )
+gProp.pSProgress-Reschedule();
}
void SwTabFrm::Paint(SwRect const rRect, SwPrintData const*const) const
@@ -6632,8 +6630,8 @@ void SwFrm::PaintBackground( const SwRect rRect, const
SwPageFrm *pPage,
SwRect aBorderRect( aRect );
SwShortCut aShortCut( *pFrm, aBorderRect );
do
-{ if ( pProgress )
-pProgress-Reschedule();
+{ if ( gProp.pSProgress )
+gProp.pSProgress-Reschedule();
aFrmRect = pFrm-PaintArea();
if ( aFrmRect.IsOver( aBorderRect ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 38 ++---
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 3fc4449bfbfc52dce5d107479520848b1c9dad79
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 15:37:07 2014 +0100
Move static pSpecsSubLines into properties container
Change-Id: I0ff8ab2c36960a5b9b8108269fca88b325d001f6
Reviewed-on: https://gerrit.libreoffice.org/12487
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 10614fc..4b8d0fb 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -237,8 +237,6 @@ const static double aEdgeScale = 0.5;
static BorderLines *g_pBorderLines = 0;
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
-// global variable for sub-lines of body, header, footer, section and footnote
frames.
-static SwSubsRects *pSpecSubsLines = 0;
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -264,7 +262,9 @@ struct SwPaintProperties {
BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
-SwSubsRects*pSSpecSubsLines;
+
+// global variable for sub-lines of body, header, footer, section and
footnote frames.
+SwSubsRects*pSSpecSubsLines = 0;
SfxProgress*pSProgress = 0;
// Sizes of a pixel and the corresponding halves. Will be reset when
@@ -387,7 +387,7 @@ SwSavePaintStatics::SwSavePaintStatics()
pBLines = g_pBorderLines;
pSLines = pLines;
pSSubsLines = pSubsLines;
-pSSpecSubsLines = pSpecSubsLines;
+pSSpecSubsLines = gProp.pSSpecSubsLines;
pSProgress = gProp.pSProgress;
nSPixelSzW = gProp.nSPixelSzW;
nSPixelSzH = gProp.nSPixelSzH;
@@ -411,7 +411,7 @@ SwSavePaintStatics::SwSavePaintStatics()
g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
-pSpecSubsLines = 0L;
+gProp.pSSpecSubsLines = 0L;
gProp.pSProgress = 0;
}
@@ -427,7 +427,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
-pSpecSubsLines = pSSpecSubsLines;
+gProp.pSSpecSubsLines = pSSpecSubsLines;
gProp.pSProgress = pSProgress;
gProp.nSPixelSzW = nSPixelSzW;
gProp.nSPixelSzH = nSPixelSzH;
@@ -3253,7 +3253,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
if ( pSh-GetWin() )
{
pSubsLines = new SwSubsRects;
-pSpecSubsLines = new SwSubsRects;
+gProp.pSSpecSubsLines = new SwSubsRects;
}
g_pBorderLines = new BorderLines;
@@ -3336,7 +3336,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
// collect sub-lines
pPage-RefreshSubsidiary( aPaintRect );
// paint special sub-lines
-pSpecSubsLines-PaintSubsidiary( pSh-GetOut(), NULL );
+gProp.pSSpecSubsLines-PaintSubsidiary( pSh-GetOut(),
NULL );
}
pPage-Paint( aPaintRect );
@@ -3354,7 +3354,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
{
pSubsLines-PaintSubsidiary( pSh-GetOut(), pLines );
DELETEZ( pSubsLines );
-DELETEZ( pSpecSubsLines );
+DELETEZ( gProp.pSSpecSubsLines );
}
// fdo#42750: delay painting these until after subsidiary lines
// fdo#45562: delay painting these until after hell layer
@@ -4280,22 +4280,22 @@ void SwFlyFrm::Paint(SwRect const rRect, SwPrintData
const*const) const
}
bool bSpecSubsLineRectsCreated;
-if ( pSpecSubsLines )
+if ( gProp.pSSpecSubsLines )
{
// Lock already existing special subsidiary lines
-pSpecSubsLines-LockLines( true );
+gProp.pSSpecSubsLines-LockLines( true );
bSpecSubsLineRectsCreated = false;
}
else
{
// create new special subsidiardy lines
-pSpecSubsLines = new SwSubsRects;
+gProp.pSSpecSubsLines = new SwSubsRects;
bSpecSubsLineRectsCreated = true;
}
// Add subsidiary lines of fly frame and its lowers
RefreshLaySubsidiary( pPage, aRect );
// paint subsidiary lines of fly frame and its lowers
-pSpecSubsLines-PaintSubsidiary( pOut, NULL );
+gProp.pSSpecSubsLines-PaintSubsidiary( pOut, NULL );
pSubsLines-PaintSubsidiary( pOut, pLines );
if (
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 138 +
1 file changed, 67 insertions(+), 71 deletions(-)
New commits:
commit 0bb0522b21cd0f43c295606d63059730c04dab14
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sun Nov 16 15:48:11 2014 +0100
Move remaining static vars into the properties container
Change-Id: Ic52213fa73290508216fa9d2c27805e2afe68747
Reviewed-on: https://gerrit.libreoffice.org/12488
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 4b8d0fb..1a86ce2 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -228,15 +228,7 @@ public:
const static double aMinDistScale = 0.73;
const static double aEdgeScale = 0.5;
-// The borders will be collected in pLines during the Paint and later
-// possibly merge them.
-// The help lines will be collected and merged in pSubsLines. These will
-// be compared with pLines before the work in order to avoid help lines
-// to hide borders.
-// bTablines is true during the Paint of a table.
-static BorderLines *g_pBorderLines = 0;
-static SwLineRects *pLines = 0;
-static SwSubsRects *pSubsLines = 0;
+//static SwSubsRects *gProp.pSSubsLines = 0;
//To optimize the expensive RetouchColor determination
Color aGlobalRetoucheColor;
@@ -245,23 +237,27 @@ Color aGlobalRetoucheColor;
* Container for static properties
*/
struct SwPaintProperties {
-//Only repaint the Fly content as well as the background of the Fly
content if
-//a metafile is taken of the Fly.
+// Only repaint the Fly content as well as the background of the Fly
content if
+// a metafile is taken of the Fly.
boolbSFlyMetafile = false;
OutputDevice *pSFlyMetafileOut = 0;
-
SwViewShell*pSGlobalShell = 0;
-//Retouch for transparent Flys is done by the background of the Flys.
-//The Fly itself should certainly not be spared out. See PaintBackground
and
-//lcl_SubtractFlys()
+// Retouch for transparent Flys is done by the background of the Flys.
+// The Fly itself should certainly not be spared out. See PaintBackground
and
+// lcl_SubtractFlys()
SwFlyFrm *pSRetoucheFly = 0;
SwFlyFrm *pSRetoucheFly2 = 0;
-
SwFlyFrm *pSFlyOnlyDraw = 0;
-BorderLines*pBLines;
-SwLineRects*pSLines;
-SwSubsRects*pSSubsLines;
+
+// The borders will be collected in pSLines during the Paint and later
+// possibly merge them.
+// The help lines will be collected and merged in gProp.pSSubsLines. These
will
+// be compared with pSLines before the work in order to avoid help lines
+// to hide borders.
+BorderLines*pBLines = 0;
+SwLineRects*pSLines = 0;
+SwSubsRects*pSSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and
footnote frames.
SwSubsRects*pSSpecSubsLines = 0;
@@ -384,9 +380,9 @@ SwSavePaintStatics::SwSavePaintStatics()
pSRetoucheFly = gProp.pSRetoucheFly;
pSRetoucheFly2 = gProp.pSRetoucheFly2;
pSFlyOnlyDraw = gProp.pSFlyOnlyDraw;
-pBLines = g_pBorderLines;
-pSLines = pLines;
-pSSubsLines = pSubsLines;
+pBLines = gProp.pBLines;
+pSLines = gProp.pSLines;
+pSSubsLines = gProp.pSSubsLines;
pSSpecSubsLines = gProp.pSSpecSubsLines;
pSProgress = gProp.pSProgress;
nSPixelSzW = gProp.nSPixelSzW;
@@ -408,9 +404,9 @@ SwSavePaintStatics::SwSavePaintStatics()
gProp.nSHalfPixelSzW = gProp.nSHalfPixelSzH =
gProp.nSMinDistPixelW = gProp.nSMinDistPixelH = 0;
gProp.aSScaleX = gProp.aSScaleY = 1.0;
-g_pBorderLines = 0;
-pLines = 0;
-pSubsLines = 0;
+gProp.pBLines = 0;
+gProp.pSLines = 0;
+gProp.pSSubsLines = 0;
gProp.pSSpecSubsLines = 0L;
gProp.pSProgress = 0;
}
@@ -424,9 +420,9 @@ SwSavePaintStatics::~SwSavePaintStatics()
gProp.pSRetoucheFly = pSRetoucheFly;
gProp.pSRetoucheFly2 = pSRetoucheFly2;
gProp.pSFlyOnlyDraw = pSFlyOnlyDraw;
-g_pBorderLines = pBLines;
-pLines = pSLines;
-pSubsLines = pSSubsLines;
+gProp.pBLines = pBLines;
+gProp.pSLines = pSLines;
+gProp.pSSubsLines = pSSubsLines;
gProp.pSSpecSubsLines = pSSpecSubsLines;
gProp.pSProgress = pSProgress;
gProp.nSPixelSzW = nSPixelSzW;
@@ -3199,7 +3195,7 @@ void SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) c
const bool bExtraData = ::IsExtraData( GetFmt()-GetDoc() );
-pLines = new SwLineRects; //Container for borders.
+gProp.pSLines = new SwLineRects; //Container for borders.
// #104289#. During painting, something (OLE) can
// load the linguistic, which in turn can cause a
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDContentCollector.cpp |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3684ef0bc0eeb05477a30f4d3bfba01d957b0292
Author: Hidemune i...@tanaka-cs.co.jp
Date: Tue Nov 18 09:25:35 2014 +0900
display too small arrow to the appropriate size
: Visio implementation-dependent problem
Change-Id: I15131cafd82429b18874fa69a149deb8bee00e0c
Reviewed-on: https://gerrit.libreoffice.org/12523
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 9de0d30..a3cd0f1 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2277,13 +2277,15 @@ void
libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle style, l
{
styleProps.insert(draw:marker-start-viewbox,
_linePropertiesMarkerViewbox(style.startMarker));
styleProps.insert(draw:marker-start-path,
_linePropertiesMarkerPath(style.startMarker));
-styleProps.insert(draw:marker-start-width,
m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width));
+double w =
m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+styleProps.insert(draw:marker-start-width, std::max(w, 0.05));
}
if (style.endMarker 0)
{
styleProps.insert(draw:marker-end-viewbox,
_linePropertiesMarkerViewbox(style.endMarker));
styleProps.insert(draw:marker-end-path,
_linePropertiesMarkerPath(style.endMarker));
-styleProps.insert(draw:marker-end-width,
m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width));
+double w =
m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+styleProps.insert(draw:marker-end-width, std::max(w, 0.05));
}
int dots1 = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 78826] UI: inconsistent fields labeling. Text: or Text?
https://bugs.freedesktop.org/show_bug.cgi?id=78826 --- Comment #18 from Thomas Arnhold thomas-l...@arnhold.org --- Thank you very much :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cppuhelper/source cppu/source
cppu/source/typelib/typelib.cxx |1 +
cppuhelper/source/findsofficepath.c | 29 -
2 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit 6d2e4740a5fbfe8cbf1157a439b73e1bf177c071
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 12:15:02 2014 +0100
Assert that typelib_typedescription_release will not destroy pTDR-pType
...which is dereferenced a few lines further down; this is in preparation
for a
commit addressing cid#440589.
Change-Id: I3428216258d928473f85ecd4d025c352c8c83ea0
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 7f3e808..392f012 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1556,6 +1556,7 @@ extern C CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_register(
else if( !pTDR-pType-bOnDemand
(*ppNewDescription)-bOnDemand )
{
// switch from !OnDemand to OnDemand, so the description
must be relesed
+assert(pTDR-pType-nRefCount 1);
typelib_typedescription_release( pTDR-pType );
}
commit 11b0ce9bab436eec81534e9a82bfe76e69b0cf41
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 11:26:15 2014 +0100
cid#706201: No need to call access prior to realpath here
...and thus silence a TOCTOU warning
Change-Id: I17f36181946616747d84aca6d43e44d180dc8741
diff --git a/cppuhelper/source/findsofficepath.c
b/cppuhelper/source/findsofficepath.c
index f062d8f..37c8bdf 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -156,26 +156,21 @@ static char* platformSpecific(void)
strcpy( file, dir );
strcat( file, APPENDIX );
-/* check existence of soffice file */
-if ( !access( file, F_OK ) )
+/* resolve symbolic link */
+resolved = realpath( file, buffer );
+if ( resolved != NULL )
{
-/* resolve symbolic link */
-resolved = realpath( file, buffer );
+/* get path to program directory */
+sep = strrchr( resolved, SEPARATOR );
-if ( resolved != NULL )
+if ( sep != NULL )
{
-/* get path to program directory */
-sep = strrchr( resolved, SEPARATOR );
-
-if ( sep != NULL )
-{
-pos = sep - resolved;
-path = (char*) malloc( pos + 1 );
-strncpy( path, resolved, pos );
-path[ pos ] = '\0';
-free( file );
-break;
-}
+pos = sep - resolved;
+path = (char*) malloc( pos + 1 );
+strncpy( path, resolved, pos );
+path[ pos ] = '\0';
+free( file );
+break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppu/source
cppu/source/typelib/typelib.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit df9efbd53d148c713f7d5c391ac06d873b9b4cc1
Author: Caolán McNamara caol...@redhat.com
Date: Sat Nov 15 15:34:51 2014 +
coverity#440589 silence Write to pointer after free
Change-Id: I85bb3b8cb0ba25e5ebd0a0fff84bda51792cc743
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 392f012..9ab878c 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -1557,6 +1557,7 @@ extern C CPPU_DLLPUBLIC void SAL_CALL
typelib_typedescription_register(
{
// switch from !OnDemand to OnDemand, so the description
must be relesed
assert(pTDR-pType-nRefCount 1);
+// coverity[freed_arg] - pType's nRefCount is 1 here
typelib_typedescription_release( pTDR-pType );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/textdata.hxx | 15 ---
vcl/source/edit/textdoc.cxx | 80 -
vcl/source/edit/textdoc.hxx | 16 +--
vcl/source/edit/texteng.cxx | 92 +--
vcl/source/edit/textundo.cxx |8 +--
vcl/source/edit/textview.cxx | 44 ++--
6 files changed, 119 insertions(+), 136 deletions(-)
New commits:
commit 63d8977f9fb0618d36dc8e0ee2f8068b1af92fe6
Author: Michaël Lefèvre lefevr...@yahoo.fr
Date: Sat Nov 15 11:41:49 2014 +0100
fdo#75757 remove inheritance from std::vector
For TextDoc, also removing ToolsList
Change-Id: Id818f61f562317ce106414937253f1748a33315a
Reviewed-on: https://gerrit.libreoffice.org/12454
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 6af42ee..fe37fbd 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -150,21 +150,6 @@ struct TEIMEInfos
void DestroyAttribs();
};
-// - Wrapper for old Tools List ---
-
-#include vector
-#include algorithm
-
-template class T class ToolsList : public ::std::vector T
-{
-public:
-size_t Count() const { return ::std::vector T ::size(); }
-size_t GetPos( T pObject ) const { return ( ::std::find( this-begin(),
this-end(), pObject ) ) - this-begin(); }
-T GetObject( size_t nIndex ) const { return (*this)[nIndex]; }
-void Insert( T pObject, size_t nPos ) { ::std::vector T ::insert(
this-begin()+nPos, pObject ); }
-void Remove( size_t nPos ) { ::std::vector T ::erase(
this-begin()+nPos ); }
-};
-
#endif // INCLUDED_VCL_TEXTDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 560284c..324d81b 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -407,38 +407,33 @@ void TextNode::Append( const TextNode rNode )
}
}
+bool TextNode::operator==(TextNode const other) const
+{
+ return maText == other.maText maCharAttribs == other.maCharAttribs;
+}
+
+
+
TextDoc::TextDoc()
{
mnLeftMargin = 0;
};
-TextDoc::~TextDoc()
-{
-DestroyTextNodes();
-}
-
void TextDoc::Clear()
{
-DestroyTextNodes();
-}
-
-void TextDoc::DestroyTextNodes()
-{
-for ( sal_uLong nNode = 0; nNode maTextNodes.Count(); nNode++ )
-delete maTextNodes.GetObject( nNode );
maTextNodes.clear();
}
OUString TextDoc::GetText( const sal_Unicode* pSep ) const
{
-sal_uLong nNodes = maTextNodes.Count();
+sal_uLong nNodes = maTextNodes.size();
OUString aASCIIText;
sal_uLong nLastNode = nNodes-1;
for ( sal_uLong nNode = 0; nNode nNodes; nNode++ )
{
-TextNode* pNode = maTextNodes.GetObject( nNode );
-OUString aTmp( pNode-GetText() );
+const TextNode pNode = maTextNodes[ nNode ];
+OUString aTmp( pNode.GetText() );
aASCIIText += aTmp;
if ( pSep ( nNode != nLastNode ) )
aASCIIText += pSep;
@@ -451,9 +446,8 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
{
OUString aText;
-TextNode* pNode = ( nPara maTextNodes.Count() ) ? maTextNodes.GetObject(
nPara ) : 0;
-if ( pNode )
-aText = pNode-GetText();
+if ( nPara maTextNodes.size() )
+aText = maTextNodes[ nPara ].GetText();
return aText;
}
@@ -461,7 +455,7 @@ OUString TextDoc::GetText( sal_uLong nPara ) const
sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection*
pSel ) const
{
sal_uLong nLen = 0;
-sal_uLong nNodes = maTextNodes.Count();
+sal_uLong nNodes = maTextNodes.size();
if ( nNodes )
{
sal_uLong nStartNode = 0;
@@ -474,10 +468,10 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep,
const TextSelection* pSe
for ( sal_uLong nNode = nStartNode; nNode = nEndNode; nNode++ )
{
-TextNode* pNode = maTextNodes.GetObject( nNode );
+const TextNode pNode = maTextNodes[ nNode ];
sal_uInt16 nS = 0;
-sal_Int32 nE = pNode-GetText().getLength();
+sal_Int32 nE = pNode.GetText().getLength();
if ( pSel ( nNode == pSel-GetStart().GetPara() ) )
nS = pSel-GetStart().GetIndex();
if ( pSel ( nNode == pSel-GetEnd().GetPara() ) )
@@ -495,11 +489,11 @@ sal_uLong TextDoc::GetTextLen( const sal_Unicode* pSep,
const TextSelection* pSe
TextPaM TextDoc::InsertText( const TextPaM rPaM, sal_Unicode c )
{
-DBG_ASSERT( c != 0x0A, TextDoc::InsertText: Zeilentrenner in Absatz nicht
erlaubt! );
-DBG_ASSERT( c != 0x0D, TextDoc::InsertText: Zeilentrenner in Absatz nicht
erlaubt! );
+DBG_ASSERT( c != 0x0A, TextDoc::InsertText: Newline not allowed in
paragraph! );
+DBG_ASSERT( c != 0x0D, TextDoc::InsertText: Newline not allowed in
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #47 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=63d8977f9fb0618d36dc8e0ee2f8068b1af92fe6 fdo#75757 remove inheritance from std::vector It will be available in 4.4.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: offapi/com
offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 9dab243b69fa89766f7952923a409b32aa693f67
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 13:35:45 2014 +0200
Mention how the new OpenCL configuration relates to this API
Change-Id: I0e5b8d7a6cca469efb263d0037b87e0a9475371e
diff --git a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
index 994867e..9fe3098 100644
--- a/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
+++ b/offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl
@@ -15,12 +15,19 @@ interface XOpenCLSelection : com::sun::star::uno::XInterface
{
/**
- * Returns true if calculation with OpenCL is enabled
+ * Returns true if calculation with OpenCL is enabled (at all).
+ * The actual use of OpenCL for a formula is also affected by the
+ * configuration settings specifying whether OpenCL is used for
+ * all opcodes or just for a subset, and the black- and whitelists
+ * of OpenCL implementations that are in use.
*/
boolean isOpenCLEnabled();
/**
- * Enables or disables OpenCL
+ * Enables or disables use of OpenCL for calculations. When using
+ * this API to enable OpenCL the configuration parameters are set
+ * to their built-in default values, not ones read from the
+ * installation of user-specific configuration.
*/
void enableOpenCL( [in] boolean enable );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - svx/source sw/CppunitTest_sw_odfexport.mk sw/qa sw/source
svx/source/svdraw/svdograf.cxx|
2
sw/CppunitTest_sw_odfexport.mk|
4
sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
|binary
sw/qa/extras/odfexport/odfexport.cxx |
50 ++
sw/source/core/graphic/ndgrf.cxx |
4
5 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit 6cba38d1dbf264e15ba8de0127c055b281f7fe28
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Sun Nov 16 15:12:54 2014 +0100
Related fdo#82953: Forget package URL of image after it is loaded
It causes problems if we handle those imported images differently which
are identified by a package URL, so after the first load remove
this URL and handle images on the same way as inserted images.
Some related bugs:
* #i44367#
* #i124946#
* #i114361#
* fdo#73270
The image in the test document has a special ID which is different
from that one which is generated by LO internally so after ODF export
the new generated image URL is different from the imported one.
Change-Id: I4e7d3490674c5f86bec5c7c6e1c975dcafd7c265
(cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e)
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ca73543..d5eb41f 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1364,7 +1364,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
const OUString aNewUserData( pGraphic-GetUserData() );
pGraphic-SetGraphic( aGraphic );
-pGraphic-SetUserData( aNewUserData );
+pGraphic-SetUserData();
// Graphic successfully swapped in.
pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 080a840..97398af 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -80,6 +80,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
xmloff/util/xo \
))
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\
+officecfg/registry \
+))
+
$(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
diff --git
a/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
new file mode 100644
index 000..867c075
Binary files /dev/null and
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index c140540..d7360ba 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -17,6 +17,9 @@
#include com/sun/star/text/RelOrientation.hpp
#include com/sun/star/text/XDocumentIndex.hpp
#include com/sun/star/drawing/TextVerticalAdjust.hpp
+#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/graphic/XGraphic.hpp
+#include officecfg/Office/Common.hxx
class Test : public SwModelTestBase
{
@@ -401,6 +404,53 @@ DECLARE_ODFEXPORT_TEST(testTextboxRoundedCorners,
textbox-rounded-corners.odt)
CPPUNIT_ASSERT_EQUAL(OUString(a), xCell-getString());
}
+DECLARE_ODFEXPORT_TEST(testImageWithSpecialID,
document_with_two_images_with_special_IDs.odt)
+{
+// Here the problem was that LO did not handle well those image URLs in
the ODT file which are
+// not match with that one which is generated by LO internaly (based on
the image's size, type and so on)
+
+// Trigger swap out mechanism to test swapped state factor too.
+boost::shared_ptr comphelper::ConfigurationChanges
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
batch);
+batch-commit();
+
+uno::Referencedrawing::XShape xImage = getShape(1);
+uno::Reference beans::XPropertySet XPropSet( xImage,
uno::UNO_QUERY_THROW );
+// Check URL
+{
+OUString sURL;
+XPropSet-getPropertyValue(GraphicURL) = sURL;
+CPPUNIT_ASSERT(sURL !=
OUString(vnd.sun.star.GraphicObject:));
+}
+// Check size
+{
+uno::Referencegraphic::XGraphic xGraphic;
+XPropSet-getPropertyValue(Graphic) = xGraphic;
+uno::Referenceawt::XBitmap xBitmap(xGraphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBitmap.is());
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(610),
xBitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(381),
xBitmap-getSize().Height );
+}
+// Second Image
+xImage = getShape(2);
+XPropSet.set(
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/inc
vcl/inc/unx/salgdi.h |5 - 1 file changed, 5 deletions(-) New commits: commit 4bf414c1f6a94733a63ff97b43c2b5cabddfcf82 Author: Michael Meeks michael.me...@collabora.com Date: Tue Nov 18 11:56:00 2014 + vcl: remove old GetOpenGLContext method. Change-Id: I1959b2e4aabdee92472fed31905fea44b989230d diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 6bf4c04..5caf7b9 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -32,8 +32,6 @@ #include sallayout.hxx #include vclpluginapi.h -#include opengl/contextprovider.hxx - #include boost/scoped_ptr.hpp #include deque @@ -300,9 +298,6 @@ public: unsigned int w, unsigned int h, int dest_x, int dest_y ); static void releaseGlyphPeer(); - -public: -virtual OpenGLContext* GetOpenGLContext() const SAL_OVERRIDE; }; inline const SalDisplay *X11SalGraphics::GetDisplay() const ___ 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' - svx/source
svx/source/table/svdotable.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 9811ffe8b53307cb5fa9a365c4f7f9ba25a0a3a5
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 13 14:31:09 2014 +
impress tables are not interactively growing
the optimization here stops tables growing as their text
contents change in editing mode
So, just recalculate if the table could grow and its
being interactively edited, which leaves the original
(dubious ?) load-time optimization in place
Change-Id: I894acf47d34ec8b68aaf9076b5a0cb7e29c38a17
(cherry picked from commit 22ef69b25fa60f4543dc72cb7a8d2f88b789ce43)
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index fbd532a..0345677 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -689,16 +689,17 @@ sal_Int32 SdrTableObjImpl::getRowCount() const
return mxTable.is() ? mxTable-getRowCount() : 0;
}
-
-
void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool bFitWidth, bool
bFitHeight )
{
if( mpLayouter mpTableObj-GetModel() )
{
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
+bool bInteractiveMightGrowBecauseTextChanged =
+mpTableObj-IsRealyEdited() (mpTableObj-IsAutoGrowHeight() ||
mpTableObj-IsAutoGrowWidth());
WritingMode writingMode = mpTableObj-GetWritingMode();
-if( lastLayoutTable != this || lastLayoutInputRectangle != rArea
+if( bInteractiveMightGrowBecauseTextChanged
+|| lastLayoutTable != this || lastLayoutInputRectangle != rArea
|| lastLayoutFitWidth != bFitWidth || lastLayoutFitHeight !=
bFitHeight
|| lastLayoutMode != writingMode
|| lastRowCount != getRowCount()
@@ -722,8 +723,6 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool
bFitWidth, bool bFitHe
}
}
-
-
void SdrTableObjImpl::UpdateCells( Rectangle rArea )
{
if( mpLayouter mxTable.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Attempt to make vcl::Timer use boost's Signals2
Hi all,
I'm attempting to get Timer to use boost's Signals2. When I compile,
however, I get a warning and an error:
http://pastebin.com/Vijr6Cfk
The error is:
[ CXX ] vcl/source/window/cursor.cxx
[ CXX ] vcl/source/window/debugevent.cxx
In file included from
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/detail/maybe_include.hpp:13:0,
from
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/detail/function_iterate.hpp:14,
from
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/preprocessor/iteration/detail/iter/forward1.hpp:47,
from
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function.hpp:64,
from
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/signals2/signal.hpp:18,
from
/home/chris/repos/LibreOffice/core/include/vcl/timer.hxx:23,
from
/home/chris/repos/LibreOffice/core/include/vcl/animate.hxx:24,
from
/home/chris/repos/LibreOffice/core/include/vcl/graph.hxx:28,
from
/home/chris/repos/LibreOffice/core/include/vcl/metaact.hxx:32,
from
/home/chris/repos/LibreOffice/core/include/vcl/outdev.hxx:35,
from
/home/chris/repos/LibreOffice/core/include/vcl/metric.hxx:25,
from
/home/chris/repos/LibreOffice/core/include/vcl/svapp.hxx:41,
from
/home/chris/repos/LibreOffice/core/vcl/source/window/cursor.cxx:20:
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/function_template.hpp:
In instantiation of ‘void boost::function0R::assign_to(Functor) [with
Functor = void (vcl::Cursor::*)(); R = void]’:
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/function_template.hpp:722:7:
required from ‘boost::function0R::function0(Functor, typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
int::type) [with Functor = void (vcl::Cursor::*)(); R = void; typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
int::type = int]’
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/function_template.hpp:1069:16:
required from ‘boost::functionR()::function(Functor, typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
int::type) [with Functor = void (vcl::Cursor::*)(); R = void; typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
int::type = int]’
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/function_template.hpp:1124:5:
required from ‘typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
boost::functionR()::type boost::functionR()::operator=(Functor) [with
Functor = void (vcl::Cursor::*)(); R = void; typename
boost::enable_if_cboost::type_traits::ice_notboost::is_integralFunctor::value::value,
boost::functionR()::type = boost::functionvoid()]’
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/signals2/detail/slot_template.hpp:156:24:
required from ‘void boost::signals2::slotR(Args ...),
SlotFunction::init_slot_function(const F) [with F = void
(vcl::Cursor::*)(); SlotFunction = boost::functionvoid(); R = void; Args
= {}]’
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/signals2/detail/slot_template.hpp:81:29:
required from ‘boost::signals2::slotR(Args ...),
SlotFunction::slot(const F) [with F = void (vcl::Cursor::*)();
SlotFunction = boost::functionvoid(); R = void; Args = {}]’
/home/chris/repos/LibreOffice/core/vcl/source/window/cursor.cxx:174:83:
required from here
/home/chris/repos/LibreOffice/core/workdir/UnpackedTarball/boost/boost/function/function_template.hpp:924:9:
error: no class template named ‘apply’ in ‘struct
boost::detail::function::get_invoker0boost::detail::function::member_ptr_tag’
handler_type;
^
make[1]: ***
[/home/chris/repos/LibreOffice/core/workdir/CxxObject/vcl/source/window/cursor.o]
Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [vcl.all] Error 2
Does anyone with any knowledge know where I might be going wrong?
You can review the patch at https://gerrit.libreoffice.org/#/c/12950/
Thanks,
Chris
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- sc/source/core/tool/calcconfig.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a81a24b6a33fca9a750077d9160ebb8316b2fb26 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 18 14:49:50 2014 +0200 Bump the minimum group size for OpenCL to 100 Change-Id: Id877823d760236bb731900711e3260a29c5c6871 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index b31a2e1..425f9b8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1363,7 +1363,7 @@ info descAn approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered./desc /info - value20/value + value100/value /prop prop oor:name=OpenCLSubsetOpCodes oor:type=xs:string 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 a8527ad..0ba4cdf 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -38,7 +38,7 @@ void ScCalcConfig::setOpenCLConfigToDefault() mbOpenCLEnabled = true; mbOpenCLSubsetOnly = true; mbOpenCLAutoSelect = true; -mnOpenCLMinimumFormulaGroupSize = 20; +mnOpenCLMinimumFormulaGroupSize = 100; maOpenCLSubsetOpCodes.insert(ocRandom); maOpenCLSubsetOpCodes.insert(ocSin); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/layact.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 60d34e1c840d2c317bb7d0a5b14f4602c22b3fcc
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 12 20:33:06 2014 +
coverity#735517 Logically dead code
its possible that this was the original intent, maybe
Change-Id: Ia7ab679b84f16ae7aab201b43eb69ce6a693c0f2
Reviewed-on: https://gerrit.libreoffice.org/12392
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 122567b..355f5e5 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -473,8 +473,7 @@ void SwLayAction::InternalAction()
sal_uInt16 nPercentPageNum = 0;
while ( (pPage !IsInterrupt()) || nCheckPageNum != USHRT_MAX )
{
-if ( !pPage nCheckPageNum != USHRT_MAX
- (!pPage || pPage-GetPhyPageNum() = nCheckPageNum) )
+if (!pPage || (nCheckPageNum != USHRT_MAX pPage-GetPhyPageNum() =
nCheckPageNum))
{
if ( !pPage || pPage-GetPhyPageNum() nCheckPageNum )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source
filter/source/graphicfilter/ios2met/ios2met.cxx | 29 ++--
1 file changed, 17 insertions(+), 12 deletions(-)
New commits:
commit 4d511b91d2fef9e316bcc9fecc33e2ceacaeebd4
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 17 15:22:08 2014 +
afl: divide-by-zero
(cherry picked from commit eb6d27321d2d5f9d069c4a3cbcc9bc6e5b4c98ab)
Change-Id: Ided311873f654c0f40dae57c8876a6412ee97d3e
Reviewed-on: https://gerrit.libreoffice.org/12515
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 2b3d25b..e80ee85 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -770,20 +770,18 @@ Color OS2METReader::GetPaletteColor(sal_uInt32 nIndex)
sal::static_int_cast sal_uInt8 (nIndex0xff));
}
-
sal_uInt16 OS2METReader::ReadBigEndianWord()
{
-sal_uInt8 nLo,nHi;
+sal_uInt8 nLo(0), nHi(0);
pOS2MET-ReadUChar( nHi ).ReadUChar( nLo );
return (((sal_uInt16)nHi)8)|(((sal_uInt16)nLo)0x00ff);
}
sal_uLong OS2METReader::ReadBigEndian3BytesLong()
{
-sal_uInt16 nLo;
-sal_uInt8 nHi;
+sal_uInt8 nHi(0);
pOS2MET-ReadUChar( nHi );
-nLo=ReadBigEndianWord();
+sal_uInt16 nLo = ReadBigEndianWord();
return sal_uLong)nHi)16)0x00ff)|((sal_uLong)nLo);
}
@@ -2354,7 +2352,14 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType,
sal_uInt16 nFieldSize)
pOS2MET-SeekRel(4);
nStartIndex=ReadBigEndianWord();
pOS2MET-SeekRel(3);
-pOS2MET-ReadUChar( nbyte );
nBytesPerCol=((sal_uInt16)nbyte) 0x00ff;
+pOS2MET-ReadUChar( nbyte );
+nBytesPerCol=((sal_uInt16)nbyte) 0x00ff;
+if (nBytesPerCol == 0)
+{
+pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR);
+ErrorCode=4;
+break;
+}
nEndIndex=nStartIndex+(nElemLen-11)/nBytesPerCol;
for (i=nStartIndex; inEndIndex; i++) {
if (nBytesPerCol 3) pOS2MET-SeekRel(nBytesPerCol-3);
@@ -2553,10 +2558,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType,
sal_uInt16 nFieldSize)
void OS2METReader::ReadOS2MET( SvStream rStreamOS2MET, GDIMetaFile
rGDIMetaFile )
{
-sal_uInt16 nFieldSize;
-sal_uInt16 nFieldType;
sal_uLong nPercent, nLastPercent;
-sal_uInt8 nMagicByte;
ErrorCode=0;
@@ -2622,6 +2624,7 @@ void OS2METReader::ReadOS2MET( SvStream rStreamOS2MET,
GDIMetaFile rGDIMetaF
sal_uInt64 const nStartPos = pOS2MET-Tell();
sal_uInt64 const nRemaining = pOS2MET-remainingSize();
+
Callback(0); nLastPercent=0;
sal_uInt64 nPos = pOS2MET-Tell();
@@ -2634,15 +2637,17 @@ void OS2METReader::ReadOS2MET( SvStream
rStreamOS2MET, GDIMetaFile rGDIMetaF
nLastPercent=nPercent;
}
-nFieldSize=ReadBigEndianWord();
-
+sal_uInt16 nFieldSize = ReadBigEndianWord();
+sal_uInt8 nMagicByte(0);
pOS2MET-ReadUChar( nMagicByte );
if (nMagicByte!=0xd3) {
pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR);
ErrorCode=7;
break;
}
-pOS2MET-ReadUInt16( nFieldType );
+
+sal_uInt16 nFieldType(0);
+pOS2MET-ReadUInt16(nFieldType);
pOS2MET-SeekRel(3);
nPos+=8; nFieldSize-=8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 7bd4d1e9180e8c380e634bc231286034db151716 Author: Michael Weghorn m.wegh...@posteo.de Date: Tue Nov 18 12:04:36 2014 + remove duplicate code line Change-Id: Ia1e9d2b31698db23029e4dd5f0f7659acff5d30f Reviewed-on: https://gerrit.libreoffice.org/12951 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 9954f8a..e680b4d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -217,7 +217,6 @@ javaPluginError jfw_plugin_getAllJavaInfos( OSL_ASSERT(sMinVersion); OSL_ASSERT(sMaxVersion); OSL_ASSERT(parJavaInfo); -OSL_ASSERT(parJavaInfo); OSL_ASSERT(nLenInfoList); if (!sVendor || !sMinVersion || !sMaxVersion || !parJavaInfo || !nLenInfoList) return JFW_PLUGIN_E_INVALID_ARG; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - avmedia/inc avmedia/source include/vcl sfx2/source svtools/source svx/source vcl/source
avmedia/inc/mediacontrol.hxx |2 +-
avmedia/source/framework/mediacontrol.cxx | 12 ++--
include/vcl/toolbox.hxx |2 +-
sfx2/source/control/dispatch.cxx | 24
svtools/source/contnr/imivctl.hxx |2 +-
svtools/source/contnr/imivctl1.cxx| 16
svx/source/tbxctrls/grafctrl.cxx |8
vcl/source/window/toolbox.cxx |4 ++--
vcl/source/window/toolbox2.cxx|4 ++--
9 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 2348cc7996df846fca2c275c2c0d733dbb949be6
Author: Jennifer Liebel jliebe...@gmail.com
Date: Tue Nov 18 13:07:45 2014 +
changed timers to idle
Change-Id: I0d2119a297c9a6d9b99676a561ddf4dd654ecaea
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 099a0fc..4d367a5 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -86,7 +86,7 @@ private:
DECL_LINK(implTimeoutHdl, void *);
ImageList maImageList;
-Timer maTimer;
+IdlemaIdle;
MediaItem maItem;
ToolBox maPlayToolBox;
Slider maTimeSlider;
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index 96235e3..5d64845 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -188,9 +188,9 @@ MediaControl::MediaControl( vcl::Window* pParent,
MediaControlStyle eControlStyl
maMinSize.Height() = ( maMinSize.Height() 1 ) +
AVMEDIA_CONTROLOFFSET;
}
-maTimer.SetTimeout( AVMEDIA_TIMEOUT );
-maTimer.SetTimeoutHdl( LINK( this, MediaControl, implTimeoutHdl ) );
-maTimer.Start();
+maIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
+maIdle.SetIdleHdl( LINK( this, MediaControl, implTimeoutHdl ) );
+maIdle.Start();
}
@@ -432,7 +432,7 @@ Image MediaControl::implGetImage( sal_Int32 nImageId ) const
IMPL_LINK( MediaControl, implTimeHdl, Slider*, p )
{
mbLocked = true;
-maTimer.Stop();
+maIdle.Stop();
implUpdateTimeField( p-GetThumbPos() * maItem.getDuration() /
AVMEDIA_TIME_RANGE );
return 0;
@@ -447,7 +447,7 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
aExecItem.setTime( p-GetThumbPos() * maItem.getDuration() /
AVMEDIA_TIME_RANGE );
execute( aExecItem );
update();
-maTimer.Start();
+maIdle.Start();
mbLocked = false;
return 0;
@@ -596,7 +596,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
IMPL_LINK_NOARG(MediaControl, implTimeoutHdl)
{
update();
-maTimer.Start();
+maIdle.Start();
return 0;
}
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e8161b7..3f2fbc1 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -129,7 +129,7 @@ private:
ImplToolBoxPrivateData* mpData;
std::vectorImplToolSize maFloatSizes;
ImageList maImageList;
-Timer maTimer;
+IdlemaIdle;
Rectangle maUpperRect;
Rectangle maLowerRect;
Rectangle maOutDockRect;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b471b3e..b465159 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -111,7 +111,7 @@ struct SfxDispatcher_Impl
const SfxSlotServer* pCachedServ1; // last called message
const SfxSlotServer* pCachedServ2; // penultimate called Message
SfxShellStack_Impl aStack;// active functionality
-TimeraTimer;// for Flush
+Idle aIdle;// for Flush
std::dequeSfxToDo_Impl aToDoStack;// not processed Push/Pop
SfxViewFrame*pFrame;// NULL or associated Frame
SfxDispatcher* pParent; // AppDispatcher, NULL if possible
@@ -339,8 +339,8 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
pImp-xPoster = new SfxHintPoster(aGenLink);
-pImp-aTimer.SetTimeout(SFX_FLUSH_TIMEOUT);
-pImp-aTimer.SetTimeoutHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
+pImp-aIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM);
+pImp-aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) );
}
SfxDispatcher::SfxDispatcher( SfxDispatcher* pParent )
@@ -381,7 +381,7 @@ SfxDispatcher::~SfxDispatcher()
#endif
// So that no timer by Reschedule in PlugComm strikes the
LeaveRegistrations
-pImp-aTimer.Stop();
+pImp-aIdle.Stop();
pImp-xPoster-SetEventHdl( Link() );
// Notify the stack varialbles in Call_Impl
@@ -475,14 +475,14 @@ void SfxDispatcher::Pop(SfxShell rShell, sal_uInt16
nMode)
if(!pSfxApp-IsDowning() !pImp-aToDoStack.empty())
{
// No immediate update is requested
-
Re: Attempt to make vcl::Timer use boost's Signals2
On Tue, 2014-11-18 at 23:50 +1100, Chris Sherlock wrote: Hi all, I'm attempting to get Timer to use boost's Signals2. When you do that, could you apply pimpl pattern to hide its boost usages from the header? Timer is used in a lot of call sites, and adding yet another boost template to such a public header would further degrade build time and potentially increase the size of the binary. I've started working on applying pimpl patterns to those public headers which have recently been converted to use boost, STL etc (these are quite many in vcl now). Not adding new ones would be greatly appreciated. Thanks! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xetable.cxx | 60 -
sc/source/filter/inc/xetable.hxx |3 +
2 files changed, 55 insertions(+), 8 deletions(-)
New commits:
commit a074320cb9bc9abddbe6b5c181377fe8c77ee441
Author: Michael Meeks michael.me...@collabora.com
Date: Thu Oct 30 22:51:59 2014 +
Thread excel table row/column format finalization.
Change-Id: I6ddc0270831989291893b170d57fea14329a26ba
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index cae6460..770f30e 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -34,6 +34,8 @@
#include xeescher.hxx
#include xeextlst.hxx
#include tokenarray.hxx
+#include thread
+#include comphelper/threadpool.hxx
using namespace ::oox;
@@ -1777,7 +1779,7 @@ void XclExpRow::AppendCell( XclExpCellRef xCell, bool
bIsMergedBase )
InsertCell( xCell, maCellList.GetSize(), bIsMergedBase );
}
-void XclExpRow::Finalize( const ScfUInt16Vec rColXFIndexes )
+void XclExpRow::Finalize( const ScfUInt16Vec rColXFIndexes, bool bProgress )
{
size_t nPos, nSize;
@@ -1911,10 +1913,10 @@ void XclExpRow::Finalize( const ScfUInt16Vec
rColXFIndexes )
++nPos;
}
-// progress bar includes disabled rows
-GetProgressBar().Progress();
+// progress bar includes disabled rows; only update it in the lead thread.
+if (bProgress)
+GetProgressBar().Progress();
}
-
sal_uInt16 XclExpRow::GetFirstUsedXclCol() const
{
return maCellList.IsEmpty() ? 0 : maCellList.GetFirstRecord()-GetXclCol();
@@ -2038,15 +2040,58 @@ void XclExpRowBuffer::CreateRows( SCROW nFirstFreeScRow
)
GetOrCreateRow( ::std::max ( nFirstFreeScRow - 1, GetMaxPos().Row()
), true );
}
+class RowFinalizeTask : public comphelper::ThreadTask
+{
+bool mbProgress;
+const ScfUInt16Vec mrColXFIndexes;
+std::vector XclExpRow * maRows;
+public:
+ RowFinalizeTask( const ScfUInt16Vec rColXFIndexes,
+ bool bProgress ) :
+ mbProgress( bProgress ),
+ mrColXFIndexes( rColXFIndexes ) {}
+virtual ~RowFinalizeTask() {}
+void push_back( XclExpRow *pRow ) { maRows.push_back( pRow ); }
+virtual void doWork()
+{
+for (size_t i = 0; i maRows.size(); i++ )
+maRows[ i ]-Finalize( mrColXFIndexes, mbProgress );
+}
+};
+
void XclExpRowBuffer::Finalize( XclExpDefaultRowData rDefRowData, const
ScfUInt16Vec rColXFIndexes )
{
// *** Finalize all rows *** --
GetProgressBar().ActivateFinalRowsSegment();
-RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end();
-for (itr = itrBeg; itr != itrEnd; ++itr)
-itr-second-Finalize(rColXFIndexes);
+// This is staggeringly slow, and each element operates only
+// on its own data.
+size_t nRows = maRowMap.size();
+size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U );
+if ( nThreads == 1 || nRows 128 )
+{
+RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd =
maRowMap.end();
+for (itr = itrBeg; itr != itrEnd; ++itr)
+itr-second-Finalize( rColXFIndexes, true );
+}
+else
+{
+comphelper::ThreadPool rPool =
comphelper::ThreadPool::getSharedOptimalPool();
+std::vectorRowFinalizeTask* pTasks(nThreads, NULL);
+for ( size_t i = 0; i nThreads; i++ )
+pTasks[ i ] = new RowFinalizeTask( rColXFIndexes, i == 0 );
+
+RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd =
maRowMap.end();
+size_t nIdx = 0;
+for ( itr = itrBeg; itr != itrEnd; ++itr, ++nIdx )
+pTasks[ nIdx % nThreads ]-push_back( itr-second.get() );
+
+for ( size_t i = 0; i nThreads; i++ )
+rPool.pushTask( pTasks[ i ] );
+
+rPool.waitUntilEmpty();
+}
// *** Default row format *** -
@@ -2059,6 +2104,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData
rDefRowData, const ScfUInt
XclExpRow* pPrev = NULL;
typedef std::vector XclExpRow* XclRepeatedRows;
XclRepeatedRows aRepeated;
+RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end();
for (itr = itrBeg; itr != itrEnd; ++itr)
{
const RowRef rRow = itr-second;
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 081bdb4..7fca5e4 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -857,7 +857,8 @@ public:
voidAppendCell( XclExpCellRef xCell, bool bIsMergedBase );
/** Converts all XF identifiers into the Excel XF indexes. */
-voidFinalize( const ScfUInt16Vec rColXFIndexes );
+voidFinalize( const ScfUInt16Vec rColXFIndexes,
+ bool
[Libreoffice-commits] core.git: 2 commits - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 243 +---
1 file changed, 110 insertions(+), 133 deletions(-)
New commits:
commit 8c27c4acee4faa3383629c66b6c46a2e9973be50
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 14:26:33 2014 +0100
Pass by ref
Change-Id: I88def7e41a31948d1d7205cd5522b63de6be5f80
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 127494d..dd6335e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -231,7 +231,7 @@ extern C void JNICALL abort_handler()
*/
javaPluginError checkJavaVersionRequirements(
-rtl::ReferenceVendorBase aVendorInfo,
+rtl::ReferenceVendorBase const aVendorInfo,
rtl_uString *sMinVersion,
rtl_uString *sMaxVersion,
rtl_uString * * arExcludeList,
commit 8c36dc2cbca36e8adccb6fab648f1910882280b5
Author: Michael Weghorn m.wegh...@posteo.de
Date: Mon Nov 17 16:23:47 2014 +
sunjavaplugin.cxx: extracted function for Java version check
extracted the (duplicate) code which is responsible to check the Java
version requirements in the two functions
jfw_plugin_getAllJavaInfos and jfw_plugin_getJavaInfoByPath
Change-Id: I8acb198c4b4aaee77dc84bc42ff1fc2e0da2aba7
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index e680b4d..127494d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -202,6 +202,105 @@ extern C void JNICALL abort_handler()
}
}
+/** helper function to check Java version requirements
+
+This function checks if the Java version of the given VendorBase
+meets the given Java version requirements.
+
+@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.
+@param sMaxVersion
+[in] represents the maximum version of a JRE. The string can be empty
but
+a null pointer is not allowed.
+@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.
+@param nLenList
+[in] the number of version strings contained in
codearExcludeList/code.
+
+ @return
+JFW_PLUGIN_E_NONE the function ran successfully and the version
requirements are met
+JFW_PLUGIN_E_FAILED_VERSION at least one of the version requirements
(minVersion,
+maxVersion, excludeVersions) was violated
+JFW_PLUGIN_E_WRONG_VERSION_FORMAT the version strings in
+codesMinVersion,sMaxVersion,arExcludeList/code are not recognized as
valid
+version strings.
+
+ */
+javaPluginError checkJavaVersionRequirements(
+rtl::ReferenceVendorBase aVendorInfo,
+rtl_uString *sMinVersion,
+rtl_uString *sMaxVersion,
+rtl_uString * * arExcludeList,
+sal_Int32 nLenList)
+{
+OUString ouMinVer(sMinVersion);
+OUString ouMaxVer(sMaxVersion);
+
+if (!ouMinVer.isEmpty())
+{
+try
+{
+if (aVendorInfo-compareVersions(ouMinVer) 0)
+return JFW_PLUGIN_E_FAILED_VERSION;
+}
+catch (MalformedVersionException)
+{
+//The minVersion was not recognized as valid for this vendor.
+JFW_ENSURE(
+false,
+[Java framework]sunjavaplugin does not know version:
++ ouMinVer + for vendor: + aVendorInfo-getVendor()
++ .Check minimum Version. );
+return JFW_PLUGIN_E_WRONG_VERSION_FORMAT;
+}
+}
+
+if (!ouMaxVer.isEmpty())
+{
+try
+{
+if (aVendorInfo-compareVersions(ouMaxVer) 0)
+return JFW_PLUGIN_E_FAILED_VERSION;
+}
+catch (MalformedVersionException)
+{
+//The maxVersion was not recognized as valid for this vendor.
+JFW_ENSURE(
+false,
+[Java framework]sunjavaplugin does not know version:
++ ouMaxVer + for vendor: + aVendorInfo-getVendor()
++ .Check maximum Version. );
+return JFW_PLUGIN_E_WRONG_VERSION_FORMAT;
+}
+}
+
+for (int i = 0; i nLenList; i++)
+{
+OUString sExVer(arExcludeList[i]);
+try
+{
+if (aVendorInfo-compareVersions(sExVer) == 0)
+return JFW_PLUGIN_E_FAILED_VERSION;
+}
+catch (MalformedVersionException)
+{
+//The excluded version was not recognized as valid for this vendor.
+
[Libreoffice-commits] core.git: 24 commits - include/svl sc/inc sc/Library_sc.mk sc/qa sc/source svl/source
include/svl/broadcast.hxx |3
sc/Library_sc.mk |2
sc/inc/address.hxx|3
sc/inc/bulkdatahint.hxx | 43
sc/inc/calcmacros.hxx |3
sc/inc/clipcontext.hxx| 55 +++--
sc/inc/column.hxx | 24 +-
sc/inc/columnspanset.hxx |2
sc/inc/document.hxx | 29 +--
sc/inc/formulacell.hxx| 12 +
sc/inc/grouparealistener.hxx | 63 ++
sc/inc/sharedformula.hxx | 14 +
sc/inc/simplehintids.hxx |9
sc/inc/table.hxx | 19 +
sc/qa/unit/ucalc.cxx | 106 +++
sc/qa/unit/ucalc.hxx |2
sc/source/core/data/bcaslot.cxx | 286 +++---
sc/source/core/data/clipcontext.cxx | 232 +++-
sc/source/core/data/colorscale.cxx|2
sc/source/core/data/column.cxx| 24 ++
sc/source/core/data/column3.cxx | 88 -
sc/source/core/data/column4.cxx | 135 --
sc/source/core/data/columnspanset.cxx |5
sc/source/core/data/documen2.cxx |4
sc/source/core/data/documen7.cxx | 79 ++--
sc/source/core/data/document.cxx | 137 ++
sc/source/core/data/document10.cxx| 150 ++-
sc/source/core/data/documentimport.cxx| 22 +-
sc/source/core/data/formulacell.cxx | 58 +-
sc/source/core/data/table2.cxx| 23 +-
sc/source/core/data/table3.cxx|8
sc/source/core/data/table4.cxx|4
sc/source/core/data/table7.cxx| 17 +
sc/source/core/inc/bcaslot.hxx| 112 +++
sc/source/core/tool/address.cxx | 15 +
sc/source/core/tool/bulkdatahint.cxx | 49 +
sc/source/core/tool/chartlis.cxx |4
sc/source/core/tool/grouparealistener.cxx | 232
sc/source/core/tool/sharedformula.cxx | 89 +
sc/source/ui/docshell/macromgr.cxx|2
sc/source/ui/docshell/servobj.cxx |6
sc/source/ui/unoobj/cellsuno.cxx |4
sc/source/ui/unoobj/chart2uno.cxx |4
svl/source/notify/broadcast.cxx |9
44 files changed, 1784 insertions(+), 405 deletions(-)
New commits:
commit 4cbe6f95e00d7a8b796b019a97d06e3b3ad52b47
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 00:11:04 2014 -0500
Simplify DeleteCells to not require 2 out parameters for the same thing.
One can easily get constructed from the other after returning from the
method.
Change-Id: Iafc52efa7714b7cf4d284effda8034cb6f36bf91
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index a1466ae..1e9c7d7 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -650,7 +650,7 @@ private:
void DeleteCells(
sc::ColumnBlockPosition rBlockPos, SCROW nRow1, SCROW nRow2,
InsertDeleteFlags nDelFlag,
-std::vectorSCROW rDeleted, sc::ColumnSpanSet* pDeletedSpans = NULL
);
+sc::SingleColumnSpanSet rDeleted );
/**
* Get all non-grouped formula cells and formula cell groups in the whole
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index f397c3e..48ae7c1 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -141,6 +141,8 @@ public:
void getSpans(SpansType rSpans) const;
+void swap( SingleColumnSpanSet r );
+
private:
ColumnSpansType maSpans;
};
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index bba48f2..a58cd07 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -549,7 +549,7 @@ public:
mrDoc.EndListeningFormulaCells(maFormulaCells);
}
-const sc::SingleColumnSpanSet getSpans() const
+sc::SingleColumnSpanSet getSpans()
{
return maDeleteRanges;
}
@@ -559,7 +559,6 @@ class EmptyCells
{
ScColumn mrColumn;
sc::ColumnBlockPosition mrPos;
-sc::ColumnSpanSet* mpCellSpans;
void splitFormulaGrouping(const sc::CellStoreType::position_type rPos)
{
@@ -571,8 +570,8 @@ class EmptyCells
}
public:
-EmptyCells( sc::ColumnBlockPosition rPos, ScColumn rColumn,
sc::ColumnSpanSet* pCellSpans ) :
-mrColumn(rColumn), mrPos(rPos), mpCellSpans(pCellSpans) {}
+EmptyCells( sc::ColumnBlockPosition rPos, ScColumn rColumn ) :
+mrColumn(rColumn), mrPos(rPos) {}
void operator() (const sc::RowSpan rSpan)
{
@@ -587,9 +586,6 @@ public:
mrPos.miCellPos = rCells.set_empty(mrPos.miCellPos, rSpan.mnRow1,
rSpan.mnRow2);
mrPos.miCellTextAttrPos =
mrColumn.GetCellAttrStore().set_empty(mrPos.miCellTextAttrPos, rSpan.mnRow1,
rSpan.mnRow2);
-
-
Re: Attempt to make vcl::Timer use boost's Signals2
On Tue, 2014-11-18 at 08:20 -0500, Kohei Yoshida wrote: On Tue, 2014-11-18 at 23:50 +1100, Chris Sherlock wrote: Hi all, I'm attempting to get Timer to use boost's Signals2. When you do that, could you apply pimpl pattern to hide its boost usages from the header? If that's easily doable that is. If not, you can just leave it and I'll poke at that at some stage... Either way is fine with me. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - include/vcl vcl/source
include/vcl/opengl/OpenGLContext.hxx |1
vcl/source/opengl/OpenGLContext.cxx | 48 +--
2 files changed, 42 insertions(+), 7 deletions(-)
New commits:
commit ba6af6f9d3048673f69fac41a0b61db316d16d03
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 11:45:40 2014 +0100
windows opengl: Share the contexts as we do on Linux.
Change-Id: Ic58cca612cdf8f73170c18573917465bf34a187c
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 5ca9602..058e174 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -31,6 +31,7 @@
#if defined( _WIN32 )
#include GL/glext.h
+#include GL/wglew.h
#include GL/wglext.h
#elif defined( MACOSX )
#include OpenGL/OpenGL.h
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index cc1264b..d30ac17 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -29,8 +29,11 @@
using namespace com::sun::star;
+// TODO use rtl::Static instead of 'static'
#if defined( UNX ) !defined MACOSX !defined IOS !defined ANDROID
-static std::vector GLXContext vShareList;
+static std::vectorGLXContext vShareList;
+#elif defined(WNT)
+static std::vectorHGLRC vShareList;
#endif
GLWindow::~GLWindow()
@@ -58,6 +61,8 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
if (m_aGLWin.hRC)
{
+vShareList.erase(std::remove(vShareList.begin(), vShareList.end(),
m_aGLWin.hRC));
+
wglMakeCurrent( m_aGLWin.hDC, 0 );
wglDeleteContext( m_aGLWin.hRC );
ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
@@ -69,7 +74,7 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
if(m_aGLWin.ctx)
{
-std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx );
+vShareList.erase(std::remove( vShareList.begin(), vShareList.end(),
m_aGLWin.ctx ));
glXMakeCurrent(m_aGLWin.dpy, None, NULL);
if( glGetError() != GL_NO_ERROR )
@@ -655,13 +660,13 @@ bool OpenGLContext::ImplInit()
if (best_fbc != -1)
{
-int nContextAttribs[] =
+int pContextAttribs[] =
{
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
-m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, nContextAttribs);
+m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, pContextAttribs);
SAL_INFO_IF(m_aGLWin.ctx, vcl.opengl, created a 3.2 core
context);
}
else
@@ -825,7 +830,7 @@ bool OpenGLContext::ImplInit()
return false;
}
-m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
+HGLRC hTempRC = wglCreateContext(m_aGLWin.hDC);
if (m_aGLWin.hRC == NULL)
{
ImplWriteLastError(GetLastError(), wglCreateContext in
OpenGLContext::ImplInit);
@@ -833,19 +838,48 @@ bool OpenGLContext::ImplInit()
return false;
}
-if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+if (!wglMakeCurrent(m_aGLWin.hDC, hTempRC))
{
ImplWriteLastError(GetLastError(), wglMakeCurrent in
OpenGLContext::ImplInit);
SAL_WARN(vcl.opengl, wglMakeCurrent failed);
return false;
}
+if (!InitGLEW())
+return false;
+
+HGLRC hSharedCtx = 0;
+if (!vShareList.empty())
+hSharedCtx = vShareList.front();
+
+// now setup the shared context; this needs a temporary context already
+// set up in order to work
+m_aGLWin.hRC = wglCreateContextAttribsARB(m_aGLWin.hDC, hSharedCtx, NULL);
+if (m_aGLWin.hRC == 0)
+{
+ImplWriteLastError(GetLastError(), wglCreateContextAttribsARB in
OpenGLContext::ImplInit);
+SAL_WARN(vcl.opengl, wglCreateContextAttribsARB failed);
+return false;
+}
+
+wglMakeCurrent(NULL, NULL);
+wglDeleteContext(hTempRC);
+
+if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+{
+ImplWriteLastError(GetLastError(), wglMakeCurrent (with shared
context) in OpenGLContext::ImplInit);
+SAL_WARN(vcl.opengl, wglMakeCurrent failed);
+return false;
+}
+
+vShareList.push_back(m_aGLWin.hRC);
+
RECT clientRect;
GetClientRect(WindowFromDC(m_aGLWin.hDC), clientRect);
m_aGLWin.Width = clientRect.right - clientRect.left;
m_aGLWin.Height = clientRect.bottom - clientRect.top;
-return InitGLEW();
+return true;
}
#elif defined( MACOSX )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/check-merged.sh
bin/check-merged.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit af20dd7b50a8bd48972aaf380a26169d85a02022
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 15:11:07 2014 +0100
check-merged.sh: Fix an obvious typo.
Change-Id: I4761c730df5f418060697458b604c602713f4a0e
diff --git a/bin/check-merged.sh b/bin/check-merged.sh
index f4e7813..678afe8 100755
--- a/bin/check-merged.sh
+++ b/bin/check-merged.sh
@@ -19,7 +19,7 @@ EOF
}
function collect_change_ids {
-git log `git merge-base origin/master origin/feature/opengl-vcl`..$1 | \
+git log `git merge-base origin/master $1`..$1 | \
sed 's/^commit /XXXcommitXXX/g' | \
tr '\n' ';' | \
sed 's/XXXcommitXXX/\n/g' | \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/run
bin/run |1 -
1 file changed, 1 deletion(-)
New commits:
commit 21cf443235bf6579959988edee325e8332a42f9f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 15:37:38 2014 +0100
No need to cd into instdir/program
(and it is confusing if you pass a relative pathname argument to the program
you call via bin/run)
Change-Id: If8baef6d76e1f9ad7e5f2d361bd9b93fcbb76f7a
diff --git a/bin/run b/bin/run
index 35504e2..dffa9cf 100755
--- a/bin/run
+++ b/bin/run
@@ -48,7 +48,6 @@ echo setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}
echo setting search path to: ${LD_LIBRARY_PATH}
echo execing: ${exedir}/$1
-cd ${dir}/instdir/program
exec ${exedir}/$@
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - bin/check-merged.sh include/vcl vcl/inc vcl/opengl vcl/source vcl/unx
bin/check-merged.sh | 36 -
include/vcl/opengl/OpenGLContext.hxx |1
vcl/inc/opengl/contextprovider.hxx | 28
vcl/inc/opengl/salbmp.hxx|5 ++-
vcl/inc/salgdi.hxx |4 ++
vcl/inc/unx/salgdi.h |7 -
vcl/opengl/gdiimpl.cxx | 19 +++--
vcl/opengl/salbmp.cxx| 49 ---
vcl/opengl/scale.cxx |1
vcl/source/gdi/salgdilayout.cxx | 13 -
vcl/source/opengl/OpenGLContext.cxx | 46
vcl/unx/generic/gdi/salgdi.cxx |9 --
12 files changed, 95 insertions(+), 123 deletions(-)
New commits:
commit 4066cc6bcba2c2e8d9529a2557870e384756a098
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 15:30:24 2014 +0100
Kill check-merged.sh, 'git cherry' actually gives better results.
Change-Id: Ia4163f77f5267f6cb714369fc9a4cfbb901019df
diff --git a/bin/check-merged.sh b/bin/check-merged.sh
deleted file mode 100755
index 678afe8..000
--- a/bin/check-merged.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/bash
-#
-# check that master contains all the patches from a branch
-# and list those that are missing
-#
-
-BRANCH=$1
-[ -z $BRANCH ] {
-cat 12 EOF
-check-merged.sh branchname
-
-Checks that all the patches from branch 'branchname' are in master, and
-reports the commits that are not.
-
-The check is based on the Change-Id's, so if some commits are missing it, they
-won't be detected as missing.
-EOF
-exit 1;
-}
-
-function collect_change_ids {
-git log `git merge-base origin/master $1`..$1 | \
-sed 's/^commit /XXXcommitXXX/g' | \
-tr '\n' ';' | \
-sed 's/XXXcommitXXX/\n/g' | \
-sed -e 's/;.*Change-Id://' -e 's/;.*$//' | \
-grep -v '^$' $2
-}
-
-collect_change_ids $BRANCH /tmp/check-merged.branch
-collect_change_ids origin/master /tmp/check-merged.master
-
-cat /tmp/check-merged.branch | \
-while read COMMIT CHID ; do
-[ -n $CHID -a $CHID != ] grep -q $CHID
/tmp/check-merged.master || echo $COMMIT not in origin/master
-done
commit 4bf891dbc2ca11c5990a71bcefe771b9ce813074
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 18 11:45:40 2014 +0100
windows opengl: Share the contexts as we do on Linux.
Change-Id: Ic58cca612cdf8f73170c18573917465bf34a187c
diff --git a/include/vcl/opengl/OpenGLContext.hxx
b/include/vcl/opengl/OpenGLContext.hxx
index 215f5fe..60746df1 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -31,6 +31,7 @@
#if defined( _WIN32 )
#include GL/glext.h
+#include GL/wglew.h
#include GL/wglext.h
#elif defined( MACOSX )
#include OpenGL/OpenGL.h
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 67e4c5f..d30ac17 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -29,8 +29,11 @@
using namespace com::sun::star;
+// TODO use rtl::Static instead of 'static'
#if defined( UNX ) !defined MACOSX !defined IOS !defined ANDROID
-static std::vector GLXContext vShareList;
+static std::vectorGLXContext vShareList;
+#elif defined(WNT)
+static std::vectorHGLRC vShareList;
#endif
GLWindow::~GLWindow()
@@ -58,6 +61,8 @@ OpenGLContext::~OpenGLContext()
#if defined( WNT )
if (m_aGLWin.hRC)
{
+vShareList.erase(std::remove(vShareList.begin(), vShareList.end(),
m_aGLWin.hRC));
+
wglMakeCurrent( m_aGLWin.hDC, 0 );
wglDeleteContext( m_aGLWin.hRC );
ReleaseDC( m_aGLWin.hWnd, m_aGLWin.hDC );
@@ -655,13 +660,13 @@ bool OpenGLContext::ImplInit()
if (best_fbc != -1)
{
-int nContextAttribs[] =
+int pContextAttribs[] =
{
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
-m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, nContextAttribs);
+m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy,
pFBC[best_fbc], pSharedCtx, GL_TRUE, pContextAttribs);
SAL_INFO_IF(m_aGLWin.ctx, vcl.opengl, created a 3.2 core
context);
}
else
@@ -825,7 +830,7 @@ bool OpenGLContext::ImplInit()
return false;
}
-m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
+HGLRC hTempRC = wglCreateContext(m_aGLWin.hDC);
if (m_aGLWin.hRC == NULL)
{
ImplWriteLastError(GetLastError(), wglCreateContext in
OpenGLContext::ImplInit);
@@ -833,19 +838,48 @@ bool OpenGLContext::ImplInit()
return false;
}
-if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+if (!wglMakeCurrent(m_aGLWin.hDC, hTempRC))
{
ImplWriteLastError(GetLastError(), wglMakeCurrent in
OpenGLContext::ImplInit);
[Libreoffice-commits] core.git: 4 commits - scaddins/source sc/source
sc/source/core/inc/bcaslot.hxx|2 +-
sc/source/core/tool/grouparealistener.cxx |4 ++--
sc/source/filter/excel/xetable.cxx|2 +-
scaddins/source/analysis/analysis.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7f4222a5a59a8ccd8fcc5a56ed521bc0a9655737
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 16:16:00 2014 +0200
WaE: overriding virtual function declaration not marked 'override'
Change-Id: I82cfe96c4081afbd43fa1a9c41a9a92433f6bdb1
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 770f30e..01c286d 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2052,7 +2052,7 @@ public:
mrColXFIndexes( rColXFIndexes ) {}
virtual ~RowFinalizeTask() {}
void push_back( XclExpRow *pRow ) { maRows.push_back( pRow ); }
-virtual void doWork()
+virtual void doWork() SAL_OVERRIDE
{
for (size_t i = 0; i maRows.size(); i++ )
maRows[ i ]-Finalize( mrColXFIndexes, mbProgress );
commit cddc69f6e51d2c77214337308ceccf0a72bdf3e5
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 15:48:23 2014 +0200
WaE: overriding virtual function declaration not marked 'override'
Change-Id: I7f2dede9171f7478467a83ea000baa7da85aeac6
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 7a83461..6392192 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -40,13 +40,13 @@ public:
CollectCellAction( const FormulaGroupAreaListener rAreaListener ) :
mrAreaListener(rAreaListener) {}
-virtual void startColumn( ScColumn* pCol )
+virtual void startColumn( ScColumn* pCol ) SAL_OVERRIDE
{
maPos.SetTab(pCol-GetTab());
maPos.SetCol(pCol-GetCol());
}
-virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal )
+virtual void execute( SCROW nRow1, SCROW nRow2, bool bVal ) SAL_OVERRIDE
{
if (!bVal)
return;
commit 69183fd1a26d7f5e2b04fcc492ee02a5dae71550
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 15:44:50 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'unsigned long'
Change-Id: Icff8f89f64f335d8601ced11c83d4d30c2abac18
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 27c87f8..63e5a6b 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -101,7 +101,7 @@ struct ScBroadcastAreaHash
{
size_t operator()( const ScBroadcastAreaEntry rEntry ) const
{
-return rEntry.mpArea-GetRange().hashArea() +
rEntry.mpArea-IsGroupListening();
+return rEntry.mpArea-GetRange().hashArea() +
static_castsize_t(rEntry.mpArea-IsGroupListening());
}
};
commit ce239f392cd22a9f5ca7146272fc020395f865f5
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 15:42:27 2014 +0200
RANDBETWEEN is supposed to return an integer
Change-Id: I82e7963b55cf2ab28c193f40fe8f30e097364653
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 63a532a..c0137f3 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -702,7 +702,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin,
double fMax ) throw(
if( fMin fMax )
throw lang::IllegalArgumentException();
-double fRet = comphelper::rng::uniform_real_distribution(fMin,
boost::math::nextafter(fMax, DBL_MAX));
+double fRet = floor(comphelper::rng::uniform_real_distribution(fMin,
boost::math::nextafter(fMax+1, -DBL_MAX)));
RETURN_FINITE( fRet );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - sc/source sd/source sfx2/source
sc/source/ui/dbgui/sfiltdlg.cxx | 20 ++--
sc/source/ui/inc/filtdlg.hxx|4 ++--
sd/source/ui/inc/View.hxx |4 ++--
sd/source/ui/view/sdview.cxx| 12 ++--
sd/source/ui/view/sdview3.cxx |8
sfx2/source/dialog/basedlgs.cxx | 28 ++--
sfx2/source/dialog/dockwin.cxx | 16
7 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 8d502682aca3351deb91c3e58a1fad588131321a
Author: Tobias Madl tobias.madl@gmail.com
Date: Tue Nov 18 15:11:29 2014 +
changed timers to idles
Change-Id: I1595a9711e3d5c564f1c9028cbb756f2b0ca45f1
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 5f1e33f..d39e7c4 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -57,7 +57,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, vc
pDoc( NULL ),
pRefInputEdit ( NULL ),
bRefInputMode ( false ),
-pTimer ( NULL )
+pIdle ( NULL )
{
get(pLbFilterArea,lbfilterarea);
get(pEdFilterArea,edfilterarea);
@@ -85,10 +85,10 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB,
SfxChildWindow* pCW, vc
pEdFilterArea-GrabFocus();
// Hack: RefInput-Kontrolle
-pTimer = new Timer;
-pTimer-SetTimeout( 50 ); // 50ms warten
-pTimer-SetTimeoutHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
-pTimer-Start();
+pIdle = new Idle;
+pIdle-SetTimeout( VCL_IDLE_PRIORITY_MEDIUM ); // 50ms warten
+pIdle-SetIdleHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) );
+pIdle-Start();
pLbCopyArea-SetAccessibleName(pBtnCopyResult-GetText());
pEdCopyArea-SetAccessibleName(pBtnCopyResult-GetText());
@@ -108,8 +108,8 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg()
delete pOutItem;
// Hack: RefInput-Kontrolle
-pTimer-Stop();
-delete pTimer;
+pIdle-Stop();
+delete pIdle;
}
void ScSpecialFilterDlg::Init( const SfxItemSet rArgSet )
@@ -376,11 +376,11 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
return 0;
}
-IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
+IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle )
{
// alle 50ms nachschauen, ob RefInputMode noch stimmt
-if( (_pTimer == pTimer) IsActive() )
+if( (_pIdle == pIdle) IsActive() )
{
if( pEdCopyArea-HasFocus() || pRbCopyArea-HasFocus() )
{
@@ -399,7 +399,7 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
}
}
-pTimer-Start();
+pIdle-Start();
return 0;
}
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 1b1fdc5..e7e89cc 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -206,7 +206,7 @@ private:
boolbRefInputMode;
// Hack: RefInput control
-Timer* pTimer;
+Idle* pIdle;
private:
voidInit( const SfxItemSet rArgSet );
@@ -220,7 +220,7 @@ private:
DECL_LINK( ScrollHdl, ScrollBar* );
// Hack: RefInput control
-DECL_LINK( TimeOutHdl, Timer* );
+DECL_LINK( TimeOutHdl, Idle* );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 6714dae..290860c 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -276,8 +276,8 @@ protected:
Point maDropPos;
::std::vectorOUString maDropFileVector;
sal_Int8mnAction;
-Timer maDropErrorTimer;
-Timer maDropInsertFileTimer;
+IdlemaDropErrorIdle;
+IdlemaDropInsertFileIdle;
sal_uInt16 mnLockRedrawSmph;
boost::ptr_vectorSdViewRedrawRec maLockedRedraws;
boolmbIsDropAllowed;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 9b93c8c..488edd4 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -138,10 +138,10 @@ View::View(SdDrawDocument rDrawDoc, OutputDevice*
pOutDev,
SetMeasureLayer(SD_RESSTR(STR_LAYER_MEASURELINES));
// Timer for delayed drop (has to be for MAC)
-maDropErrorTimer.SetTimeoutHdl( LINK(this, View, DropErrorHdl) );
-maDropErrorTimer.SetTimeout(50);
-maDropInsertFileTimer.SetTimeoutHdl( LINK(this, View, DropInsertFileHdl) );
-maDropInsertFileTimer.SetTimeout(50);
+maDropErrorIdle.SetIdleHdl( LINK(this, View, DropErrorHdl) );
+maDropErrorIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM);
+maDropInsertFileIdle.SetIdleHdl( LINK(this, View, DropInsertFileHdl) );
+maDropInsertFileIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM);
}
void View::ImplClearDrawDropMarker()
@@ -160,8 +160,8 @@ View::~View()
// release content of
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table4.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ac6acd2a902a2cd2b64458b24b803993ebecb75
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 10:17:20 2014 -0500
Unnecessary casting.
Change-Id: Id7d9b28921e96842df1e7c0d735dba4d3dbb6156
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index bfc29bd..3561a04 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -448,7 +448,7 @@ void ScTable::FillFormula(
ScFormulaCell* pOrgCell = pDocument-GetFormulaCell(aOrg);
if (pOrgCell pOrgCell-GetMatrixFlag() == MM_FORMULA)
{
-((ScFormulaCell*)pOrgCell)-SetMatColsRows(
+pOrgCell-SetMatColsRows(
nDestCol - aOrg.Col() + 1,
nDestRow - aOrg.Row() + 1 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - unoidl/source
unoidl/source/unoidlprovider.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f542ad9f3022dae7439856dadb0130d66f51929a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 16:23:45 2014 +0100
Check that UNOIDL enum has members
Change-Id: I5b362ad374dad5fd4a79b8a7706defb749e25eb3
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index dc42fa1..deda03a 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -640,6 +640,10 @@ rtl::Reference Entity readEntity(
case 1: // enum type
{
sal_uInt32 n = file-read32(offset + 1);
+if (n == 0) {
+throw FileFormatException(
+file-uri, UNOIDL format: enum type with no members);
+}
if (n SAL_MAX_INT32) {
throw FileFormatException(
file-uri, UNOIDL format: too many members of enum type);
commit 55cc5a146d72b4f20d654d87d246caffbd783c20
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 16:22:43 2014 +0100
Avoid overflow
Change-Id: I4afe86dc29788a7b2d2d9c438f182726f80b1cbd
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index 68d5ebc..dc42fa1 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -1186,7 +1186,7 @@ UnoidlProvider::UnoidlProvider(OUString const uri):
file_(new MappedFile(uri))
}
sal_uInt32 off = file_-read32(8);
mapSize_ = file_-read32(12);
-if (off + 8 * mapSize_ file_-size) { //TODO: overflow
+if (off + 8 * sal_uInt64(mapSize_) file_-size) { // cannot overflow
throw FileFormatException(
file_-uri, UNOIDL format: root map offset + size too large);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx |4 ++--
sc/source/core/data/column3.cxx | 16
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 9ffb35db571f1d91bde2c8df79fbc11ddeea6497
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 10:26:27 2014 -0500
Rename Activate... - Attach...
Attach is the new one we are going with offers nice contrast with
'Detach...'.
Change-Id: I4578f4c7b9d989e41d433d7c8aa96a9317aa6919
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 1e9c7d7..b276533 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -626,8 +626,8 @@ private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
sc::CellStoreType::iterator GetPositionToInsert( const
sc::CellStoreType::iterator it, SCROW nRow );
-void ActivateNewFormulaCell( const sc::CellStoreType::iterator itPos,
SCROW nRow, ScFormulaCell rCell, bool bJoin = true );
-void ActivateNewFormulaCell( 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 );
+void AttachNewFormulaCell( const sc::CellStoreType::position_type aPos,
ScFormulaCell rCell, bool bJoin = true );
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 a58cd07..86ca776 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -374,13 +374,13 @@ sc::CellStoreType::iterator
ScColumn::GetPositionToInsert( const sc::CellStoreTy
return itRet;
}
-void ScColumn::ActivateNewFormulaCell(
+void ScColumn::AttachNewFormulaCell(
const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin )
{
-ActivateNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
+AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
}
-void ScColumn::ActivateNewFormulaCell(
+void ScColumn::AttachNewFormulaCell(
const sc::CellStoreType::position_type aPos, ScFormulaCell rCell, bool
bJoin )
{
if (bJoin)
@@ -1817,7 +1817,7 @@ void ScColumn::SetFormula( SCROW nRow, const
ScTokenArray rArray, formula::Form
CellStorageModified();
-ActivateNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell);
}
void ScColumn::SetFormula( SCROW nRow, const OUString rFormula,
formula::FormulaGrammar::Grammar eGram )
@@ -1834,7 +1834,7 @@ void ScColumn::SetFormula( SCROW nRow, const OUString
rFormula, formula::Formul
CellStorageModified();
-ActivateNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell);
}
ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell )
@@ -1848,7 +1848,7 @@ ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow,
ScFormulaCell* pCell )
CellStorageModified();
-ActivateNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell);
return pCell;
}
@@ -1864,7 +1864,7 @@ ScFormulaCell* ScColumn::SetFormulaCell(
sc::ColumnBlockPosition rBlockPos, SCR
CellStorageModified();
-ActivateNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell);
+AttachNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell);
return pCell;
}
@@ -2324,7 +2324,7 @@ void ScColumn::SetError( SCROW nRow, const sal_uInt16
nError)
CellStorageModified();
-ActivateNewFormulaCell(it, nRow, *pCell);
+AttachNewFormulaCell(it, nRow, *pCell);
}
void ScColumn::SetRawString( SCROW nRow, const OUString rStr, bool bBroadcast
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/unoidlprovider.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a177c4c77236617fcdb34c89ea2746614a232051
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 18 16:33:28 2014 +0100
Avoid overflow
Change-Id: Ia80682aeb87225b9bde7398186e121b1d3bdc2ad
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index deda03a..aef380d 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -630,7 +630,9 @@ rtl::Reference Entity readEntity(
throw FileFormatException(
file-uri, UNOIDL format: too many items in module);
}
-if (offset + 5 + 8 * n file-size) { //TODO: overflow
+if (sal_uInt64(offset) + 5 + 8 * sal_uInt64(n) file-size)
+// cannot overflow
+{
throw FileFormatException(
file-uri,
UNOIDL format: module map offset + size too large);
@@ -954,7 +956,9 @@ rtl::Reference Entity readEntity(
file-uri,
UNOIDL format: too many constants in constant group);
}
-if (offset + 5 + 8 * n file-size) { //TODO: overflow
+if (sal_uInt64(offset) + 5 + 8 * sal_uInt64(n) file-size)
+// cannot overflow
+{
throw FileFormatException(
file-uri,
(UNOIDL format: constant group map offset + size too
@@ -1237,7 +1241,9 @@ rtl::Reference Entity
UnoidlProvider::findEntity(OUString const name) const
}
}
mapSize = file_-read32(off + 1);
-if (8 * mapSize file_-size - off - 5) { //TODO: overflow
+if (sal_uInt64(off) + 5 + 8 * sal_uInt64(mapSize) file_-size)
+// cannot overflow
+{
throw FileFormatException(
file_-uri, UNOIDL format: map offset + size too large);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/optdlg/calcoptionsdlg.cxx| 11 +++
sc/source/ui/optdlg/calcoptionsdlg.hxx|2 ++
sc/uiconfig/scalc/ui/formulacalculationoptions.ui | 13 +
3 files changed, 26 insertions(+)
New commits:
commit b0edae7879175dde107518ece3683a077039882f
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 18 17:33:46 2014 +0200
Add a 'Test' button to test the machine's OpenCL implementation
Does not yet do anything, but will essentially run a unit test of the
OpenCL
functionality required by the default subset of opcodes.
Change-Id: I230f6232c90562ea56057347fb0dc088f98c215d
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 4aafd8c..3c71c66 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -153,6 +153,7 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window*
pParent, const ScCalcConfi
get(mpDriverVersionMax, opencldriverversionmax);
get(mpListNewButton, listbox-new);
get(mpListDeleteButton, listbox-delete);
+get(mpTestButton, test);
get(mpOpenclInfoList, opencl_list);
get(mpBtnAutomaticSelectionTrue, automatic_select_true);
get(mpBtnAutomaticSelectionFalse, automatic_select_false);
@@ -228,6 +229,8 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window*
pParent, const ScCalcConfi
mpListNewButton-SetClickHdl(LINK(this, ScCalcOptionsDialog,
ListNewClickHdl));
mpListDeleteButton-SetClickHdl(LINK(this, ScCalcOptionsDialog,
ListDeleteClickHdl));
+mpTestButton-SetClickHdl(LINK(this, ScCalcOptionsDialog, TestClickHdl));
+
aLink = LINK(this, ScCalcOptionsDialog, BtnToggleHdl);
mpBtnTrue-SetToggleHdl(aLink); // Set handler only to the 'True' button.
@@ -951,4 +954,12 @@ IMPL_LINK( ScCalcOptionsDialog, ListDeleteClickHdl,
PushButton*, )
return 0;
}
+IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, )
+{
+// Automatically test the current implementation of OpenCL. If it
+// seems good, whitelist it. If it seems bad, blacklist it.
+
+return 0;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx
b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 32e7f42..e1a1370 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -43,6 +43,7 @@ public:
DECL_LINK( OpenCLWhiteAndBlackListSelHdl, Control* );
DECL_LINK( ListNewClickHdl, PushButton* );
DECL_LINK( ListDeleteClickHdl, PushButton* );
+DECL_LINK( TestClickHdl, PushButton* );
const ScCalcConfig GetConfig() const { return maConfig;}
@@ -86,6 +87,7 @@ private:
Edit* mpDriverVersionMax;
PushButton* mpListNewButton;
PushButton* mpListDeleteButton;
+PushButton* mpTestButton;
FixedText* mpFtAnnotation;
FixedText* mpFtFrequency;
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 0a806b0..5d359eb 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -386,6 +386,19 @@
property name=position2/property
/packing
/child
+child
+ object class=GtkButton id=test
+property name=label
translatable=yes_Test/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property
name=receives_defaultTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position3/property
+ /packing
+/child
/object
packing
property name=left_attach2/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdview.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 961ed635515a346a4395b4abf29675e121ddd8ab Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 18 15:53:51 2014 + show pointer_move arrow when passing over an object boundary which removes the guessing you have to do when trying to find the edge of a pres_obj in impress after text has been filled in and there is no visible border anymore Change-Id: I470caec90cdeaa681da70f8ec3044c1d6d232a82 diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 784d1e8..3e95552 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1011,6 +1011,7 @@ Pointer SdrView::GetPreferredPointer(const Point rMousePos, const OutputDevice* case SDREVENT_BEGCREATEOBJ: return aAktCreatePointer; case SDREVENT_MARKOBJ: +return Pointer(POINTER_MOVE); case SDREVENT_BEGMARK: return Pointer(POINTER_ARROW); case SDREVENT_MARKPOINT: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source vcl/source
sw/source/core/layout/paintfrm.cxx | 62 +
vcl/source/app/dbggui.cxx |2 -
2 files changed, 44 insertions(+), 20 deletions(-)
New commits:
commit 620156f516db5f20cd97bcf962934e51f28b4d40
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 18 16:03:13 2014 +
gcc 4.8.3 lets us do it, but not everyone else
Change-Id: I83cca6a1bd3a462a277e5f5338cafbcd037d4227
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 1a86ce2..0dc99f5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -239,44 +239,68 @@ Color aGlobalRetoucheColor;
struct SwPaintProperties {
// Only repaint the Fly content as well as the background of the Fly
content if
// a metafile is taken of the Fly.
-boolbSFlyMetafile = false;
-OutputDevice *pSFlyMetafileOut = 0;
-SwViewShell*pSGlobalShell = 0;
+boolbSFlyMetafile;
+OutputDevice *pSFlyMetafileOut;
+SwViewShell*pSGlobalShell;
// Retouch for transparent Flys is done by the background of the Flys.
// The Fly itself should certainly not be spared out. See PaintBackground
and
// lcl_SubtractFlys()
-SwFlyFrm *pSRetoucheFly = 0;
-SwFlyFrm *pSRetoucheFly2 = 0;
-SwFlyFrm *pSFlyOnlyDraw = 0;
+SwFlyFrm *pSRetoucheFly;
+SwFlyFrm *pSRetoucheFly2;
+SwFlyFrm *pSFlyOnlyDraw;
// The borders will be collected in pSLines during the Paint and later
// possibly merge them.
// The help lines will be collected and merged in gProp.pSSubsLines. These
will
// be compared with pSLines before the work in order to avoid help lines
// to hide borders.
-BorderLines*pBLines = 0;
-SwLineRects*pSLines = 0;
-SwSubsRects*pSSubsLines = 0;
+BorderLines*pBLines;
+SwLineRects*pSLines;
+SwSubsRects*pSSubsLines;
// global variable for sub-lines of body, header, footer, section and
footnote frames.
-SwSubsRects*pSSpecSubsLines = 0;
-SfxProgress*pSProgress = 0;
+SwSubsRects*pSSpecSubsLines;
+SfxProgress*pSProgress;
// Sizes of a pixel and the corresponding halves. Will be reset when
// entering SwRootFrm::Paint
-longnSPixelSzW = 0;
-longnSPixelSzH = 0;
-longnSHalfPixelSzW = 0;
-longnSHalfPixelSzH = 0;
-longnSMinDistPixelW = 0;
-longnSMinDistPixelH = 0;
+longnSPixelSzW;
+longnSPixelSzH;
+longnSHalfPixelSzW;
+longnSHalfPixelSzH;
+longnSMinDistPixelW;
+longnSMinDistPixelH;
Color aSGlobalRetoucheColor;
// Current zoom factor
-double aSScaleX = 1;
-double aSScaleY = 1;
+double aSScaleX;
+double aSScaleY;
+
+SwPaintProperties()
+ : bSFlyMetafile(false)
+ , pSFlyMetafileOut(0)
+ , pSGlobalShell(0)
+ , pSRetoucheFly(0)
+ , pSRetoucheFly2(0)
+ , pSFlyOnlyDraw(0)
+ , pBLines(0)
+ , pSLines(0)
+ , pSSubsLines(0)
+ , pSSpecSubsLines(0)
+ , pSProgress(0)
+ , nSPixelSzW(0)
+ , nSPixelSzH(0)
+ , nSHalfPixelSzW(0)
+ , nSHalfPixelSzH(0)
+ , nSMinDistPixelW(0)
+ , nSMinDistPixelH(0)
+ , aSScaleX(1)
+ , aSScaleY(1)
+{
+}
+
};
static SwPaintProperties gProp;
commit 0dd7a5a27c48db5fb9b89ed794da96deda516594
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 18 15:57:47 2014 +
restore old explanation message via assert hack
Change-Id: I897f71e5ae4d2368d5d3ced60d90fb1c833fa376
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 1e2270f..a07b720 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -790,7 +790,7 @@ void DbgDialogTest( vcl::Window* pWindow )
void ImplDbgTestSolarMutex()
{
-assert(ImplGetSVData()-mpDefInst-CheckYieldMutex());
+assert(ImplGetSVData()-mpDefInst-CheckYieldMutex() SolarMutex not
locked);
}
void DbgGUIInitSolarMutexCheck()
___
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/source
vcl/source/opengl/OpenGLContext.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 0867564863457b3bb45af040e8ffa05b780a74e4
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Nov 18 16:10:51 2014 +
vcl: check the OpenGL drawable as well as the context.
Change-Id: Idac493dfb3239f7ae5b5e49158d79c4f3e707509
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index d30ac17..6267a9f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1137,7 +1137,8 @@ SystemWindowData
OpenGLContext::generateWinData(vcl::Window* pParent, bool)
void OpenGLContext::makeCurrent()
{
#if defined( WNT )
-if (wglGetCurrentContext() == m_aGLWin.hRC)
+if (wglGetCurrentContext() == m_aGLWin.hRC
+wglGetCurrentDC() == m_aGLWin.hDC)
{
SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting
the same context);
}
@@ -1151,11 +1152,13 @@ void OpenGLContext::makeCurrent()
#elif defined( IOS ) || defined( ANDROID )
// nothing
#elif defined( UNX )
-if (glXGetCurrentContext() == m_aGLWin.ctx)
+GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win;
+if (glXGetCurrentContext() == m_aGLWin.ctx
+glXGetCurrentDrawable() == nDrawable)
{
SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting
the same context);
}
-else if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix :
m_aGLWin.win, m_aGLWin.ctx ))
+else if (!glXMakeCurrent( m_aGLWin.dpy, nDrawable, m_aGLWin.ctx ))
SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent failed);
#endif
}
___
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/opengl/OpenGLContext.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 6f5a948612a541fff845cbef44e79adaf9c45793
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Nov 18 16:10:51 2014 +
vcl: check the OpenGL drawable as well as the context.
Change-Id: Idac493dfb3239f7ae5b5e49158d79c4f3e707509
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index d30ac17..6267a9f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1137,7 +1137,8 @@ SystemWindowData
OpenGLContext::generateWinData(vcl::Window* pParent, bool)
void OpenGLContext::makeCurrent()
{
#if defined( WNT )
-if (wglGetCurrentContext() == m_aGLWin.hRC)
+if (wglGetCurrentContext() == m_aGLWin.hRC
+wglGetCurrentDC() == m_aGLWin.hDC)
{
SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting
the same context);
}
@@ -1151,11 +1152,13 @@ void OpenGLContext::makeCurrent()
#elif defined( IOS ) || defined( ANDROID )
// nothing
#elif defined( UNX )
-if (glXGetCurrentContext() == m_aGLWin.ctx)
+GLXDrawable nDrawable = mbPixmap ? m_aGLWin.glPix : m_aGLWin.win;
+if (glXGetCurrentContext() == m_aGLWin.ctx
+glXGetCurrentDrawable() == nDrawable)
{
SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting
the same context);
}
-else if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix :
m_aGLWin.win, m_aGLWin.ctx ))
+else if (!glXMakeCurrent( m_aGLWin.dpy, nDrawable, m_aGLWin.ctx ))
SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent failed);
#endif
}
___
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/opengl/gdiimpl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9b18be272124c0157eea1b24d396e03b2135fffd Author: Louis-Francis Ratté-Boulianne l...@collabora.com Date: Tue Nov 18 11:19:02 2014 -0500 vcl: Actually keep the new offscreen texture around Change-Id: Ie44c680f0c217214c4a3642d34fa704e8eeca917 diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index bfa4b1f..8bd1b35 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -316,6 +316,7 @@ bool OpenGLSalGraphicsImpl::CheckOffscreenTexture() glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, aNewTex.Id(), 0 ); glViewport( 0, 0, GetWidth(), GetHeight() ); DrawTexture( maOffscreenTex, aPosAry ); +maOffscreenTex = aNewTex; CHECK_GL_ERROR(); return true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdxfer.cxx |9 +
sd/source/ui/inc/sdxfer.hxx |4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit cb3992630ce2452d1eb599ff1268efb4a1b99e04
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 18 16:35:06 2014 +
assert because still listening to the wrong view when SetView used
we're still listening to the old one here when we set a new one
Change-Id: Iaf64ba17a7adf2489a4f0475bba03a2500a556c0
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 4317209..dda4f74 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -806,6 +806,15 @@ void SdTransferable::Notify( SfxBroadcaster rBC, const
SfxHint rHint )
}
}
+void SdTransferable::SetView(const ::sd::View* pView)
+{
+if (mpSdView)
+EndListening(*const_castsd::View*(mpSdView));
+mpSdView = pView;
+if (mpSdView)
+StartListening(*const_castsd::View*(mpSdView));
+}
+
bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor
rFlavor)
{
if ( pModel )
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index 2554415a..a395bdf 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -50,8 +50,8 @@ public:
voidSetWorkDocument( const SdDrawDocument*
pWorkDoc ) { mpSdDrawDocument = mpSdDrawDocumentIntern = (SdDrawDocument*)
pWorkDoc; }
const SdDrawDocument* GetWorkDocument() const { return
mpSdDrawDocument; }
-voidSetView( const ::sd::View* pView ) {
mpSdView = pView; }
-const ::sd::View* GetView() const { return mpSdView; }
+voidSetView(const ::sd::View* pView);
+const ::sd::View* GetView() const { return mpSdView; }
voidSetObjectDescriptor( const
TransferableObjectDescriptor rObjDesc );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/columnspanset.hxx |3 +++
sc/source/core/data/column4.cxx |6 +-
sc/source/core/data/columnspanset.cxx |9 +
3 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 7dcfafc7d2f7ce8357c1570ea7547b5879f54172
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 11:34:21 2014 -0500
Let's not re-use the same iterator esp when it's still iterating.
Change-Id: I1752857bc036f8d389b4b71d570cf83a76ef29ea
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 48ae7c1..63e8c90 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -25,6 +25,7 @@ class ScRangeList;
namespace sc {
struct ColumnBlockConstPosition;
+class SingleColumnSpanSet;
struct RowSpan
{
@@ -92,6 +93,8 @@ public:
void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
void set(const ScRange rRange, bool bVal);
+void set( SCTAB nTab, SCCOL nCol, const SingleColumnSpanSet rSingleSet,
bool bVal );
+
/**
* Scan specified range in a specified sheet and mark all non-empty cells
* with specified boolean value.
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2316a26..b0d1d50 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -110,11 +110,7 @@ void ScColumn::DeleteBeforeCopyFromClip(
{
sc::SingleColumnSpanSet aDeletedRows;
DeleteCells(aBlockPos, nRow1, nRow2, nDelFlag, aDeletedRows);
-aDeletedRows.getSpans(aSpans);
-it = aSpans.begin();
-itEnd = aSpans.end();
-for (; it != itEnd; ++it)
-rBroadcastSpans.set(nTab, nCol, it-mnRow1, it-mnRow2, true);
+rBroadcastSpans.set(nTab, nCol, aDeletedRows, true);
}
if (nDelFlag IDF_NOTE)
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index fe10528..6132906 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -120,6 +120,15 @@ void ColumnSpanSet::set(const ScRange rRange, bool bVal)
}
}
+void ColumnSpanSet::set( SCTAB nTab, SCCOL nCol, const SingleColumnSpanSet
rSingleSet, bool bVal )
+{
+SingleColumnSpanSet::SpansType aSpans;
+rSingleSet.getSpans(aSpans);
+SingleColumnSpanSet::SpansType::const_iterator it = aSpans.begin(), itEnd
= aSpans.end();
+for (; it != itEnd; ++it)
+set(nTab, nCol, it-mnRow1, it-mnRow2, bVal);
+}
+
void ColumnSpanSet::scan(
const ScDocument rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, bool bVal)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - officecfg/registry svtools/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
svtools/source/graphic/grfmgr2.cxx | 10 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 56020e09569ce078c108576b24efb66735cfc7c4
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Nov 18 17:09:06 2014 +0100
Be precise here, maximum value means it is still allowed to have
Change-Id: I90c559c59b307aac6f7adac49ea38b0d9b68ad58
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 19ab956..3b6a738 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -210,7 +210,7 @@ void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const
GraphicObject* pGrap
// calc max allowed cache size
const sal_uLong nMaxCacheSize(::std::min(GetMaxCacheSize(),
aMaxSize32Bit));
-if(mnUsedSize = nMaxCacheSize)
+if(mnUsedSize nMaxCacheSize)
{
// Copy the object list for now, because maObjList can change in the
meantime unexpectedly.
std::vector GraphicObject* aCandidates(maObjList.begin(),
maObjList.end());
commit dbdacc73ae154237314d599194cc686bd738a9bf
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Nov 18 17:37:53 2014 +0100
Be honest about the maximum cache size
Implementation uses a multiplicator of ten. I guess the intention
here was that to calculate cache size based on the size of the inserted
images and not based on the real memory usage (potentionally more
instances of one image), which seems a bad idea because it covers the
real memory usage from the users (who will be suprised when LO's memory
usage increases tenfold of the set value).
It seems better to use the exact value in the implementation and increase
the default value on the user interface instead.
Change-Id: Ie3c0568d3518922d3a9931f894eebb9e7e5515ed
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index e19df23..fec8d25 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1466,7 +1466,7 @@
objects./desc
labelTotal Graphic Cache Size/label
/info
- value2200/value
+ value22000/value
/prop
prop oor:name=ObjectCacheSize oor:type=xs:int
oor:nillable=false
info
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 2ff6192..19ab956 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -200,11 +200,7 @@ namespace
void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject*
pGraphicToIgnore)
{
// detect maximum allowed memory footprint. Use the user-settings of
MaxCacheSize (defaulted
-// to 20MB) and add a decent multiplicator (experimented to find one).
Limit to
-// a useful maximum for 32Bit address space
-
-// default is 20MB, so allow 200MB initially
-static sal_uLong aMultiplicator(10);
+// to 200MB). Limit to a useful maximum for 32Bit address space
// max at 500MB; I experimented with 800 for debug and 750 for non-debug
settings (pics start
// missing when office reaches a mem footprint of 1.5GB) but some secure
left over space for
@@ -212,7 +208,7 @@ void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const
GraphicObject* pGrap
static sal_uLong aMaxSize32Bit(500 * 1024 * 1024);
// calc max allowed cache size
-const sal_uLong nMaxCacheSize(::std::min(GetMaxCacheSize() *
aMultiplicator, aMaxSize32Bit));
+const sal_uLong nMaxCacheSize(::std::min(GetMaxCacheSize(),
aMaxSize32Bit));
if(mnUsedSize = nMaxCacheSize)
{
___
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/workben
vcl/workben/vcldemo.cxx | 31 +++
1 file changed, 11 insertions(+), 20 deletions(-)
New commits:
commit 0c39c360b49a406bc960bf395a007f93568e37e5
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Nov 18 16:47:36 2014 +
vcldemo: render more small scaled page-border alikes
Change-Id: I2605175e7ee66d3da5e41497baa4178074830e99
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 336c85d..a70de2d 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -460,28 +460,19 @@ public:
aBlockColor.Erase(COL_RED);
BitmapEx aShadowStretch = BitmapEx(aBlockColor, aAlphaMask);
-#ifdef DEBUG
-{ // before - the pristine nx1 image
-SvFileStream aStream(/tmp/myshadow.png, STREAM_WRITE);
-vcl::PNGWriter aWriter(aShadowStretch);
-aWriter.Write(aStream);
-}
-#endif
+Point aRenderPt(r.TopLeft());
+
+long aSizes[] = { 200, 100, 200, 100, 50, 5, 2 };
+
// and yes - we really do this in the page border rendering code
...
-aShadowStretch.Scale(Size(aShadowStretch.GetSizePixel().Width(),
50),
- BMP_SCALE_FAST);
-aShadowStretch.Scale(Size(aShadowStretch.GetSizePixel().Width(),
800),
- BMP_SCALE_FAST);
-#ifdef DEBUG
-{ // after the corrupted image full of fluff ...
-SvFileStream aStream(/tmp/myshadow-50.png, STREAM_WRITE);
-vcl::PNGWriter aWriter(aShadowStretch);
-aWriter.Write(aStream);
+for (size_t i = 0; i SAL_N_ELEMENTS(aSizes); i++)
+{
+
aShadowStretch.Scale(Size(aShadowStretch.GetSizePixel().Width(), aSizes[i]),
+ BMP_SCALE_FAST);
+
+rDev.DrawBitmapEx(aRenderPt, aShadowStretch);
+aRenderPt.Move(aShadowStretch.GetSizePixel().Width() + 4, 0);
}
-#endif
-Point aRenderPt(r.Center());
-aRenderPt.Move(-nSlice-1, 0);
-rDev.DrawBitmapEx(aRenderPt, aShadowStretch);
AlphaMask aWholeMask(aPageShadowMask.GetBitmap());
aBlockColor = Bitmap(aPageShadowMask.GetSizePixel(), 24);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - 3 commits - sc/inc sc/source
sc/inc/column.hxx |4 ++--
sc/inc/columnspanset.hxx |3 +++
sc/source/core/data/column3.cxx | 16
sc/source/core/data/column4.cxx |6 +-
sc/source/core/data/columnspanset.cxx |9 +
sc/source/core/data/table4.cxx|2 +-
6 files changed, 24 insertions(+), 16 deletions(-)
New commits:
commit 283483ae5b78c06a6b8b6a9521500be500d43354
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 11:34:21 2014 -0500
Let's not re-use the same iterator esp when it's still iterating.
Change-Id: I1752857bc036f8d389b4b71d570cf83a76ef29ea
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 48ae7c1..63e8c90 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -25,6 +25,7 @@ class ScRangeList;
namespace sc {
struct ColumnBlockConstPosition;
+class SingleColumnSpanSet;
struct RowSpan
{
@@ -92,6 +93,8 @@ public:
void set(SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2, bool bVal);
void set(const ScRange rRange, bool bVal);
+void set( SCTAB nTab, SCCOL nCol, const SingleColumnSpanSet rSingleSet,
bool bVal );
+
/**
* Scan specified range in a specified sheet and mark all non-empty cells
* with specified boolean value.
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2316a26..b0d1d50 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -110,11 +110,7 @@ void ScColumn::DeleteBeforeCopyFromClip(
{
sc::SingleColumnSpanSet aDeletedRows;
DeleteCells(aBlockPos, nRow1, nRow2, nDelFlag, aDeletedRows);
-aDeletedRows.getSpans(aSpans);
-it = aSpans.begin();
-itEnd = aSpans.end();
-for (; it != itEnd; ++it)
-rBroadcastSpans.set(nTab, nCol, it-mnRow1, it-mnRow2, true);
+rBroadcastSpans.set(nTab, nCol, aDeletedRows, true);
}
if (nDelFlag IDF_NOTE)
diff --git a/sc/source/core/data/columnspanset.cxx
b/sc/source/core/data/columnspanset.cxx
index fe10528..6132906 100644
--- a/sc/source/core/data/columnspanset.cxx
+++ b/sc/source/core/data/columnspanset.cxx
@@ -120,6 +120,15 @@ void ColumnSpanSet::set(const ScRange rRange, bool bVal)
}
}
+void ColumnSpanSet::set( SCTAB nTab, SCCOL nCol, const SingleColumnSpanSet
rSingleSet, bool bVal )
+{
+SingleColumnSpanSet::SpansType aSpans;
+rSingleSet.getSpans(aSpans);
+SingleColumnSpanSet::SpansType::const_iterator it = aSpans.begin(), itEnd
= aSpans.end();
+for (; it != itEnd; ++it)
+set(nTab, nCol, it-mnRow1, it-mnRow2, bVal);
+}
+
void ColumnSpanSet::scan(
const ScDocument rDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2, bool bVal)
{
commit 756d4765104dfab1a49dde07d5425774feda54ed
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 18 10:26:27 2014 -0500
Rename Activate... - Attach...
Attach is the new one we are going with offers nice contrast with
'Detach...'.
Change-Id: I4578f4c7b9d989e41d433d7c8aa96a9317aa6919
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f268c5c..440a95b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -628,8 +628,8 @@ private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
sc::CellStoreType::iterator GetPositionToInsert( const
sc::CellStoreType::iterator it, SCROW nRow );
-void ActivateNewFormulaCell( const sc::CellStoreType::iterator itPos,
SCROW nRow, ScFormulaCell rCell, bool bJoin = true );
-void ActivateNewFormulaCell( 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 );
+void AttachNewFormulaCell( const sc::CellStoreType::position_type aPos,
ScFormulaCell rCell, bool bJoin = true );
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 97af751..ec0dd45 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -374,13 +374,13 @@ sc::CellStoreType::iterator
ScColumn::GetPositionToInsert( const sc::CellStoreTy
return itRet;
}
-void ScColumn::ActivateNewFormulaCell(
+void ScColumn::AttachNewFormulaCell(
const sc::CellStoreType::iterator itPos, SCROW nRow, ScFormulaCell
rCell, bool bJoin )
{
-ActivateNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
+AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin);
}
-void ScColumn::ActivateNewFormulaCell(
+void ScColumn::AttachNewFormulaCell(
const
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/paragraph-mark-nonempty.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 20 ++
sw/source/filter/ww8/docxattributeoutput.cxx |2 -
sw/source/filter/ww8/wrtw8nds.cxx | 13 -
4 files changed, 33 insertions(+), 2 deletions(-)
New commits:
commit 347566d6b6ae12c86aa2eb787cd97f2dcfe8ea2d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 18 17:47:23 2014 +0100
DOCX export: put either hints or the para attr set into the para marker
props
Commit d72237741ed1d8f976032ff2ee5d2a8702d3380e (abi#9930
DocxAttributeOutput::AddToAttrList: avoid duplicated attributes,
2014-11-02) added a quick fix to avoid writing duplicated attributes,
but the validation problem of duplicated elements remained.
Make sure that when writing paragraph marker properties, then we write
either the hints at the end of the paragraph or the character attributes
range of the paragraph properties, but not both.
The only exception is the character style that's always set as
a hint, as explained in commit 4bb872b1924453f22e90bdd14e2898a3e66d5551
(DOCX export: fix handling of paragraph mark on empty paragraphs,
2014-10-17).
Change-Id: I494e5bb9871aa535532fef32bd344d8093e9f762
diff --git a/sw/qa/extras/ooxmlexport/data/paragraph-mark-nonempty.odt
b/sw/qa/extras/ooxmlexport/data/paragraph-mark-nonempty.odt
new file mode 100644
index 000..b12cbf6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/paragraph-mark-nonempty.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 39c559a..964ec96 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -41,6 +41,19 @@ protected:
// If the testcase is stored in some other format, it's pointless to
test.
return (OString(filename).endsWith(.docx)
std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
}
+
+/**
+ * Validation handling
+ */
+bool mustValidate(const char* filename) const SAL_OVERRIDE
+{
+const char* aWhitelist[] = {
+paragraph-mark-nonempty.odt
+};
+std::vectorconst char* vWhitelist(aWhitelist, aWhitelist +
SAL_N_ELEMENTS(aWhitelist));
+
+return std::find(vWhitelist.begin(), vWhitelist.end(), filename) !=
vWhitelist.end();
+}
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
@@ -522,6 +535,13 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphMark,
paragraph-mark.docx)
CPPUNIT_ASSERT_EQUAL(OUString(Emphasis),
getPropertyOUString(getRun(getParagraph(1), 1), CharStyleName));
}
+DECLARE_OOXMLEXPORT_TEST(testParagraphMarkNonempty,
paragraph-mark-nonempty.odt)
+{
+if (xmlDocPtr pXmlDoc = parseExport())
+// There were two w:sz elements, make sure the 40 one is is dropped
and the 20 one is kept.
+assertXPath(pXmlDoc, //w:p/w:pPr/w:rPr/w:sz, val, 20);
+}
+
DECLARE_OOXMLEXPORT_TEST(testPageBreakBefore, page-break-before.docx)
{
// This was style::BreakType_PAGE_BEFORE, i.e. page break wasn't ignored,
as it should have been.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7444240..cacbe97 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8457,7 +8457,7 @@ void DocxAttributeOutput::AddToAttrList(
::sax_fastparser::FastAttributeList* p
{
sal_Int32 nName = va_arg( args, sal_Int32 );
const char* pValue = va_arg( args, const char* );
-if( pValue !pAttrList-hasAttribute(nName) )
+if( pValue )
pAttrList-add( nName, pValue );
}
va_end( args );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 02f8cae..9487f88 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2705,7 +2705,16 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode
rNode )
}
}
+// The formatting of the paragraph marker has two sources:
+// 1) If there are hints at the end of the paragraph, then use that.
+// 2) Else use the RES_CHRATR_BEGIN..RES_TXTATR_END range of the paragraph
+// properties.
+//
+// Exception: if there is a character style hint at the end of the
+// paragraph only, then still go with 2), as RES_TXTATR_CHARFMT is always
+// set as a hint.
SfxItemSet aParagraphMarkerProperties(pDoc-GetAttrPool(),
RES_CHRATR_BEGIN, RES_TXTATR_END);
+bool bCharFormatOnly = true;
if(const SwpHints* pTxtAttrs = rNode.GetpSwpHints())
{
for( size_t i = 0; i pTxtAttrs-Count(); ++i )
@@ -2723,10 +2732,12 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode
rNode )
SAL_INFO( sw.ww8, nWhich nWhich);
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/dinfdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0cda507b30fdbbc19b0d4b27fccbebf7829b4404 Author: Caolán McNamara caol...@redhat.com Date: Tue Nov 18 16:53:42 2014 + Resolves: fdo#75066 add TABSTOP and DIALOGCONTROL bits to this custom widget to state that is is a candidate for tabstopping to, and that its a (old-school) container widget which has subwidgets which should be candidates too Change-Id: I39452f906b30c3962026ab9c4dba625ecd2d06a8 diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 850cb9c..bf2124e 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1407,7 +1407,7 @@ CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue) : -Window(pParent), +Window(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_TABSTOP | WB_DIALOGCONTROL), m_pHeaderAccName(pHeaderAccName), m_pHeaderAccType(pHeaderAccType), m_pHeaderAccValue(pHeaderAccValue), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/LibreOfficeKit smoketest/libtest.cxx
include/LibreOfficeKit/LibreOfficeKit.hxx |2
include/LibreOfficeKit/LibreOfficeKitInit.h | 117 +---
smoketest/libtest.cxx | 58 +++--
3 files changed, 153 insertions(+), 24 deletions(-)
New commits:
commit 725a52c55e91d3629dfbfb9ba4758048d8bf1a77
Author: Juergen Funk juergen.funk...@cib.de
Date: Fri Nov 14 10:56:40 2014 +0100
Preparation of the LibreOfficeKit for Windows
- not yet included in the make for windows
Change-Id: Iee31b0ed0c6545572295ce00a3bb0f909c428b5a
Reviewed-on: https://gerrit.libreoffice.org/12425
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index f61a4b8..f1255f4 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -38,7 +38,7 @@ public:
inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const
char* pFilterOptions = NULL)
{
-return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat, pFilterOptions);
+return mpDoc-pClass-saveAs(mpDoc, pUrl, pFormat, pFilterOptions) !=
0;
}
inline LibreOfficeKitDocument *get() { return mpDoc; }
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 010ae9f..37a1fb5 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -17,22 +17,115 @@ extern C
{
#endif
-#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX)
+#if defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) ||
defined(_WIN32)
#include stdio.h
#include stdlib.h
#include string.h
-#include dlfcn.h
-#ifdef _AIX
-# include sys/ldr.h
+
+#ifndef _WIN32
+#include dlfcn.h
+#ifdef _AIX
+# include sys/ldr.h
+#endif
+#define TARGET_LIBlib sofficeapp .so
+#define TARGET_MERGED_LIB lib mergedlo .so
+#define SEPERATOR '/'
+
+void *_dlopen(const char *pFN)
+{
+return dlopen(pFN, RTLD_LAZY);
+}
+
+
+void *_dlsym(void *Hnd, const char *pName)
+{
+return dlsym(Hnd, pName);
+}
+
+
+int _dlclose(void *Hnd)
+{
+return dlclose(Hnd);
+}
+
+void extendUnoPath(const char *pPath)
+{
+(void)pPath;
+}
+
+
+#else
+
+#include windows.h
+#define TARGET_LIBsofficeapp .dll
+#define TARGET_MERGED_LIB mergedlo .dll
+#define SEPERATOR '\\'
+#define UNOPATH \\..\\URE\\bin
+
+
+void *_dlopen(const char *pFN)
+{
+return (void *) LoadLibrary(pFN);
+}
+
+
+void *_dlsym(void *Hnd, const char *pName)
+{
+return GetProcAddress((HINSTANCE) Hnd, pName);
+}
+
+
+int _dlclose(void *Hnd)
+{
+return FreeLibrary((HINSTANCE) Hnd);
+}
+
+void extendUnoPath(const char *pPath)
+{
+if (!pPath)
+return;
+
+char* sEnvPath = NULL;
+DWORD cChars = GetEnvironmentVariable(PATH, sEnvPath, 0);
+if (cChars 0)
+{
+sEnvPath = new char[cChars];
+cChars = GetEnvironmentVariable(PATH, sEnvPath, cChars);
+//If PATH is not set then it is no error
+if (cChars == 0 GetLastError() != ERROR_ENVVAR_NOT_FOUND)
+{
+delete[] sEnvPath;
+return;
+}
+}
+//prepare the new PATH. Add the Ure/bin directory at the front.
+//note also adding ';'
+char * sNewPath = new char[strlen(sEnvPath) + strlen(pPath) +
strlen(UNOPATH) + 2];
+sNewPath[0] = L'\0';
+strcat(sNewPath, pPath);
+strcat(sNewPath, UNOPATH);
+if (strlen(sEnvPath))
+{
+strcat(sNewPath, ;);
+strcat(sNewPath, sEnvPath);
+}
+
+SetEnvironmentVariable(PATH, sNewPath);
+
+delete[] sEnvPath;
+delete[] sNewPath;
+}
#endif
-#define TARGET_LIBlib sofficeapp .so
-#define TARGET_MERGED_LIB lib mergedlo .so
+
+
+
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
+
static LibreOfficeKit *lok_init( const char *install_path )
{
char *imp_lib;
@@ -54,15 +147,17 @@ static LibreOfficeKit *lok_init( const char *install_path )
strcpy(imp_lib, install_path);
-imp_lib[partial_length++] = '/';
+ extendUnoPath(install_path);
+
+imp_lib[partial_length++] = SEPERATOR;
strcpy(imp_lib + partial_length, TARGET_LIB);
-dlhandle = dlopen(imp_lib, RTLD_LAZY);
+dlhandle = _dlopen(imp_lib);
if (!dlhandle)
{
strcpy(imp_lib + partial_length, TARGET_MERGED_LIB);
-dlhandle = dlopen(imp_lib, RTLD_LAZY);
+dlhandle = _dlopen(imp_lib);
if (!dlhandle)
{
fprintf(stderr, failed to open library '%s' or
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/toolbar/formatobjectbar.xml |6 +++--- sc/uiconfig/scalc/toolbar/standardbar.xml |7 +-- 2 files changed, 8 insertions(+), 5 deletions(-) New commits: commit 8cf085175e49779d2d42f279859ab65046a7dfc0 Author: Yousuf Philips philip...@hotmail.com Date: Tue Nov 18 18:33:47 2014 +0400 fdo#85594 renabling a few entries and adding addition hidden entries Change-Id: Ifcf30f209355d4cea4daeabe06896b0c225a65a0 Reviewed-on: https://gerrit.libreoffice.org/12958 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml index d6d7c2a..2ae836d 100644 --- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml @@ -58,13 +58,13 @@ toolbar:toolbaritem xlink:href=.uno:NumberFormatCurrency toolbar:tooltip=Format as Currency/ toolbar:toolbaritem xlink:href=.uno:NumberFormatPercent toolbar:tooltip=Format as Percent/ toolbar:toolbaritem xlink:href=.uno:NumberFormatDecimal toolbar:tooltip=Format as Number/ - toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:tooltip=Format as Date/ + toolbar:toolbaritem xlink:href=.uno:NumberFormatDate toolbar:tooltip=Format as Date toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:NumberFormatScientific toolbar:tooltip=Format as Scientific toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:NumberFormatIncDecimals/ toolbar:toolbaritem xlink:href=.uno:NumberFormatDecDecimals/ toolbar:toolbarseparator/ - toolbar:toolbaritem xlink:href=.uno:DecrementIndent toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:IncrementIndent toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:IncrementIndent/ + toolbar:toolbaritem xlink:href=.uno:DecrementIndent/ toolbar:toolbarseparator/ toolbar:toolbaritem xlink:href=.uno:SetBorderStyle/ toolbar:toolbaritem xlink:href=.uno:LineStyle/ diff --git a/sc/uiconfig/scalc/toolbar/standardbar.xml b/sc/uiconfig/scalc/toolbar/standardbar.xml index 7cce2b2..4388b00 100644 --- a/sc/uiconfig/scalc/toolbar/standardbar.xml +++ b/sc/uiconfig/scalc/toolbar/standardbar.xml @@ -61,10 +61,13 @@ toolbar:toolbaritem xlink:href=.uno:InsertObjectChart/ toolbar:toolbaritem xlink:href=.uno:Gallery toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:HyperlinkDialog/ - toolbar:toolbaritem xlink:href=.uno:DataDataPilotRun toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:InsertAnnotation toolbar:visible=false/ - toolbar:toolbaritem xlink:href=.uno:InsertDraw toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertObjectStarMath toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertSymbol toolbar:visible=false/ + toolbar:toolbaritem xlink:href=.uno:InsertDraw/ + toolbar:toolbaritem xlink:href=.uno:DataDataPilotRun toolbar:visible=false/ toolbar:toolbarseparator/ + toolbar:toolbaritem xlink:href=.uno:FreezePanes toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:ViewDataSourceBrowser toolbar:visible=false/ toolbar:toolbaritem xlink:href=.uno:Zoom toolbar:visible=false/ toolbar:toolbarseparator/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/qa
svtools/qa/unit/GraphicObjectTest.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 89361fcff340c8a168d25160a4d8efe9e39e7d51
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Nov 18 18:33:35 2014 +0100
Fix broken GraphicObjectTest
Change-Id: I3f7e0ccd5697a4ca6026bec60210e24af25fb92f
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx
b/svtools/qa/unit/GraphicObjectTest.cxx
index 5216e70..71d975b 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -221,7 +221,7 @@ void GraphicObjectTest::testSizeBasedAutoSwap()
// Use bigger cache
{
GraphicManager rGrfMgr = pGrafObj1-GetGraphicManager();
-
rGrfMgr.SetMaxCacheSize(pGrafObj1-GetSizeBytes()+pGrafObj2-GetSizeBytes());
+
rGrfMgr.SetMaxCacheSize(pGrafObj1-GetSizeBytes()+pGrafObj2-GetSizeBytes()*10);
}
// Swap in both images - both should be swapped in
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
