[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/sft.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fdf19189576597191699c33b5e35e1fc8f83c7c2
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 4 10:07:21 2014 +0200
-Werror=sign-compare
Change-Id: I5e1b6ebb4af3a602233bfb09ba6397569f18aac9
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 5d07368..e8d8337 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1082,7 +1082,7 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const
sal_uInt32 nMaxCmapSize
theLowByte = (sal_uInt8)(c 0x00ff);
subHeader2Keys = CMAP2 + 3;
subHeader2s = (subHeader2 *)(subHeader2Keys + 256);
-if(reinterpret_castsal_uInt8*(subHeader2Keys[theHighByte]) - cmap
nMaxCmapSize - 2)
+if(reinterpret_castsal_uInt8*(subHeader2Keys[theHighByte]) - cmap
int(nMaxCmapSize - 2))
{
k = Int16FromMOTA(subHeader2Keys[theHighByte]) / 8;
// check if the subheader record fits into available space
@@ -1178,16 +1178,16 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap,
const sal_uInt32 nMaxCmapSize
}
startCode = endCode + segCount + 1;
-if((reinterpret_castsal_uInt8*(startCode[i]) - cmap = nMaxCmapSize -
2) || Int16FromMOTA(startCode[i]) c) {
+if((reinterpret_castsal_uInt8*(startCode[i]) - cmap = int(nMaxCmapSize
- 2)) || Int16FromMOTA(startCode[i]) c) {
return MISSING_GLYPH_INDEX;
}
idDelta = startCode + segCount;
idRangeOffset = idDelta + segCount;
/*glyphIndexArray = idRangeOffset + segCount;*/
-if((reinterpret_castsal_uInt8*(idRangeOffset[i]) - cmap nMaxCmapSize
- 2) Int16FromMOTA(idRangeOffset[i]) != 0) {
+if((reinterpret_castsal_uInt8*(idRangeOffset[i]) - cmap
int(nMaxCmapSize - 2)) Int16FromMOTA(idRangeOffset[i]) != 0) {
sal_uInt16 * pGlyphOffset = (idRangeOffset[i]) +
(Int16FromMOTA(idRangeOffset[i])/2 + (c - Int16FromMOTA(startCode[i])));
-if(reinterpret_castsal_uInt8*(pGlyphOffset) - cmap = nMaxCmapSize -
2)
+if(reinterpret_castsal_uInt8*(pGlyphOffset) - cmap =
int(nMaxCmapSize - 2))
return MISSING_GLYPH_INDEX;
c = Int16FromMOTA(*pGlyphOffset);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - 2 commits - basegfx/Library_basegfx.mk basegfx/source include/basegfx
basegfx/Library_basegfx.mk|3 -
basegfx/source/tools/canvastools.cxx | 69 ++
include/basegfx/tools/canvastools.hxx | 12 +
3 files changed, 82 insertions(+), 2 deletions(-)
New commits:
commit 6a45c27ba42e8e51a427a90a3fc745f149b948d8
Author: Michael Jaumann meta_...@yahoo.com
Date: Tue Nov 4 08:18:40 2014 +
wrappers for bdhommatrix/affinematrix -glm::mat4
Change-Id: I0ff0b5ed82bbe9dc0ed264b71f6cea5a72809aff
diff --git a/basegfx/source/tools/canvastools.cxx
b/basegfx/source/tools/canvastools.cxx
index f59f447..c578e16 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -334,6 +334,41 @@ namespace basegfx
return output;
}
+glm::mat4 glmMatrixFromAffineMatrix( const
::com::sun::star::geometry::AffineMatrix2D input )
+{
+// ensure last row is [0,0,1] (and optimized away)
+glm::mat4 output;
+output[0][0] = input.m00;
+output[1][0] = input.m01;
+output[2][0] = input.m02;
+output[0][1] = input.m10;
+output[1][1] = input.m11;
+output[2][1] = input.m12;
+
+return output;
+}
+
+glm::mat4 glmMatrixFromAffineMatrix3D( const
::com::sun::star::geometry::AffineMatrix3D input )
+{
+glm::mat4 output;
+output[0][0] = input.m00;
+output[1][0] = input.m01;
+output[2][0] = input.m02;
+output[3][0] = input.m03;
+
+output[0][1] = input.m10;
+output[1][1] = input.m11;
+output[2][1] = input.m12;
+output[3][1] = input.m13;
+
+output[0][2] = input.m20;
+output[1][2] = input.m21;
+output[2][2] = input.m22;
+output[3][2] = input.m23;
+
+return output;
+}
+
::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const
::com::sun::star::geometry::AffineMatrix3D input )
{
::basegfx::B3DHomMatrix output;
@@ -369,6 +404,40 @@ namespace basegfx
return output;
}
+glm::mat4 glmMatFromHomMatrix( const ::basegfx::B2DHomMatrix input)
+{
+glm::mat4 output;
+output[0][0] = input.get(0,0);
+output[1][0] = input.get(0,1);
+output[2][0] = input.get(0,2);
+output[0][1] = input.get(1,0);
+output[1][1] = input.get(1,1);
+output[2][1] = input.get(1,2);
+
+return output;
+}
+
+glm::mat4 glmMatFromHomMatrix3d( const ::basegfx::B3DHomMatrix input)
+{
+glm::mat4 output;
+output[0][0] = input.get(0,0);
+output[1][0] = input.get(0,1);
+output[2][0] = input.get(0,2);
+output[3][0] = input.get(0,3);
+
+output[0][1] = input.get(1,0);
+output[1][1] = input.get(1,1);
+output[2][1] = input.get(1,2);
+output[3][1] = input.get(1,3);
+
+output[0][2] = input.get(2,0);
+output[1][2] = input.get(2,1);
+output[2][2] = input.get(2,2);
+output[3][2] = input.get(2,3);
+
+return output;
+}
+
geometry::AffineMatrix3D affineMatrixFromHomMatrix3D(
geometry::AffineMatrix3D output,
const ::basegfx::B3DHomMatrix input)
diff --git a/include/basegfx/tools/canvastools.hxx
b/include/basegfx/tools/canvastools.hxx
index c678805..2a3030a 100644
--- a/include/basegfx/tools/canvastools.hxx
+++ b/include/basegfx/tools/canvastools.hxx
@@ -23,6 +23,7 @@
#include com/sun/star/uno/Reference.hxx
#include com/sun/star/uno/Sequence.hxx
#include basegfx/basegfxdllapi.h
+#include glm/glm.hpp
namespace com { namespace sun { namespace star { namespace geometry
@@ -128,12 +129,21 @@ namespace basegfx
BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix
homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix
transform,
const
::com::sun::star::geometry::AffineMatrix2Dmatrix );
+ BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix
+homMatrixFromAffineMatrix3D( const
::com::sun::star::geometry::AffineMatrix3D matrix );
-BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D(
const ::com::sun::star::geometry::AffineMatrix3D matrix );
+
+
+BASEGFX_DLLPUBLIC glm::mat4 glmMatrixFromAffineMatrix( const
::com::sun::star::geometry::AffineMatrix2D matrix );
+
+BASEGFX_DLLPUBLIC glm::mat4 glmMatrixFromAffineMatrix3D( const
::com::sun::star::geometry::AffineMatrix3D matrix );
BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D
matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D matrix,
const ::basegfx::B2DHomMatrix
transform);
+
[Libreoffice-commits] core.git: include/formula sc/inc sc/source
include/formula/FormulaCompiler.hxx |9 -
sc/inc/externalrefmgr.hxx | 10 --
sc/source/core/inc/parclass.hxx |4
sc/source/ui/inc/docsh.hxx |4
4 files changed, 27 deletions(-)
New commits:
commit 5353c6dc9ddf36c810f32d678c13c1815547897a
Author: Tor Lillqvist t...@collabora.com
Date: Tue Nov 4 10:18:19 2014 +0200
Bin presumably obsolete SUNWS crack
Change-Id: I83038a7160251e59a2178e54859c2ab8e4bffe2e
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index a4fd1af..101369d 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -70,11 +70,6 @@ public:
FormulaCompiler(FormulaTokenArray _rArr);
virtual ~FormulaCompiler();
-// SUNWS8 needs a forward declared friend, otherwise members of the outer
-// class are not accessible.
-class OpCodeMap;
-friend class FormulaCompiler::OpCodeMap;
-
/** Mappings from strings to OpCodes and vice versa. */
class FORMULA_DLLPUBLIC OpCodeMap
{
@@ -362,10 +357,6 @@ private:
rCurr-SetForceArray( true);
}
-// SUNWS7 needs a forward declared friend, otherwise members of the outer
-// class are not accessible.
-class CurrentFactor;
-friend class FormulaCompiler::CurrentFactor;
class CurrentFactor
{
FormulaTokenRef pPrevFac;
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 8a2d3a4..d3f2b1e 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -123,11 +123,6 @@ private:
typedef ::boost::unordered_mapSCROW, RowDataType RowsDataType;
public:
-// SUNWS needs a forward declared friend, otherwise types and members
-// of the outer class are not accessible.
-class Table;
-friend class ScExternalRefCache::Table;
-
/**
* Represents a single cached table in an external document. It only
* stores non-empty cells; empty cells should never be stored in the data
@@ -336,11 +331,6 @@ private:
typedef ::boost::unordered_mapScRange, TokenArrayRef, RangeHash
RangeArrayMap;
typedef ::boost::unordered_mapOUString, OUString, OUStringHash
NamePairMap;
-// SUNWS needs a forward declared friend, otherwise types and members
-// of the outer class are not accessible.
-struct DocItem;
-friend struct ScExternalRefCache::DocItem;
-
/** Represents data cached for a single external document. */
struct DocItem
{
diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 881dbc2..aa1b074 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -101,10 +101,6 @@ private:
sal_uInt8 nRepeatLast;
};
-// SUNWS7 needs a forward declared friend, otherwise members of the outer
-// class are not accessible (in this case CommonData).
-struct RawData;
-friend struct ScParameterClassification::RawData;
struct RawData
{
OpCode eOp;
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 98f7109..fc6bccc 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -121,10 +121,6 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell,
public SfxListener
SAL_DLLPRIVATE void InitOptions(bool bForLoading);
SAL_DLLPRIVATE void ResetDrawObjectShell();
-// SUNWS needs a forward declared friend, otherwise types and members
-// of the outer class are not accessible.
-class PrepareSaveGuard;
-friend class ScDocShell::PrepareSaveGuard;
/** Do things that need to be done before saving to our own format and
necessary clean ups in dtor. */
class PrepareSaveGuard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/CellColorHandler.cxx |8 +---
writerfilter/source/dmapper/CellColorHandler.hxx |3 ++-
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 768d22a83e7e6aae430b2e5e4ed28f2574aad12d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 09:50:31 2014 +0100
Use comphelper::SequenceAsVector
Change-Id: Iaf5fb72b065cc0d2a412b027d41d7618654d30b1
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 9434b2e..4b6657c 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -298,13 +298,7 @@ beans::PropertyValue CellColorHandler::getInteropGrabBag()
{
beans::PropertyValue aRet;
aRet.Name = m_aInteropGrabBagName;
-
-uno::Sequencebeans::PropertyValue aSeq(m_aInteropGrabBag.size());
-beans::PropertyValue* pSeq = aSeq.getArray();
-for (std::vectorbeans::PropertyValue::iterator i =
m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i)
-*pSeq++ = *i;
-
-aRet.Value = uno::makeAny(aSeq);
+aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
return aRet;
}
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx
b/writerfilter/source/dmapper/CellColorHandler.hxx
index d909d85..041272d 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -24,6 +24,7 @@
#include vector
#include com/sun/star/beans/PropertyValue.hpp
+#include comphelper/sequenceasvector.hxx
namespace writerfilter {
namespace dmapper
@@ -40,7 +41,7 @@ private:
OutputFormat m_OutputFormat;
OUString m_aInteropGrabBagName;
-std::vectorcss::beans::PropertyValue m_aInteropGrabBag;
+comphelper::SequenceAsVectorcss::beans::PropertyValue m_aInteropGrabBag;
// Properties
virtual void lcl_attribute(Id Name, Value val) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 2 commits - package/inc package/source
package/inc/ZipOutputStream.hxx|6 +++---
package/source/zipapi/ZipOutputStream.cxx | 13 -
package/source/zippackage/ZipPackageStream.cxx |9 +++--
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 826e0ee5011152f6009f5eaf4a88b6d57a3efd28
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Nov 4 09:58:00 2014 +0100
package: Use comphelper::ThreadPool for deflating
Change-Id: I6bd75c0aeff18b17fba933874a9964fe1dc47404
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 54638d5..acf6dc4 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -23,7 +23,7 @@
#include com/sun/star/io/XOutputStream.hpp
#include ByteChucker.hxx
-#include osl/thread.hxx
+#include comphelper/threadpool.hxx
#include vector
@@ -38,7 +38,7 @@ class ZipOutputStream
ByteChucker m_aChucker;
ZipEntry*m_pCurrentEntry;
-std::vector osl::Thread* m_aWorkers;
+comphelper::ThreadPool m_rSharedThreadPool;
std::vector ZipOutputEntry* m_aEntries;
public:
@@ -46,7 +46,7 @@ public:
const ::com::sun::star::uno::Reference
::com::sun::star::io::XOutputStream xOStream );
~ZipOutputStream();
-void addDeflatingThread( ZipOutputEntry *pEntry, osl::Thread *pThread );
+void addDeflatingThread( ZipOutputEntry *pEntry, comphelper::ThreadTask
*pThreadTask );
void writeLOC( ZipEntry *pEntry, bool bEncrypt = false )
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
diff --git a/package/source/zipapi/ZipOutputStream.cxx
b/package/source/zipapi/ZipOutputStream.cxx
index c91b351..902816e 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -41,6 +41,7 @@ ZipOutputStream::ZipOutputStream( const uno::Reference
io::XOutputStream xO
: m_xStream(xOStream)
, m_aChucker(xOStream)
, m_pCurrentEntry(NULL)
+, m_rSharedThreadPool(comphelper::ThreadPool::getSharedOptimalPool())
{
}
@@ -64,11 +65,10 @@ void ZipOutputStream::setEntry( ZipEntry *pEntry )
}
}
-void ZipOutputStream::addDeflatingThread( ZipOutputEntry *pEntry, osl::Thread
*pThread )
+void ZipOutputStream::addDeflatingThread( ZipOutputEntry *pEntry,
comphelper::ThreadTask *pThread )
{
-m_aWorkers.push_back(pThread);
+m_rSharedThreadPool.pushTask(pThread);
m_aEntries.push_back(pEntry);
-pThread-create();
}
void ZipOutputStream::rawWrite( const Sequence sal_Int8 rBuffer )
@@ -96,12 +96,7 @@ void ZipOutputStream::finish()
assert(!m_aZipList.empty() Zip file must have at least one entry!);
// Wait for all threads to finish write
-for (size_t i = 0; i m_aWorkers.size(); i++)
-{
-m_aWorkers[i]-join();
-delete m_aWorkers[i];
-}
-
+m_rSharedThreadPool.waitUntilEmpty();
for (size_t i = 0; i m_aEntries.size(); i++)
{
writeLOC(m_aEntries[i]-getZipEntry(), m_aEntries[i]-isEncrypt());
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index 548f1c5..df0bf46 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -456,7 +456,7 @@ static void deflateZipEntry(ZipOutputEntry *pZipEntry,
pZipEntry-closeEntry();
}
-class DeflateThread: public osl::Thread
+class DeflateThread: public comphelper::ThreadTask
{
ZipOutputEntry *mpEntry;
uno::Reference io::XInputStream mxInStream;
@@ -469,7 +469,7 @@ public:
{}
private:
-virtual void SAL_CALL run() SAL_OVERRIDE
+virtual void doWork() SAL_OVERRIDE
{
deflateZipEntry(mpEntry, mxInStream);
mxInStream.clear();
commit 5916edd1e68af2b2a989c0883c5f39ef17e62a8c
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Nov 4 09:18:57 2014 +0100
package: Do not deflate small streams in a thread
Change-Id: Iae804a34f344aa793a6d5c13315f7bc1eb64c0a2
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index 1efa9ab..548f1c5 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -798,6 +798,11 @@ bool ZipPackageStream::saveChild(
else
{
bParallelDeflate = true;
+// Do not deflate small streams in a thread
+uno::Reference io::XSeekable xSeek( xStream, uno::UNO_QUERY
);
+if (xSeek.is() xSeek-getLength() 10)
+bParallelDeflate = false;
+
if (bParallelDeflate)
{
// Start a new thread deflating this zip entry
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdtrans.hxx |1 -
svx/source/svdraw/svdtrans.cxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit 5310dfe1cdf4cfa1f86036476694a076b71671db
Author: Juan Picca jumap...@gmail.com
Date: Mon Nov 3 15:31:45 2014 -0200
SdrFormatter: remove unused attribute
Change-Id: I70633d3a4cea72c21a644e5a2f25865d8ec52122
Reviewed-on: https://gerrit.libreoffice.org/12227
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 8bce426..e79bbb8 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -265,7 +265,6 @@ inline bool IsInch(FieldUnit eU) {
}
class SVX_DLLPUBLIC SdrFormatter {
-Fraction aScale;
long nMul_;
long nDiv_;
short nKomma_;
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index f3cccd0..31a4448 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -789,7 +789,6 @@ void GetMeterOrInch(FieldUnit eFU, short rnKomma, long
rnMul, long rnDiv, boo
void SdrFormatter::Undirty()
{
-if (aScale.GetNumerator()==0 || aScale.GetDenominator()==0)
aScale=Fraction(1,1);
bool bSrcMetr,bSrcInch,bDstMetr,bDstInch;
long nMul1,nDiv1,nMul2,nDiv2;
short nKomma1,nKomma2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |6
+++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f1840a8bc09e9f6704cd02e93521f9bdb4bbe70b
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Nov 4 09:31:29 2014 +
constify slideshow.
Change-Id: I548f527be4be76a2bda43dcb5ee14e4f50f3b409
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 2d5d062..22fca91 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -446,7 +446,7 @@ void OGLTransitionerImpl::impl_prepareSlides()
#if defined( GLX_EXT_texture_from_pixmap )
-GLWindow rGLWindow(mpContext-getOpenGLWindow());
+const GLWindow rGLWindow(mpContext-getOpenGLWindow());
if( GLXEW_EXT_texture_from_pixmap xLeavingSet.is() xEnteringSet.is()
mbHasTFPVisual ) {
Sequence Any leaveArgs;
@@ -1218,7 +1218,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime )
throw (uno::RuntimeExc
if(mpTransition)
{
-GLWindow rGLWindow(mpContext-getOpenGLWindow());
+const GLWindow rGLWindow(mpContext-getOpenGLWindow());
mpTransition-display( nTime, maLeavingSlideGL, maEnteringSlideGL,
maSlideSize.Width, maSlideSize.Height,
static_castdouble(rGLWindow.Width),
@@ -1261,7 +1261,7 @@ void OGLTransitionerImpl::disposeTextures()
mpContext-makeCurrent();
#if defined( GLX_EXT_texture_from_pixmap )
-GLWindow rGLWindow(mpContext-getOpenGLWindow());
+const GLWindow rGLWindow(mpContext-getOpenGLWindow());
if( mbUseLeavingPixmap ) {
glXReleaseTexImageEXT( rGLWindow.dpy, maLeavingPixmapGL,
GLX_FRONT_LEFT_EXT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 32419] When inserted on Writer, get Base size for formulas from underlining paragraph
https://bugs.freedesktop.org/show_bug.cgi?id=32419 --- Comment #12 from Yury yury.tarasiev...@gmail.com --- Strictly speaking, that isn't a bug, but a request for (rather needed) enhancement. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source unusedcode.easy
sc/inc/document.hxx |3 --
sc/inc/table.hxx |2 -
sc/source/core/data/documen7.cxx | 48 ---
sc/source/core/data/table3.cxx | 30
sc/source/ui/inc/tabview.hxx |2 -
sc/source/ui/inc/undobase.hxx|2 -
sc/source/ui/undo/undobase.cxx |6
sc/source/ui/view/tabview5.cxx | 33 --
unusedcode.easy |4 ---
9 files changed, 130 deletions(-)
New commits:
commit 389875573012c6373d95ef31b12fe8e8104b1233
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 4 11:42:49 2014 +0200
remove some unused code in sc
Change-Id: I6cd2acaf361ae1947787b5aacc86b75a6e21c379
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e593387..47387bd 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1864,9 +1864,6 @@ public:
/// only area, no cell broadcast
voidAreaBroadcast( const ScHint rHint );
-/// only areas in range, no cell broadcasts
-voidAreaBroadcastInRange( const ScRange rRange,
- const ScHint rHint );
voidDelBroadcastAreasInRange( const ScRange rRange );
voidUpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
const ScRange rRange,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b65f829..d396402 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -246,8 +246,6 @@ public:
voidRemoveSubTotals( ScSubTotalParam rParam );
boolDoSubTotals( ScSubTotalParam rParam );
-void MarkSubTotalCells( sc::ColumnSpanSet rSet, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, bool bVal ) const;
-
const ScSheetEvents* GetSheetEvents() const { return
pSheetEvents; }
voidSetSheetEvents( const ScSheetEvents* pNew );
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 2e71884..af09c83 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -233,54 +233,6 @@ void ScDocument::AreaBroadcast( const ScHint rHint )
}
}
-void ScDocument::AreaBroadcastInRange( const ScRange rRange, const ScHint
rHint )
-{
-if ( !pBASM )
-return ;// Clipboard or Undo
-if ( !bHardRecalcState )
-{
-ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast
-if ( pBASM-AreaBroadcastInRange( rRange, rHint ) )
-TrackFormulas( rHint.GetId() );
-}
-
-// Repaint for conditional formats containing relative references.
-//! This is _THE_ bottle neck!
-TableContainer::iterator itr = maTabs.begin();
-for(; itr != maTabs.end(); ++itr)
-{
-if(!*itr)
-continue;
-
-ScConditionalFormatList* pCondFormList = (*itr)-GetCondFormList();
-if ( pCondFormList )
-{
-SCCOL nCol1;
-SCROW nRow1;
-SCTAB nTab1;
-SCCOL nCol2;
-SCROW nRow2;
-SCTAB nTab2;
-rRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
-ScAddress aAddress( rRange.aStart );
-for ( SCTAB nTab = nTab1; nTab = nTab2; ++nTab )
-{
-aAddress.SetTab( nTab );
-for ( SCCOL nCol = nCol1; nCol = nCol2; ++nCol )
-{
-aAddress.SetCol( nCol );
-for ( SCROW nRow = nRow1; nRow = nRow2; ++nRow )
-{
-aAddress.SetRow( nRow );
-pCondFormList-SourceChanged( aAddress );
-}
-}
-}
-}
-
-}
-}
-
void ScDocument::DelBroadcastAreasInRange( const ScRange rRange )
{
if ( pBASM )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index b7661fe..f7c6118 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1804,36 +1804,6 @@ bool ScTable::DoSubTotals( ScSubTotalParam rParam )
return bSpaceLeft;
}
-void ScTable::MarkSubTotalCells(
-sc::ColumnSpanSet rSet, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, bool bVal ) const
-{
-if (!ValidCol(nCol1) || !ValidCol(nCol2))
-return;
-
-// Pick up all subtotal formula cells.
-for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
-aCol[nCol].MarkSubTotalCells(rSet, nRow1, nRow2, bVal);
-
-// Pick up all filtered rows.
-ScFlatBoolRowSegments::RangeData aFilteredSpan;
-SCROW nRow = nRow1;
-while (nRow = nRow2)
-{
-if (!mpFilteredRows-getRangeData(nRow, aFilteredSpan))
-// Failed for whatever reason.
-return;
-
-if (aFilteredSpan.mbValue)
-{
-// Filtered span found.
-for (SCCOL nCol = nCol1; nCol =
Re: 'master' 'make check' lcov code coverage report
Hrm. Looks like I may have made a silly (and wrong) assumption. Is all non-libreoffice code located in these two directory's in the source tree ? : src/libreoffice/workdir/ExternalProject/libfoo src/libreoffice/external/libfoo In that case, it may simply be the case of excluding these two top directory's: 'workdir/ExternalProject/*' and 'external/*' from the report to get the desired behavior of not seeing non-libreoffice code in the lcov report. Ill give it a go. - Maarten. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source unusedcode.easy
chart2/source/inc/BaseGFXHelper.hxx |4
chart2/source/inc/InternalData.hxx|1 -
chart2/source/tools/BaseGFXHelper.cxx |8
chart2/source/tools/InternalData.cxx | 14 --
unusedcode.easy |2 --
5 files changed, 29 deletions(-)
New commits:
commit a6fb1e8885065ae8229b955bb3c23f4d1209af6a
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 4 11:49:53 2014 +0200
remove some unused code in chart2
Change-Id: I99afd30ad413b57d27c89421b5010f6d88856496
diff --git a/chart2/source/inc/BaseGFXHelper.hxx
b/chart2/source/inc/BaseGFXHelper.hxx
index e4f9867..713cccb 100644
--- a/chart2/source/inc/BaseGFXHelper.hxx
+++ b/chart2/source/inc/BaseGFXHelper.hxx
@@ -55,10 +55,6 @@ OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Point
B2IRectangleToAWTPoint(
OOO_DLLPUBLIC_CHARTTOOLS com::sun::star::awt::Size B2IRectangleToAWTSize(
const ::basegfx::B2IRectangle rB2IRectangle );
-OOO_DLLPUBLIC_CHARTTOOLS
-com::sun::star::awt::Rectangle B2IRectangleToAWTRectangle(
-const ::basegfx::B2IRectangle rB2IRectangle );
-
::basegfx::B3DVector Direction3DToB3DVector(
const com::sun::star::drawing::Direction3D rDirection );
diff --git a/chart2/source/inc/InternalData.hxx
b/chart2/source/inc/InternalData.hxx
index d35d7a5..488be16 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -33,7 +33,6 @@ public:
InternalData();
void createDefaultData();
-bool isDefaultData();
void setData( const ::com::sun::star::uno::Sequence
::com::sun::star::uno::Sequence doublerDataInRows );
diff --git a/chart2/source/tools/BaseGFXHelper.cxx
b/chart2/source/tools/BaseGFXHelper.cxx
index 8b79b68..57f3a77 100644
--- a/chart2/source/tools/BaseGFXHelper.cxx
+++ b/chart2/source/tools/BaseGFXHelper.cxx
@@ -82,14 +82,6 @@ awt::Size B2IRectangleToAWTSize( const
::basegfx::B2IRectangle rB2IRectangle )
static_cast sal_Int32 ( rB2IRectangle.getHeight()));
}
-awt::Rectangle B2IRectangleToAWTRectangle(
-const ::basegfx::B2IRectangle rB2IRectangle )
-{
-return awt::Rectangle( rB2IRectangle.getMinX(), rB2IRectangle.getMinY(),
- static_cast sal_Int32 ( rB2IRectangle.getWidth()),
- static_cast sal_Int32 (
rB2IRectangle.getHeight()));
-}
-
B3DVector Direction3DToB3DVector( const Direction3D rDirection )
{
return B3DVector(
diff --git a/chart2/source/tools/InternalData.cxx
b/chart2/source/tools/InternalData.cxx
index b0f871bb..8e19da5 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -118,20 +118,6 @@ void InternalData::createDefaultData()
lcl_NumberedStringGenerator( aColName, %COLUMNNUMBER ));
}
-bool InternalData::isDefaultData()
-{
-
-if( m_nRowCount == 4 m_nColumnCount == 3 )
-{
-for( sal_Int32 i=0; i(4*3); ++i )
-if( m_aData[i] != fDefaultData[i] )
-return false;
-
-return true;
-}
-return false;
-}
-
void InternalData::setData( const Sequence Sequence double rDataInRows )
{
m_nRowCount = rDataInRows.getLength();
diff --git a/unusedcode.easy b/unusedcode.easy
index c3ca2a4..31486fb 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -166,9 +166,7 @@ apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon
const)
canvas::createSurfaceProxyManager(boost::shared_ptrcanvas::IRenderModule
const)
-chart::BaseGFXHelper::B2IRectangleToAWTRectangle(basegfx::B2IRange const)
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
const)
-chart::InternalData::isDefaultData()
chart::ShapeToolbarController::create(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
const)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
comphelper::ThreadPool::getSharedOptimalPool()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox
include/oox/drawingml/shape.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit fdc5183176cb07b44f56f81efa005c30835dee98 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Nov 4 11:25:10 2014 +0100 Remove unused members Change-Id: I39b12a6290d13a5404dae60b0b16548b035f24d8 diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 3c999b0..c0303a3 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -242,8 +242,6 @@ protected: std::vector ShapePtr maChildren; // only used for group shapes com::sun::star::awt::Size maChSize; // only used for group shapes com::sun::star::awt::Point maChPosition; // only used for group shapes -com::sun::star::awt::Size maAbsoluteSize; // only used for group shapes -com::sun::star::awt::Point maAbsolutePosition; // only used for group shapes boolmbIsChild; TextBodyPtr mpTextBody; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 'master' 'make check' lcov code coverage report
On 04.11.2014 10:49, Maarten Hoes wrote: Hrm. Looks like I may have made a silly (and wrong) assumption. Is all non-libreoffice code located in these two directory's in the source tree ? : src/libreoffice/workdir/ExternalProject/libfoo src/libreoffice/external/libfoo easily 98% of it is; arguably it should be 100% but sometimes people take short-cuts... that is true for the source code (hoping you can filter at that level?); there are some externals that are built with our own build system so the object files end up in workdir/*Object like all the LO code. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: 3 commits - msodumper/docrecord.py test/doc
msodumper/docrecord.py | 158 ++---
test/doc/formtext.doc |binary
test/doc/test.py |9 ++
3 files changed, 159 insertions(+), 8 deletions(-)
New commits:
commit 9a72febc7f4162e55ba7e542ea51f35eb1210824
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 12:00:33 2014 +0100
dump FFData
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 9ad1056..1586c48 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -1045,6 +1045,91 @@ class PICF(DOCDirStream):
print '/picf'
+IType = {
+0: iTypeText,
+1: iTypeChck,
+2: iTypeDrop
+}
+
+
+ITypeTxt = {
+0: iTypeTxtReg,
+1: iTypeTxtNum,
+2: iTypeTxtDate,
+3: iTypeTxtCurDate,
+4: iTypeTxtCurTime,
+5: iTypeTxtCalc
+}
+
+
+class FFDataBits(DOCDirStream):
+The FFDataBits structure specifies the type and properties for a form
+field that is specified by a FFData.
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+
+def dump(self):
+print 'FFDataBits'
+buf = self.readuInt8()
+self.printAndSet(iType, buf 0x0003, dict=IType) # 1..2nd bits
+self.printAndSet(iRes, buf 0x007c) # 3..7th bits
+self.printAndSet(fOwnHelp, self.getBit(buf, 8))
+buf = self.readuInt8()
+self.printAndSet(fOwnStat, self.getBit(buf, 1))
+self.printAndSet(fProt, self.getBit(buf, 2))
+self.printAndSet(iSize, self.getBit(buf, 3))
+self.printAndSet(iTypeTxt, buf 0x0038, dict=ITypeTxt) # 4..6th
bits
+self.printAndSet(fRecalc, self.getBit(buf, 7))
+self.printAndSet(fHasListBox, self.getBit(buf, 8))
+print '/FFDataBits'
+self.parent.pos = self.pos
+
+
+class FFData(DOCDirStream):
+The FFData structure specifies form field data for a text box, check
+box, or drop-down list box. (Page 348 of [MS-DOC] spec.)
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+self.parent = parent
+
+def dump(self):
+print 'FFData'
+self.printAndSet(version, self.readuInt32())
+self.bits = FFDataBits(self)
+self.bits.dump()
+self.printAndSet(cch, self.readuInt16())
+self.printAndSet(hps, self.readuInt16())
+xstzName = Xstz(self, xstzName)
+xstzName.dump()
+self.pos = xstzName.pos
+xstzTextDef = Xstz(self, xstzTextDef)
+xstzTextDef.dump()
+self.pos = xstzTextDef.pos
+if self.bits.iType == 1 or self.bits.iType == 2: # iTypeChck or
iTypeDrop
+self.printAndSet(wDef, self.readuInt16())
+xstzTextFormat = Xstz(self, xstzTextFormat)
+xstzTextFormat.dump()
+self.pos = xstzTextFormat.pos
+xstzHelpText = Xstz(self, xstzHelpText)
+xstzHelpText.dump()
+self.pos = xstzHelpText.pos
+xstzStatText = Xstz(self, xstzStatText)
+xstzStatText.dump()
+self.pos = xstzStatText.pos
+xstzEntryMcr = Xstz(self, xstzEntryMcr)
+xstzEntryMcr.dump()
+self.pos = xstzEntryMcr.pos
+xstzExitMcr = Xstz(self, xstzExitMcr)
+xstzExitMcr.dump()
+self.pos = xstzExitMcr.pos
+if self.bits.iType == 2: # iTypeDrop
+print 'todo what=FFData::dump(): handle hsttbDropList for
iTypeDrop/'
+print '/FFData'
+
+
class NilPICFAndBinData(DOCDirStream):
The NilPICFAndBinData structure that holds header information and binary
data for a hyperlink, form field, or add-in field. The NilPICFAndBinData
@@ -1079,7 +1164,7 @@ class NilPICFAndBinData(DOCDirStream):
self.printAndSet(ignored15, self.readInt16())
fieldType = chpxFkp.transformeds[-2]
if fieldType == FORMTEXT :
-print 'todo what=NilPICFAndBinData::dump(): FORMTEXT/'
+FFData(self).dump()
else:
print 'todo what=NilPICFAndBinData::dump(): handle %s/' %
fieldType
print '/NilPICFAndBinData'
@@ -3137,17 +3222,18 @@ class Xst(DOCDirStream):
class Xstz(DOCDirStream):
The Xstz structure is a string. The string is prepended by its length
and is null-terminated.
-def __init__(self, parent):
+def __init__(self, parent, name=xstz):
DOCDirStream.__init__(self, parent.bytes)
self.pos = parent.pos
+self.name = name
def dump(self):
-print 'xstz type=Xstz offset=%d' % self.pos
+print '%s type=Xstz offset=%d' % (self.name, self.pos)
xst = Xst(self)
xst.dump()
self.pos = xst.pos
self.printAndSet(chTerm, self.readuInt16())
-print '/xstz'
+print '/%s' % self.name
class UpxPapx(DOCDirStream):
diff --git a/test/doc/formtext.doc b/test/doc/formtext.doc
new file mode 100644
index 000..5f92c3e
Binary files /dev/null and
Re: 'master' 'make check' lcov code coverage report
On Mon, Nov 3, 2014 at 5:59 PM, Caolán McNamara caol...@redhat.com wrote: The catch apparently is that we don't have a single image/x-photo-cd pcd attachment in any of the Red Hat, Freedesktop, legacy OpenOffice.org, etc bugzillas to use as a test now that I look into my local horde from ./bin/get-bugzilla-attachments-by-mimetype So there's got to be some (non-offensive) examples out there somewhere else we can use or make some from scratch with ImageMagick or something that can export to the format. I can easily export some pictures to the psd format for you. Just point me to the location of the source files you want converted, and a place I can upload the converted images. - Maarten. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit be7e9d72f4ca87476fbeda5bed48732244dc588b
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 4 12:23:06 2014 +0100
sw: fix windows build
Change-Id: I24aedc513897579b3f3c3bf9884183a67b93cd39
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index faa3d4f..15834fe 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -162,8 +162,6 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbeddedDocument,
skipimage-embedded-docum
assertXPathContent(pDoc, /html/body/p/span/p/span, Inner.);
}
-#endif
-
DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
checkbox-radiobutton.doc)
{
htmlDocPtr pDoc = parseHtml(maTempFile);
@@ -183,6 +181,7 @@ DECLARE_HTMLEXPORT_TEST(testExportCheckboxRadioButtonState,
checkbox-radiobutto
assertXPath(pDoc, /html/body/form/p[4]/input, type, radio);
// FIXME not in 4.3 assertXPathNoAttribute(pDoc,
/html/body/form/p[4]/input, checked);
}
+#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
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/tbxctrls/extrusioncontrols.cxx | 43 ++
svx/source/tbxctrls/extrusioncontrols.hxx | 16 +++
svx/source/tbxctrls/fontworkgallery.cxx | 30
3 files changed, 89 insertions(+)
New commits:
commit 966daa8e278bd0aef180b2d87b264e10c3a82afd
Author: Maxim Monastirsky momonas...@gmail.com
Date: Tue Nov 4 13:36:50 2014 +0200
Set ToolBoxItemBits inside the controller
Don't rely on the toolbar:style attribute of the toolbar xml,
because it's not available after toolbar customization, or
when placing the button on a different toolbar.
See 99ace739828f9d79a2f9b04ef066b90d77f77bc4 for a similar fix.
Change-Id: Ia9485cafe111ba609fe802c984be1aa9db3a2ca9
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx
b/svx/source/tbxctrls/extrusioncontrols.cxx
index ce53af1..6e50dda 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -243,6 +243,17 @@ vcl::Window* ExtrusionDirectionControl::createPopupWindow(
vcl::Window* pParent
return new ExtrusionDirectionWindow( *this, m_xFrame, pParent );
}
+// XInitialization
+void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence
css::uno::Any aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+svt::PopupWindowController::initialize( aArguments );
+
+ToolBox* pToolBox = 0;
+sal_uInt16 nId = 0;
+if ( getToolboxId( nId, pToolBox ) )
+pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) |
ToolBoxItemBits::DROPDOWNONLY );
+}
// XServiceInfo
@@ -493,7 +504,17 @@ vcl::Window* ExtrusionDepthController::createPopupWindow(
vcl::Window* pParent )
return new ExtrusionDepthWindow( *this, m_xFrame, pParent );
}
+// XInitialization
+void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence
css::uno::Any aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+svt::PopupWindowController::initialize( aArguments );
+ToolBox* pToolBox = 0;
+sal_uInt16 nId = 0;
+if ( getToolboxId( nId, pToolBox ) )
+pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) |
ToolBoxItemBits::DROPDOWNONLY );
+}
// XServiceInfo
@@ -750,6 +771,17 @@ vcl::Window* ExtrusionLightingControl::createPopupWindow(
vcl::Window* pParent )
return new ExtrusionLightingWindow( *this, m_xFrame, pParent );
}
+// XInitialization
+void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence
css::uno::Any aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+svt::PopupWindowController::initialize( aArguments );
+
+ToolBox* pToolBox = 0;
+sal_uInt16 nId = 0;
+if ( getToolboxId( nId, pToolBox ) )
+pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) |
ToolBoxItemBits::DROPDOWNONLY );
+}
// XServiceInfo
@@ -893,6 +925,17 @@ vcl::Window* ExtrusionSurfaceControl::createPopupWindow(
vcl::Window* pParent )
return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent );
}
+// XInitialization
+void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence
css::uno::Any aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+svt::PopupWindowController::initialize( aArguments );
+
+ToolBox* pToolBox = 0;
+sal_uInt16 nId = 0;
+if ( getToolboxId( nId, pToolBox ) )
+pToolBox-SetItemBits( nId, pToolBox-GetItemBits( nId ) |
ToolBoxItemBits::DROPDOWNONLY );
+}
// XServiceInfo
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx
b/svx/source/tbxctrls/extrusioncontrols.hxx
index 6559985..e3b4bfa 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -73,6 +73,10 @@ public:
virtual vcl::Window* createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException,
std::exception ) SAL_OVERRIDE;
+
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(
::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException,
std::exception ) SAL_OVERRIDE;
@@ -121,6 +125,10 @@ public:
virtual vcl::Window* createPopupWindow( vcl::Window* pParent )
SAL_OVERRIDE;
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence css::uno::Any
aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException,
std::exception ) SAL_OVERRIDE;
+
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(
::com::sun::star::uno::RuntimeException,
[Libreoffice-commits] core.git: Branch 'feature/priorities' - chart2/source editeng/source include/svx reportdesign/source svx/inc svx/source
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |4 -
editeng/source/editeng/impedit.hxx|2
editeng/source/editeng/impedit2.cxx |2
include/svx/svdpntv.hxx |2
reportdesign/source/ui/dlg/Navigator.cxx | 37 ++
svx/inc/svdibrow.hxx |2
svx/source/svdraw/svdibrow.cxx|2
svx/source/svdraw/svdpntv.cxx | 10 +--
8 files changed, 28 insertions(+), 33 deletions(-)
New commits:
commit df6e72c0135a70c1abb20fadbfc3ddc287376189
Author: Jennifer Liebel jliebe...@gmail.com
Date: Tue Nov 4 11:51:15 2014 +
changed some timer to idle
Change-Id: Ifd5e2d87732d3e537c7754e52be24ef768ecb8d9
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 63d093f..0870786 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -154,8 +154,8 @@ void DrawViewWrapper::ReInit()
DrawViewWrapper::~DrawViewWrapper()
{
-aComeBackTimer.Stop();//@todo this should be done in destructor of base
class
-UnmarkAllObj();//necessary to aavoid a paint call during the destructor
hierarchy
+aComeBackIdle.Stop();//@todo this should be done in destructor of base
class
+UnmarkAllObj();//necessary to avoid a paint call during the destructor
hierarchy
}
SdrPageView* DrawViewWrapper::GetPageView() const
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 68ef6ed..9c44b36 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -182,7 +182,7 @@ struct FormatterFontMetric
sal_uInt16 GetHeight() const { return nMaxAscent+nMaxDescent; }
};
-class IdleFormattter : public Timer
+class IdleFormattter : public Idle
{
private:
EditView* pView;
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 9a46f58..27c2ad9 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -145,7 +145,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool*
pItemPool ) :
aStatusTimer.SetTimeout( 200 );
aStatusTimer.SetTimeoutHdl( LINK( this, ImpEditEngine, StatusTimerHdl ) );
-aIdleFormatter.SetTimeout( 5 );
+aIdleFormatter.SetPriority( VCL_IDLE_PRIORITY_REPAINT );
aIdleFormatter.SetTimeoutHdl( LINK( this, ImpEditEngine, IdleFormatHdl ) );
aOnlineSpellTimer.SetTimeout( 100 );
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 54df1af..44da516 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -152,7 +152,7 @@ protected:
SdrDragStat aDragStat;
Rectangle aMaxWorkArea;
SfxItemSet aDefaultAttr;
-Timer aComeBackTimer;
+IdleaComeBackIdle;
SdrAnimationModeeAnimationMode;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx
b/reportdesign/source/ui/dlg/Navigator.cxx
index 13c9dad..d36b761 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -423,29 +423,24 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
switch ( m_aDropActionType )
{
-case DA_EXPANDNODE:
-{
-SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered);
-if (pToExpand (GetChildCount(pToExpand) 0)
!IsExpanded(pToExpand))
-// tja, eigentlich muesste ich noch testen, ob die Node nicht
schon expandiert ist, aber ich
-// habe dazu weder in den Basisklassen noch im Model eine Methode
gefunden ...
-// aber ich denke, die BK sollte es auch so vertragen
-Expand(pToExpand);
-
-// nach dem Expand habe ich im Gegensatz zum Scrollen natuerlich nix
mehr zu tun
-m_aDropActionTimer.Stop();
-}
-break;
-
-case DA_SCROLLUP :
-ScrollOutputArea( 1 );
-m_nTimerCounter = DROP_ACTION_TIMER_SCROLL_TICKS;
+case DA_EXPANDNODE:
+{
+SvTreeListEntry* pToExpand = GetEntry(m_aTimerTriggered);
+if (pToExpand (GetChildCount(pToExpand) 0)
!IsExpanded(pToExpand))
+Expand(pToExpand);
+m_aDropActionTimer.Stop();
+}
break;
-case DA_SCROLLDOWN :
-ScrollOutputArea( -1 );
-m_nTimerCounter = DROP_ACTION_TIMER_SCROLL_TICKS;
-break;
+case DA_SCROLLUP :
+ScrollOutputArea( 1 );
+m_nTimerCounter = DROP_ACTION_TIMER_SCROLL_TICKS;
+break;
+
+case DA_SCROLLDOWN :
+ScrollOutputArea( -1 );
+m_nTimerCounter = DROP_ACTION_TIMER_SCROLL_TICKS;
+break;
}
[Libreoffice-commits] core.git: Branch 'feature/priorities' - include/svtools svtools/source
include/svtools/filechangedchecker.hxx |2 +-
svtools/source/graphic/grfcache.cxx|7 +++
svtools/source/graphic/grfcache.hxx|2 +-
svtools/source/misc/filechangedchecker.cxx | 18 +-
4 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 930a2c4cc5a5895d44a01e1da5467c0387af69af
Author: Tobias Madl tobias.madl@gmail.com
Date: Tue Nov 4 11:51:18 2014 +
Changed Idle Timers. into Idle
Change-Id: I44e33e9e04893237578eb685516fa5ffe43e397f
diff --git a/include/svtools/filechangedchecker.hxx
b/include/svtools/filechangedchecker.hxx
index acff32d..cea8d16 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -23,7 +23,7 @@
class SVT_DLLPUBLIC FileChangedChecker
{
private :
-TimermTimer;
+IdlemIdle;
OUStringmFileName;
TimeValuemLastModTime;
::boost::function0void mpCallback;
diff --git a/svtools/source/graphic/grfcache.cxx
b/svtools/source/graphic/grfcache.cxx
index ca4347e..243eeb9 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -32,7 +32,6 @@
#include rtl/crc.h
#include boost/scoped_ptr.hpp
-#define RELEASE_TIMEOUT 1
#define MAX_BMP_EXTENT 4096
static const char aHexData[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
'9', 'A', 'B', 'C', 'D', 'E', 'F' };
@@ -828,9 +827,9 @@ GraphicCache::GraphicCache( sal_uLong nDisplayCacheSize,
sal_uLong nMaxObjDispla
mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ),
mnUsedDisplaySize ( 0UL )
{
-maReleaseTimer.SetTimeoutHdl( LINK( this, GraphicCache, ReleaseTimeoutHdl
) );
-maReleaseTimer.SetTimeout( RELEASE_TIMEOUT );
-maReleaseTimer.Start();
+maReleaseIdle.SetIdleHdl( LINK( this, GraphicCache, ReleaseTimeoutHdl ) );
+maReleaseIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+maReleaseIdle.Start();
}
GraphicCache::~GraphicCache()
diff --git a/svtools/source/graphic/grfcache.hxx
b/svtools/source/graphic/grfcache.hxx
index ddb6f6b..e8259e7 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -39,7 +39,7 @@ private:
typedef std::list GraphicCacheEntry* GraphicCacheEntryList;
typedef std::list GraphicDisplayCacheEntry*
GraphicDisplayCacheEntryList;
-Timer maReleaseTimer;
+IdlemaReleaseIdle;
GraphicCacheEntryList maGraphicCache;
GraphicDisplayCacheEntryList maDisplayCache;
sal_uLong mnReleaseTimeoutSeconds;
diff --git a/svtools/source/misc/filechangedchecker.cxx
b/svtools/source/misc/filechangedchecker.cxx
index 9d8a713..33d5008 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -12,7 +12,7 @@
#include svtools/filechangedchecker.hxx
FileChangedChecker::FileChangedChecker(const OUString rFilename, const
::boost::function0void rCallback) :
-mTimer(),
+mIdle(),
mFileName(rFilename),
mLastModTime(),
mpCallback(rCallback)
@@ -20,8 +20,8 @@ FileChangedChecker::FileChangedChecker(const OUString
rFilename, const ::boost:
// Get the curren last file modified Status
getCurrentModTime(mLastModTime);
-// associate the callback function for the timer
-mTimer.SetTimeoutHdl(LINK(this, FileChangedChecker, TimerHandler));
+// associate the callback function for the Idle
+mIdle.SetIdleHdl(LINK(this, FileChangedChecker, TimerHandler));
//start the timer
resetTimer();
@@ -29,12 +29,12 @@ FileChangedChecker::FileChangedChecker(const OUString
rFilename, const ::boost:
void FileChangedChecker::resetTimer()
{
-//Start the timer if its not active
-if(!mTimer.IsActive())
-mTimer.Start();
+//Start the Idle if its not active
+if(!mIdle.IsActive())
+mIdle.Start();
-// Set a timeout of 3 seconds
-mTimer.SetTimeout(3000);
+// Set lowest Priority
+mIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
}
bool FileChangedChecker::getCurrentModTime(TimeValue o_rValue) const
@@ -85,7 +85,7 @@ IMPL_LINK_NOARG(FileChangedChecker, TimerHandler)
mpCallback();
}
-// Reset the timer in any case
+// Reset the Idle in any case
resetTimer();
return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: * Seattle Hackfest (Robinson/Norbert) ... + badly need ways to stop 'building' consuming the hack-fest (Michael) + or a way to keep hand-holding after the hack-fest (Bjoern) ... + vast majority of people wanted access to VM + monster communication problem with cloph ... + Robinson was briefed on how to do that (cloph) + Info emailed to hackfest devs (Robinson) - communication droppeded - Incidentally it was just pointed out to me that monster communication problem with cloph could read as some hyper-criticism of him =) that's by no means the case - as (I hope) the context points out as we started to dig deeper there were probably several failures of communication / preparedness on the topic somewhere in the gap between cloph - Robinson - other mentors - hack-fest attendees. My minuting, never perfect was much less than ideal here; sorry for that. We love you cloph ! =) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - comphelper/source
comphelper/source/misc/threadpool.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 2ac7d5038806b017c8dc062c1ba29930649cc3db
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Nov 4 13:08:28 2014 +0100
thread-pool: Avoid deadlock when there are no working threads
maTasksComplete.wait() would never finish because there are no threads
working and thus ThreadPool::stopWork() won't be called.
Change-Id: I7103bdb779eb66a65cd8496091e72a0c65eb3567
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index 3717ffb..39c4e73 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -187,6 +187,10 @@ void ThreadPool::waitUntilEmpty()
{
osl::ResettableMutexGuard aGuard( maGuard );
+// Avoid deadlock when there are no working threads
+if( maTasks.empty() )
+return;
+
if( maWorkers.empty() )
{ // no threads at all - execute the work in-line
ThreadTask *pTask;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/threadpool.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 48fd93eccdb704f4fc5be24ac1d658e6c3cba37c
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Nov 4 13:17:08 2014 +0100
Make comphelper::ThreadPool explicitly noncopyable
Change-Id: Ie57d0194418dd17a4c83e2859d6a85129c4f95e6
diff --git a/include/comphelper/threadpool.hxx
b/include/comphelper/threadpool.hxx
index 231a735..b5606e0 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -15,6 +15,7 @@
#include osl/mutex.hxx
#include osl/conditn.hxx
#include rtl/ref.hxx
+#include boost/noncopyable.hpp
#include vector
#include comphelper/comphelperdllapi.h
@@ -29,7 +30,7 @@ public:
};
/// A very basic thread pool implementation
-class COMPHELPER_DLLPUBLIC ThreadPool
+class COMPHELPER_DLLPUBLIC ThreadPool: private boost::noncopyable
{
public:
/// returns a pointer to a shared pool with optimal thread
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Tue, 2014-11-04 at 11:38 +, Michael Meeks wrote: On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: * Seattle Hackfest (Robinson/Norbert) ... + badly need ways to stop 'building' consuming the hack-fest (Michael) + or a way to keep hand-holding after the hack-fest (Bjoern) ... + vast majority of people wanted access to VM + monster communication problem with cloph ... + Robinson was briefed on how to do that (cloph) + Info emailed to hackfest devs (Robinson) - communication droppeded - Incidentally it was just pointed out to me that monster communication problem with cloph could read as some hyper-criticism of him =) that's by no means the case - as (I hope) the context points out as we started to dig deeper there were probably several failures of communication / preparedness on the topic somewhere in the gap between cloph - Robinson - other mentors - hack-fest attendees. And also, my comment was never meant as a criticism of someone not doing the job. It was rather a simple piece of feedback that I hoped would be useful for future hackfest planning. So, let's not take this as a failure please. We had a successful hackfest, and everybody chipped in what they could. No need to paint this negatively. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo82076.rtf | 13 +
sw/qa/extras/rtfimport/rtfimport.cxx | 11 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 ++-
4 files changed, 44 insertions(+), 2 deletions(-)
New commits:
commit db8cc3a1c481bd1f97b2688ff85a00eec8b25926
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sun Oct 26 12:53:05 2014 +0100
fdo#82076 RTF import: handle footnote in table cell
(cherry picked from commit 956c3ff3d43e1b181f7c91518edee1c7c4dc2a0a)
Change-Id: I69def7936c320e93db5d4504922d52346caaf9cf
Reviewed-on: https://gerrit.libreoffice.org/12242
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo82076.rtf
b/sw/qa/extras/rtfimport/data/fdo82076.rtf
new file mode 100644
index 000..20b33e9
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo82076.rtf
@@ -0,0 +1,13 @@
+{\rtf1
+\pard\plain
+Before
+\par
+\trowd \cellx4000\cellx8000
+A1\cell
+B1
+{\chftn
+{\footnote Footnote}
+}
+\cell\row
+\pard After\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 520beee..1c3ed00 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1920,6 +1920,17 @@ DECLARE_RTFIMPORT_TEST(testFdo82859, fdo82859.rtf)
CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(-1),
getPropertysal_Int32(getShape(1), BackColor));
}
+DECLARE_RTFIMPORT_TEST(testFdo82076, fdo82076.rtf)
+{
+// Footnote position was wrong: should be at the end of the B1 cell.
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetext::XTextRange xCell(xTable-getCellByName(B1),
uno::UNO_QUERY);
+// This resulted in container::NoSuchElementException: the footnote was at
the start of the A1 cell.
+CPPUNIT_ASSERT_EQUAL(OUString(Footnote),
getPropertyOUString(getRun(getParagraphOfText(1, xCell-getText()), 2),
TextPortionType));
+}
+
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 9339c51..145fd4a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1452,6 +1452,14 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t rBuffer,
RTFSdrImport::SHAPE);
else if (boost::get0(aTuple) == BUFFER_ENDSHAPE)
m_pSdrImport-close();
+else if (boost::get0(aTuple) == BUFFER_RESOLVESUBSTREAM)
+{
+RTFSprms rAttributes = boost::get1(aTuple)-getAttributes();
+sal_Size nPos = rAttributes.find(0)-getInt();
+Id nId = rAttributes.find(1)-getInt();
+OUString aCustomMark = rAttributes.find(2)-getString();
+resolveSubstream(nPos, nId, aCustomMark);
+}
else
assert(false);
}
@@ -1668,7 +1676,16 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
m_aStates.top().nDestinationState = DESTINATION_FOOTNOTE;
if (bCustomMark)
Mapper().startCharacterGroup();
-resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark);
+if (!m_aStates.top().pCurrentBuffer)
+resolveSubstream(m_nGroupStartPos - 1, nId, aCustomMark);
+else
+{
+RTFSprms aAttributes;
+aAttributes.set(Id(0), RTFValue::Pointer_t(new
RTFValue(m_nGroupStartPos - 1)));
+aAttributes.set(Id(1), RTFValue::Pointer_t(new
RTFValue(nId)));
+aAttributes.set(Id(2), RTFValue::Pointer_t(new
RTFValue(aCustomMark)));
+
m_aStates.top().pCurrentBuffer-push_back(Buf_t(BUFFER_RESOLVESUBSTREAM,
RTFValue::Pointer_t(new RTFValue(aAttributes;
+}
if (bCustomMark)
{
m_aStates.top().aCharacterAttributes.clear();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 98a5523..3cc9c51 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -55,7 +55,8 @@ enum RTFBufferTypes
BUFFER_ENDRUN,
BUFFER_PAR,
BUFFER_STARTSHAPE,
-BUFFER_ENDSHAPE
+BUFFER_ENDSHAPE,
+BUFFER_RESOLVESUBSTREAM
};
/// Form field types
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen4.cxx | 128 +++
sc/source/core/data/documen5.cxx |9 +-
2 files changed, 68 insertions(+), 69 deletions(-)
New commits:
commit 1b58c8434f42a92cfd63f1cc1b9e7e0e4826c86c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Mon Nov 3 19:43:44 2014 -0500
fdo#39468 Translate German Comments - sc/source/core/data/documen{4,5}.cxx
Change-Id: I19a2242909dd8519a4819045e039def6e48f2c39
Reviewed-on: https://gerrit.libreoffice.org/12237
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 4b36b65..5f11898 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -344,7 +344,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW
nRow1,
}
}
-void ScDocument::InsertTableOp(const ScTabOpParam rParam, //
Mehrfachoperation
+void ScDocument::InsertTableOp(const ScTabOpParam rParam, // multiple
(repeated?) operation
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
const ScMarkData rMark)
{
@@ -608,7 +608,7 @@ bool ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc,
if (maTabs[*itr])
maTabs[*itr]-UpdateSelectionFunction(aData, aMark);
-//! rMark an UpdateSelectionFunction uebergeben !
+//TODO: pass rMark to UpdateSelectionFunction !
if (!aData.bError)
switch (eFunc)
@@ -660,10 +660,10 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
nPrecision = (short)GetFormatTable()-GetFormatPrecision( nFormat
);
switch ( nType )
{
-case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041
+case NUMBERFORMAT_PERCENT: // 0.41% == 0.0041
nPrecision += 2;
break;
-case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123
+case NUMBERFORMAT_SCIENTIFIC: // 1.23e-3 == 0.00123
{
if ( fVal 0.0 )
nPrecision = sal::static_int_castshort( nPrecision -
(short)floor( log10( fVal ) ) );
@@ -682,7 +682,7 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
}
double fRound = ::rtl::math::round( fVal, nPrecision );
if ( ::rtl::math::approxEqual( fVal, fRound ) )
-return fVal;// durch Rundung hoechstens Fehler
+return fVal;// rounding might introduce some error
else
return fRound;
}
@@ -690,7 +690,7 @@ double ScDocument::RoundValueAsShown( double fVal,
sal_uInt32 nFormat ) const
return fVal;
}
-// bedingte Formate und Gueltigkeitsbereiche
+// conditional formats and validation ranges
sal_uLong ScDocument::AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab )
{
@@ -706,7 +706,7 @@ sal_uLong ScDocument::AddCondFormat( ScConditionalFormat*
pNew, SCTAB nTab )
sal_uLong ScDocument::AddValidationEntry( const ScValidationData rNew )
{
if (rNew.IsEmpty())
-return 0; // leer ist immer 0
+return 0; // empty is always 0
if (!pValidationList)
pValidationList = new ScValidationDataList;
@@ -722,7 +722,7 @@ sal_uLong ScDocument::AddValidationEntry( const
ScValidationData rNew )
nMax = nKey;
}
-// Der Aufruf kann aus ScPatternAttr::PutInPool kommen, darum Clone (echte
Kopie)
+// might be called from ScPatternAttr::PutInPool; thus clone (real copy)
sal_uLong nNewKey = nMax + 1;
ScValidationData* pInsert = rNew.Clone(this);
@@ -882,19 +882,19 @@ void ScDocument::AddDetectiveOperation( const
ScDetOpData rData )
void ScDocument::ClearDetectiveOperations()
{
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // deletes also the entries
pDetOpList = NULL;
}
void ScDocument::SetDetOpList(ScDetOpList* pNew)
{
-delete pDetOpList; // loescht auch die Eintraege
+delete pDetOpList; // deletes also the entries
pDetOpList = pNew;
}
-// Vergleich von Dokumenten
+// Comparison of Documents
-// Pfriemel-Faktoren
+// Pfriemel-Factors
#define SC_DOCCOMP_MAXDIFF 256
#define SC_DOCCOMP_MINGOOD 128
#define SC_DOCCOMP_COLUMNS 10
@@ -914,7 +914,7 @@ sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow,
SCTAB nThisTab,
else
nOtherCol = nThisCol;
-if (ValidCol(nOtherCol))// nur Spalten vergleichen, die in beiden
Dateien sind
+if (ValidCol(nOtherCol))// only compare columns that are common to
both docs
{
ScRefCellValue aThisCell, aOtherCell;
aThisCell.assign(*this, ScAddress(nThisCol, nThisRow,
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468
--- Comment #145 from Commit Notification
libreoffice-comm...@lists.freedesktop.org ---
Christian M. Heller committed a patch related to this issue.
It has been pushed to master:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1b58c8434f42a92cfd63f1cc1b9e7e0e4826c86c
fdo#39468 Translate German Comments - sc/source/core/data/documen{4,5}.cxx
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: 16 commits - include/svx svx/source sw/inc sw/source vcl/source
include/svx/obj3d.hxx |2 include/svx/scene3d.hxx|4 include/svx/svdedtv.hxx| 10 - include/svx/svdglev.hxx|4 include/svx/svdglue.hxx| 16 +- include/svx/svdhdl.hxx |2 include/svx/svdmodel.hxx |2 include/svx/svdoashp.hxx |8 - include/svx/svdobj.hxx | 14 +- include/svx/svdocirc.hxx | 22 +-- include/svx/svdoedge.hxx |4 include/svx/svdograf.hxx |4 include/svx/svdogrp.hxx|8 - include/svx/svdomeas.hxx |4 include/svx/svdopath.hxx |2 include/svx/svdorect.hxx |4 include/svx/svdotext.hxx |4 include/svx/svdovirt.hxx |8 - include/svx/svdpoev.hxx|2 include/svx/svdsnpv.hxx|4 include/svx/svdtrans.hxx | 18 +- svx/source/engine3d/obj3d.cxx |6 svx/source/engine3d/scene3d.cxx| 10 - svx/source/sdr/properties/circleproperties.cxx |8 - svx/source/svdraw/svddrgm1.hxx | 12 - svx/source/svdraw/svddrgmt.cxx | 166 svx/source/svdraw/svdedtv1.cxx | 52 +++ svx/source/svdraw/svdfmtf.cxx | 10 - svx/source/svdraw/svdglev.cxx |8 - svx/source/svdraw/svdglue.cxx | 74 +- svx/source/svdraw/svdhdl.cxx | 34 ++--- svx/source/svdraw/svdmodel.cxx |8 - svx/source/svdraw/svdoashp.cxx | 34 ++--- svx/source/svdraw/svdobj.cxx | 32 ++-- svx/source/svdraw/svdocirc.cxx | 170 - svx/source/svdraw/svdoedge.cxx |8 - svx/source/svdraw/svdograf.cxx |8 - svx/source/svdraw/svdogrp.cxx | 32 ++-- svx/source/svdraw/svdomeas.cxx | 52 +++ svx/source/svdraw/svdopath.cxx | 74 +- svx/source/svdraw/svdorect.cxx | 12 - svx/source/svdraw/svdotxdr.cxx |2 svx/source/svdraw/svdotxtr.cxx | 12 - svx/source/svdraw/svdovirt.cxx | 20 +- svx/source/svdraw/svdpoev.cxx |8 - svx/source/svdraw/svdtrans.cxx | 32 ++-- sw/inc/dcontact.hxx|8 - sw/source/core/draw/dcontact.cxx | 20 +- vcl/source/filter/sgvmain.cxx | 40 ++--- vcl/source/filter/sgvmain.hxx | 16 +- vcl/source/filter/sgvtext.cxx | 14 +- 51 files changed, 564 insertions(+), 564 deletions(-) New commits: commit a3e2b884f33435eef369ce8cb8eee4bdc5db95af Author: Noel Grandin n...@peralex.com Date: Tue Nov 4 14:45:00 2014 +0200 rename nWink-nAngle Change-Id: I3a4cec65307c517684d4f8a291ca73b6a212a857 diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index ac7e524..bdba2c3 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -178,7 +178,7 @@ public: // which is vertical to the screen, plus a shift of the scene. // This means that also the scene (E3dScene) must define this // routine as virtual in its class. -virtual void NbcRotate(const Point rRef, long nWink, double sn, double cs) SAL_OVERRIDE; +virtual void NbcRotate(const Point rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; // get wireframe polygon for local object. No transform is applied. basegfx::B3DPolyPolygon CreateWireframe() const; diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 332fa2a..aa24245 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -210,8 +210,8 @@ public: virtual void NbcSetTransform(const basegfx::B3DHomMatrix rMatrix) SAL_OVERRIDE; virtual void SetTransform(const basegfx::B3DHomMatrix rMatrix) SAL_OVERRIDE; -virtual void NbcRotate(const Point rRef, long nWink, double sn, double cs) SAL_OVERRIDE; -void RotateScene(const Point rRef, long nWink, double sn, double cs); +virtual void NbcRotate(const Point rRef, long nAngle, double sn, double cs) SAL_OVERRIDE; +void RotateScene(const Point rRef, long nAngle, double sn, double cs); // TakeObjName...() is for the display in the UI, for example 3 frames selected. virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 13f1159..e29a065 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -215,12 +215,12 @@ public: void
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/sgvtext.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 02a10e6bdd79b4c865e3bcd951c230debcb98e89
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 4 14:48:43 2014 +0200
rename Dreh-Rotation
Change-Id: Ibc9345959462b5a1cb9e47791742217e567b3cd0
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 7522420..76adab6 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -456,7 +456,7 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index,
ObjTextType Atr0, ObjTextT
#define SuperSubFact 60 /* superscript/subscript: 60% of text angle */
#define DefaultSpace 40 /* Default: space is 40% of text angle */
-sal_uInt16 SetTextContext(OutputDevice rOut, ObjTextType Atr, bool Kapt,
sal_uInt16 Dreh,
+sal_uInt16 SetTextContext(OutputDevice rOut, ObjTextType Atr, bool Kapt,
sal_uInt16 nRotation,
sal_uInt16 FitXMul, sal_uInt16 FitXDiv, sal_uInt16
FitYMul, sal_uInt16 FitYDiv)
{
SgfFontOne* pSgfFont; // Font from the IniFile
@@ -538,8 +538,8 @@ sal_uInt16 SetTextContext(OutputDevice rOut, ObjTextType
Atr, bool Kapt, sal_u
aFont.SetTransparent(true);
aFont.SetAlign(ALIGN_BASELINE);
-Dreh/=10; Dreh=3600-Dreh; if (Dreh==3600) Dreh=0;
-aFont.SetOrientation(Dreh);
+nRotation/=10; nRotation=3600-nRotation; if (nRotation==3600) nRotation=0;
+aFont.SetOrientation(nRotation);
if ((Atr.Schnitt TextBoldBit) !=0) aFont.SetWeight(WEIGHT_BOLD);
if ((Atr.Schnitt TextRSlnBit) !=0) aFont.SetItalic(ITALIC_NORMAL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/table.hxx |3 +++
sc/source/core/data/table6.cxx | 26 +-
2 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit fd1b1a153516934699cd7d87437b13511c9f9d14
Author: Laurent Godard lgodard.li...@laposte.net
Date: Tue Nov 4 12:42:15 2014 +0100
calc ScTable::ReplaceAll : avoid calling GetLastDataPos uselessly
Change-Id: Ibb6fb9ea3e524a889de96f560e308a4aa54fa2af
Reviewed-on: https://gerrit.libreoffice.org/12248
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index e4e7218..cf02241 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -496,10 +496,14 @@ bool ScTable::ReplaceAll(
SCCOL nCol = 0;
SCROW nRow = -1;
+SCCOL nLastCol;
+SCROW nLastRow;
+GetLastDataPos(nLastCol, nLastRow);
+
bool bEverFound = false;
while (true)
{
-bool bFound = Search(rSearchItem, nCol, nRow, rMark, rUndoStr,
pUndoDoc);
+bool bFound = Search(rSearchItem, nCol, nRow, nLastCol, nLastRow,
rMark, rUndoStr, pUndoDoc);
if (bFound)
{
commit 99df39b5206be1d03416142c97e77ebfd823b9d5
Author: Laurent Godard lgodard.li...@laposte.net
Date: Mon Nov 3 17:19:35 2014 +0100
calc ScTable::SearchAll : avoid calling GetLastDataPos uselessly
in the loop we are in the same table
refactor ScTable::Search too
perfchek result for testSheetFindAll-Search value
before : 804252982
after : 229861999
Change-Id: I907f1260472bcc5d93b2c6425c342187a5f4c787
Reviewed-on: https://gerrit.libreoffice.org/12225
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index d396402..0b5adfa 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -994,6 +994,9 @@ private:
const ScMarkData rMark, OUString rUndoStr,
ScDocument* pUndoDoc);
boolSearch(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW
rRow,
const ScMarkData rMark, OUString rUndoStr,
ScDocument* pUndoDoc);
+boolSearch(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW
rRow,
+ const SCCOL nLastCol, const SCROW nLastRow,
+ const ScMarkData rMark, OUString rUndoStr,
ScDocument* pUndoDoc);
boolSearchAll(const SvxSearchItem rSearchItem, const ScMarkData
rMark,
ScRangeList rMatchedRanges, OUString rUndoStr,
ScDocument* pUndoDoc);
boolReplace(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW
rRow,
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index d9140ed..e4e7218 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -276,14 +276,22 @@ void ScTable::SkipFilteredRows(SCROW rRow, SCROW
rLastNonFilteredRow, bool bFo
bool ScTable::Search(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW
rRow,
const ScMarkData rMark, OUString rUndoStr, ScDocument*
pUndoDoc)
{
+SCCOL nLastCol;
+SCROW nLastRow;
+GetLastDataPos(nLastCol, nLastRow);
+return Search(rSearchItem, rCol, rRow, nLastCol, nLastRow, rMark,
rUndoStr, pUndoDoc);
+}
+
+bool ScTable::Search(const SvxSearchItem rSearchItem, SCCOL rCol, SCROW
rRow,
+ const SCCOL nLastCol, const SCROW nLastRow,
+ const ScMarkData rMark, OUString rUndoStr, ScDocument*
pUndoDoc)
+{
bool bFound = false;
bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL)
||(rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL);
SCCOL nCol = rCol;
SCROW nRow = rRow;
-SCCOL nLastCol;
-SCROW nLastRow;
-GetLastDataPos(nLastCol, nLastRow);
+
bool bSkipFiltered = !rSearchItem.IsSearchFiltered();
if (!bAll rSearchItem.GetBackward())
{
@@ -429,9 +437,13 @@ bool ScTable::SearchAll(const SvxSearchItem rSearchItem,
const ScMarkData rMar
SCROW nRow = -1;
bool bEverFound = false;
+SCCOL nLastCol;
+SCROW nLastRow;
+GetLastDataPos(nLastCol, nLastRow);
+
do
{
-bFound = Search(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
+bFound = Search(rSearchItem, nCol, nRow, nLastCol, nLastRow, rMark,
rUndoStr, pUndoDoc);
if (bFound)
{
bEverFound = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- sw/uiconfig/swriter/menubar/menubar.xml |3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 841f62b8c58704b1fbec0a368439de87a82f2c26 Author: Yousuf Philips philip...@hotmail.com Date: Tue Nov 4 15:58:26 2014 +0400 fdo#85820 Have menu item for insert table and it called 'Insert Table' Change-Id: I79d4e73f498f55ec3beece6c2e4aafe8f09c1c27 Reviewed-on: https://gerrit.libreoffice.org/12249 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 81f9532..ebaca78 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -374,7 +374,7 @@ /node node oor:name=.uno:InsertTable oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-US~Table.../value + value xml:lang=en-US~Insert Table.../value /prop prop oor:name=Properties oor:type=xs:int value1/value diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index ca6b9c2..b9a349c 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -220,7 +220,6 @@ menu:menuitem menu:id=.uno:InsertEnvelope/ menu:menuseparator/ menu:menuitem menu:id=.uno:InsertFrame/ - menu:menuitem menu:id=.uno:InsertTable/ menu:menu menu:id=.uno:GraphicMenu menu:menupopup menu:menuitem menu:id=.uno:InsertGraphic/ @@ -371,9 +370,9 @@ /menu:menu menu:menu menu:id=.uno:TableMenu menu:menupopup + menu:menuitem menu:id=.uno:InsertTable/ menu:menu menu:id=.uno:TableInsertMenu menu:menupopup - menu:menuitem menu:id=.uno:InsertTable/ menu:menuitem menu:id=.uno:InsertRowDialog/ menu:menuitem menu:id=.uno:InsertColumnDialog/ /menu:menupopup ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/crystal icon-themes/galaxy icon-themes/human icon-themes/oxygen icon-themes/sifr icon-themes/tango officecfg/registry
icon-themes/crystal/links.txt|1 + icon-themes/galaxy/links.txt |2 ++ icon-themes/human/links.txt |1 + icon-themes/oxygen/links.txt |1 + icon-themes/sifr/links.txt |1 + icon-themes/tango/links.txt |1 + officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 +++ 7 files changed, 10 insertions(+) New commits: commit 2199c1eb2d835a9109b8ea26ae363fbeb9bdf5a3 Author: Yousuf Philips philip...@hotmail.com Date: Mon Nov 3 23:29:40 2014 +0400 fdo#80161 Add an icon to the 'Export as PDF' command Change-Id: I09972ebec71a332d2f5a8630df7b5fecd2b78c87 Reviewed-on: https://gerrit.libreoffice.org/12228 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/crystal/links.txt b/icon-themes/crystal/links.txt new file mode 100644 index 000..6b76367 --- /dev/null +++ b/icon-themes/crystal/links.txt @@ -0,0 +1 @@ +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index a6c32d0..95eb5e9 100644 --- a/icon-themes/galaxy/links.txt +++ b/icon-themes/galaxy/links.txt @@ -11,3 +11,5 @@ cmd/sc_fillcolor.png cmd/sc_formatarea.png cmd/lc_fillcolor.png cmd/lc_formatarea.png cmd/lc_objectmirrorvertical.png cmd/sc_flipvertical.png cmd/lc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png + diff --git a/icon-themes/human/links.txt b/icon-themes/human/links.txt new file mode 100644 index 000..6b76367 --- /dev/null +++ b/icon-themes/human/links.txt @@ -0,0 +1 @@ +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png diff --git a/icon-themes/oxygen/links.txt b/icon-themes/oxygen/links.txt new file mode 100644 index 000..6b76367 --- /dev/null +++ b/icon-themes/oxygen/links.txt @@ -0,0 +1 @@ +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt new file mode 100644 index 000..6b76367 --- /dev/null +++ b/icon-themes/sifr/links.txt @@ -0,0 +1 @@ +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index befaf00..b5f8936 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -135,6 +135,7 @@ cmd/lc_closepreview.png cmd/lc_closedoc.png cmd/sc_closepreview.png cmd/sc_closedoc.png cmd/lc_objectmirrorvertical.png cmd/sc_flipvertical.png cmd/lc_objectmirrorhorizontal.png cmd/sc_fliphorizontal.png +cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png # Duplicates cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 366e93b..d3fdb31 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4212,6 +4212,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USExport as P~DF.../value /prop +prop oor:name=Properties oor:type=xs:int + value1/value +/prop /node node oor:name=.uno:ConfigureDialog oor:op=replace prop oor:name=Label oor:type=xs:string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Please add me to contributor list.
I want to submit patches to gerrit for review. Please add me to contributor list. Here is my statement for code contribution : All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Mark Hung ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 'master' 'make check' lcov code coverage report
On Tue, Nov 4, 2014 at 11:45 AM, Michael Stahl mst...@redhat.com wrote: On 04.11.2014 10:49, Maarten Hoes wrote: Hrm. Looks like I may have made a silly (and wrong) assumption. Is all non-libreoffice code located in these two directory's in the source tree ? : src/libreoffice/workdir/ExternalProject/libfoo src/libreoffice/external/libfoo easily 98% of it is; arguably it should be 100% but sometimes people take short-cuts... that is true for the source code (hoping you can filter at that level?); there are some externals that are built with our own build system so the object files end up in workdir/*Object like all the LO code. Okay, the filter should work out fine then. By the way, the wiki already states the command needed to filter out those directories. Although at the moment I ran into an 'unexpected end of foo.gcno' error, so im having a little fun with that right now. - Maarten. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - comphelper/source
comphelper/source/misc/threadpool.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 9bc65c2c93230b799cab85ec29dc3fdd6da855ea
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Nov 4 14:57:39 2014 +0100
thread-pool: Fix previous broken commit; This looks better
Change-Id: Ieb84adba0b0a9004f025bdb7e57eb01c37d7ce8d
diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index 39c4e73..77e9962 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -99,7 +99,7 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) :
for( sal_Int32 i = 0; i nWorkers; i++ )
maWorkers.push_back( new ThreadWorker( this ) );
-maTasksComplete.reset();
+maTasksComplete.set();
osl::MutexGuard aGuard( maGuard );
for( size_t i = 0; i maWorkers.size(); i++ )
@@ -187,10 +187,6 @@ void ThreadPool::waitUntilEmpty()
{
osl::ResettableMutexGuard aGuard( maGuard );
-// Avoid deadlock when there are no working threads
-if( maTasks.empty() )
-return;
-
if( maWorkers.empty() )
{ // no threads at all - execute the work in-line
ThreadTask *pTask;
___
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 80755, which changed state. Bug 80755 Summary: StartCenter displays thumbnails of password-protected files https://bugs.freedesktop.org/show_bug.cgi?id=80755 What|Removed |Added Status|VERIFIED|REOPENED 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: 3 commits - sw/qa sw/source
sw/qa/extras/inc/swmodeltestbase.hxx |3 +++
sw/qa/extras/ww8export/data/bnc636128.doc |binary
sw/qa/extras/ww8export/ww8export.cxx | 12 ++--
sw/source/filter/ww8/wrtww8.cxx | 10 ++
sw/source/filter/ww8/ww8par.hxx |4 +++-
sw/source/filter/ww8/ww8par3.cxx |5 +++--
6 files changed, 29 insertions(+), 5 deletions(-)
New commits:
commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 15:36:02 2014 +0100
bnc#636128 DOC export: handle FFData.cch
Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46
diff --git a/sw/qa/extras/ww8export/data/bnc636128.doc
b/sw/qa/extras/ww8export/data/bnc636128.doc
new file mode 100644
index 000..5f92c3e
Binary files /dev/null and b/sw/qa/extras/ww8export/data/bnc636128.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index e973029..c1e6ca6 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -16,6 +16,7 @@
#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/table/TableBorder2.hpp
#include com/sun/star/text/GraphicCrop.hpp
+#include com/sun/star/text/XFormField.hpp
class Test : public SwModelTestBase
{
@@ -378,6 +379,15 @@ DECLARE_WW8EXPORT_TEST(testCellBgColor,
cell-bg-color.odt)
CPPUNIT_ASSERT_EQUAL(sal_Int32(0xCC),
getPropertysal_Int32(xTable-getCellByName(A1), BackColor));
}
+DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
+{
+// Import / export of FFData.cch was missing.
+uno::Referencetext::XFormField xFormField = getProperty
uno::Referencetext::XFormField (getRun(getParagraph(1), 2), Bookmark);
+uno::Referencecontainer::XNameContainer xParameters =
xFormField-getParameters();
+// This resulted in a container.NoSuchElementException.
+CPPUNIT_ASSERT_EQUAL(OUString(5),
xParameters-getByName(MaxLength).getOUString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 58718c2..97629ae 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3783,6 +3783,16 @@ void WW8Export::WriteFormData( const
::sw::mark::IFieldmark rFieldmark )
ffres = 0;
}
aFldHeader.bits |= ( (ffres2) 0x7C );
+if (type == 0) // iTypeText
+{
+sw::mark::IFieldmark::parameter_map_t::const_iterator pParameter =
rFieldmark.GetParameters()-find(MaxLength);
+if (pParameter != rFieldmark.GetParameters()-end())
+{
+OUString aLength;
+pParameter-second = aLength;
+aFldHeader.cch = aLength.toUInt32();
+}
+}
std::vector OUString aListItems;
if (type==2)
commit dfa26e6d489a2c5bd79652450a9f27343008d37f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 12:37:45 2014 +0100
bnc#636128 DOC import: handle FFData.cch
Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 6e0349b..953ee5e 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -662,7 +662,7 @@ public:
WW8FormulaControl(const OUString rN, SwWW8ImplReader rR)
: rRdr(rR), fUnknown(0), fDropdownIndex(0),
fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0),
-fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN )
+fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), mnMaxLen(0),
sName( rN )
{
}
sal_uInt8 fUnknown:2;
@@ -678,6 +678,8 @@ public:
sal_uInt16 hpsCheckBox;
sal_uInt16 nChecked;
+/// FFData.cch in the spec: maximum length, in characters, of the value of
the textbox.
+sal_uInt16 mnMaxLen;
OUString sTitle;
OUString sDefault;
OUString sFormatting;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 046e146..5e3bbe9 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -165,6 +165,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc*
pF, OUString rStr )
maFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
maFieldStack.back().getParameters()[Description] =
uno::makeAny(OUString(aFormula.sToolTip));
maFieldStack.back().getParameters()[Name] =
uno::makeAny(OUString(aFormula.sTitle));
+if (aFormula.mnMaxLen)
+maFieldStack.back().getParameters()[MaxLength] =
uno::makeAny(OUString::number(aFormula.mnMaxLen));
}
return FLD_TEXT;
}
@@ -2144,8 +2146,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
sal_uInt8 iRes = (bits1 0x7C) 2;
-sal_uInt16 cch = 0;
-pDataStream-ReadUInt16( cch );
+pDataStream-ReadUInt16( mnMaxLen );
sal_uInt16 hps
[Bug 42949] accelerating compile times ...
https://bugs.freedesktop.org/show_bug.cgi?id=42949 --- Comment #14 from Riccardo Magliocchetti riccardo.magliocche...@gmail.com --- I've updated to gerrit a quick hackish patch to build with include-what-you-use: https://gerrit.libreoffice.org/#/c/12255/ Since it's very verbose i've added also support for partials compilation so you can do: ./configure --with-iwyu=/usr/bin/include-what-you-use make sw 2 sw-warn-includes.log And get only warnings for the single module. -- 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 - dbaccess/source vcl/source
dbaccess/source/filter/xml/xmlEnums.hxx |4 ++--
vcl/source/filter/sgvspln.cxx | 10 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d1d84fcaa750a70f423ee53c7f2a98e24914cb0e
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 4 16:28:00 2014 +0100
covertiy#705369: dbaccess: move XML_TOK_ENCODING to enum XMLDataSourceInfo
Looks like Commit 94e8385d56098b6a51c539b5374dbf03151d2559 added this
to the wrong enum.
Change-Id: I46dd82313aaa659e84c719ba9215682becf8ec6c
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx
b/dbaccess/source/filter/xml/xmlEnums.hxx
index ce548ae..99beaf8 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.hxx
@@ -65,7 +65,6 @@ namespace dbaxml
XML_TOK_DELIMITER,
XML_TOK_DATA_SOURCE_SETTINGS,
XML_TOK_FONT_CHARSET,
-XML_TOK_ENCODING,
XML_TOK_DATABASE_DESCRIPTION,
XML_TOK_COMPOUND_DATABASE,
XML_TOK_DB_HREF,
@@ -105,7 +104,8 @@ namespace dbaxml
XML_TOK_DATA_SOURCE_SETTING_VALUE,
XML_TOK_DATA_SOURCE_SETTING_IS_LIST,
XML_TOK_DATA_SOURCE_SETTING_TYPE,
-XML_TOK_DATA_SOURCE_SETTING_NAME
+XML_TOK_DATA_SOURCE_SETTING_NAME,
+XML_TOK_ENCODING,
};
enum XMLDocuments
{
commit 2a6d81ac4031b5331a38371c5f8b934d720b0153
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 4 13:58:51 2014 +0100
translate bEnde variable
Change-Id: Ic29b569df25f8966326101d5179506b24483cb43
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 2a710b5..94f2a82 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -693,7 +693,7 @@ bool Spline2Poly(Polygon rSpln, bool Periodic, Polygon
rPoly)
double Step; // stepsize for t
double dt1,dt2,dt3; // delta t, y, ^3
double t;
-boolbEnde; // partial polynom ended?
+boolbEnd; // partial polynom ended?
sal_uInt16 n; // number of partial polynoms to draw
sal_uInt16 i; // actual partial polynom
boolbOk; // all still ok?
@@ -709,10 +709,10 @@ bool Spline2Poly(Polygon rSpln, bool Periodic, Polygon
rPoly)
i=0;
while (in) { // draw n partial polynoms
t=tv[i]+Step;
-bEnde=false;
-while (!bEnde) { // extrapolate one partial polynom
-bEnde=t=tv[i+1];
-if (bEnde) t=tv[i+1];
+bEnd=false;
+while (!bEnd) { // extrapolate one partial polynom
+bEnd=t=tv[i+1];
+if (bEnd) t=tv[i+1];
dt1=t-tv[i]; dt2=dt1*dt1; dt3=dt2*dt1;
x=long(ax[i]+bx[i]*dt1+cx[i]*dt2+dx[i]*dt3);
y=long(ay[i]+by[i]*dt1+cy[i]*dt2+dy[i]*dt3);
___
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' - sc/source
sc/source/core/tool/token.cxx | 67 ++
1 file changed, 61 insertions(+), 6 deletions(-)
New commits:
commit bc38612d349b9efd877dec23f3e68a3f7b945cec
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Oct 27 07:32:32 2014 -0700
fdo#85282: Correct adjustment of range reference on delete shift.
Change-Id: I6e01c160f77599dfa4a2e55b60e23d256184c822
(cherry picked from commit c3c16d5b74fb5707691283538a969a03c2f918b0)
Reviewed-on: https://gerrit.libreoffice.org/12111
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 84c8ccc..b0a495a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2546,6 +2546,9 @@ void setRefDeleted( ScComplexRefData rRef, const
sc::RefUpdateContext rCxt )
bool shrinkRange( const sc::RefUpdateContext rCxt, ScRange rRefRange, const
ScRange rDeletedRange )
{
+if (!rDeletedRange.Intersects(rRefRange))
+return false;
+
if (rCxt.mnColDelta 0)
{
// Shifting left.
@@ -2553,9 +2556,35 @@ bool shrinkRange( const sc::RefUpdateContext rCxt,
ScRange rRefRange, const Sc
// Deleted range is only partially overlapping in vertical
direction. Bail out.
return false;
-// Move the last column position to the left.
-SCCOL nDelta = rDeletedRange.aStart.Col() - rDeletedRange.aEnd.Col() -
1;
-rRefRange.aEnd.IncCol(nDelta);
+if (rDeletedRange.aStart.Col() = rRefRange.aStart.Col())
+{
+if (rRefRange.aEnd.Col() = rDeletedRange.aEnd.Col())
+{
+// Reference is entirely deleted.
+rRefRange.SetInvalid();
+}
+else
+{
+// The reference range is truncated on the left.
+SCCOL nOffset = rDeletedRange.aStart.Col() -
rRefRange.aStart.Col();
+SCCOL nDelta = rRefRange.aStart.Col() -
rDeletedRange.aEnd.Col() - 1;
+rRefRange.aStart.IncCol(nOffset);
+rRefRange.aEnd.IncCol(nDelta+nOffset);
+}
+}
+else if (rDeletedRange.aEnd.Col() rRefRange.aEnd.Col())
+{
+// Reference is deleted in the middle. Move the last column
+// position to the left.
+SCCOL nDelta = rDeletedRange.aStart.Col() -
rDeletedRange.aEnd.Col() - 1;
+rRefRange.aEnd.IncCol(nDelta);
+}
+else
+{
+// The reference range is truncated on the right.
+SCCOL nDelta = rDeletedRange.aStart.Col() - rRefRange.aEnd.Col() -
1;
+rRefRange.aEnd.IncCol(nDelta);
+}
return true;
}
else if (rCxt.mnRowDelta 0)
@@ -2566,9 +2595,35 @@ bool shrinkRange( const sc::RefUpdateContext rCxt,
ScRange rRefRange, const Sc
// Deleted range is only partially overlapping in horizontal
direction. Bail out.
return false;
-// Move the last row position up.
-SCROW nDelta = rDeletedRange.aStart.Row() - rDeletedRange.aEnd.Row() -
1;
-rRefRange.aEnd.IncRow(nDelta);
+if (rDeletedRange.aStart.Row() = rRefRange.aStart.Row())
+{
+if (rRefRange.aEnd.Row() = rDeletedRange.aEnd.Row())
+{
+// Reference is entirely deleted.
+rRefRange.SetInvalid();
+}
+else
+{
+// The reference range is truncated on the top.
+SCCOL nOffset = rDeletedRange.aStart.Row() -
rRefRange.aStart.Row();
+SCCOL nDelta = rRefRange.aStart.Row() -
rDeletedRange.aEnd.Row() - 1;
+rRefRange.aStart.IncRow(nOffset);
+rRefRange.aEnd.IncRow(nDelta+nOffset);
+}
+}
+else if (rDeletedRange.aEnd.Row() rRefRange.aEnd.Row())
+{
+// Reference is deleted in the middle. Move the last row
+// position upward.
+SCCOL nDelta = rDeletedRange.aStart.Row() -
rDeletedRange.aEnd.Row() - 1;
+rRefRange.aEnd.IncRow(nDelta);
+}
+else
+{
+// The reference range is truncated on the bottom.
+SCCOL nDelta = rDeletedRange.aStart.Row() - rRefRange.aEnd.Row() -
1;
+rRefRange.aEnd.IncRow(nDelta);
+}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: coverity warnings update, 150, 0.04 density
On 03.11.2014 22:03, Caolán McNamara wrote: Excellent, that one was super-bugging me. FWIW that leaves just one MIXED_ENUM warning left. 705369 where XML_TOK_ENCODING in dbaccess/source/filter/xml/xmlDataSourceInfo.cxx:67 is also from an utterly different enum from the rest of the cases :-( fixed in commit d1d84fcaa750a70f423ee53c7f2a98e24914cb0e ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa
sw/qa/extras/rtfexport/rtfexport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 026d048e896683a0630ee08879f2f2e5bff89284
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 16:48:29 2014 +0100
CppunitTest_sw_rtfexport: fix windows build
Change-Id: I79d4e46abe289b3d9c1f0a2eec2a29045891cae3
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 0f53098..0bcf1a8 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -659,14 +659,14 @@ DECLARE_RTFEXPORT_TEST(testFdo79599, fdo79599.rtf)
CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x800080), getPropertysal_uInt32(xRun,
CharBackColor));
}
-#endif
-
DECLARE_RTFEXPORT_TEST(testFdo82858, fdo82858.docx)
{
// This was table::BorderLineStyle::SOLID, exporter failed to write
explicit no line when line color was written.
CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::NONE,
getPropertytable::BorderLine2(getShape(1), TopBorder).LineStyle);
}
+#endif
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* 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/qa
sw/qa/extras/inc/swmodeltestbase.hxx | 17 -
sw/qa/extras/mailmerge/mailmerge.cxx | 17 +
2 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 1ab6bfc952eaa0b5d15d49b2fe2495440be9caac
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 16:54:19 2014 +0100
CppunitTest_sw_mailmerge: move DECLARE_MAILMERGE_TEST from header file
Change-Id: Ie9767aaf0f78db14ac2bbf844e824f8d39191fd1
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 53b9f07..fbfb107 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -149,23 +149,6 @@ using namespace css;
CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
void TestName::verify()
-#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename,
BaseClass) \
-class TestName : public BaseClass { \
-protected: \
-virtual OUString getTestName() SAL_OVERRIDE { return
OUString::createFromAscii(#TestName); } \
-public: \
-CPPUNIT_TEST_SUITE(TestName); \
-CPPUNIT_TEST(MailMerge); \
-CPPUNIT_TEST_SUITE_END(); \
-\
-void MailMerge() { \
-executeMailMergeTest(filename, datasource, tablename); \
-} \
-void verify() SAL_OVERRIDE; \
-}; \
-CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
-void TestName::verify()
-
/**
* Maps database URIs to the registered database names for quick lookups
*/
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 33f8f43..defb387 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -37,6 +37,23 @@ class MMTest : public SwModelTestBase
MMTest() : SwModelTestBase(/sw/qa/extras/mailmerge/data/, writer8)
{}
};
+#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename,
BaseClass) \
+class TestName : public BaseClass { \
+protected: \
+virtual OUString getTestName() SAL_OVERRIDE { return
OUString::createFromAscii(#TestName); } \
+public: \
+CPPUNIT_TEST_SUITE(TestName); \
+CPPUNIT_TEST(MailMerge); \
+CPPUNIT_TEST_SUITE_END(); \
+\
+void MailMerge() { \
+executeMailMergeTest(filename, datasource, tablename); \
+} \
+void verify() SAL_OVERRIDE; \
+}; \
+CPPUNIT_TEST_SUITE_REGISTRATION(TestName); \
+void TestName::verify()
+
#define DECLARE_DFLT_MAILMERGE_TEST(TestName, filename, datasource, tablename)
\
DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, MMTest)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Tue, Nov 4, 2014 at 6:29 AM, Kohei Yoshida kohei.yosh...@collabora.com wrote: And also, my comment was never meant as a criticism of someone not doing the job. It was rather a simple piece of feedback that I hoped would be useful for future hackfest planning. So, let's not take this as a failure please. We had a successful hackfest, and everybody chipped in what they could. No need to paint this negatively. I would like to add, in a more general sens: the point of these ESC call is, in big part, to discuss and review 'pain points', thinks that are causing trouble, hindering work, etc... and to try to find practical and actionable solutions to re-mediate, improve things... it is never to 'assign blame'. So, to all readers of the minutes out there, always assume the former not the later :-) Norbert. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_spritecanvas.cxx |6 -
canvas/source/directx/dx_surfacebitmap.cxx | 136 -
2 files changed, 1 insertion(+), 141 deletions(-)
New commits:
commit 6a7ae600b55dd879b5d8e324b8b4bde39da80d69
Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Date: Tue Nov 4 12:24:08 2014 +0100
Kill directx 9 ifdefery
Baseline is Windows XP and SP3 includes directx 9.0c
Change-Id: Ib7095ebb71f297898ae8b316e3b9f18e7c052f34
Reviewed-on: https://gerrit.libreoffice.org/12246
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/canvas/source/directx/dx_spritecanvas.cxx
b/canvas/source/directx/dx_spritecanvas.cxx
index 6b72848..ab76e77 100644
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.cxx
@@ -45,11 +45,7 @@
#include dx_winstuff.hxx
#include dx_spritecanvas.hxx
-#if DIRECTX_VERSION 0x0900
-# define CANVAS_TECH DX5
-#else
-# define CANVAS_TECH DX9
-#endif
+#define CANVAS_TECH DX9
#define SPRITECANVAS_SERVICE_NAME
com.sun.star.rendering.SpriteCanvas. CANVAS_TECH
#define SPRITECANVAS_IMPLEMENTATION_NAME
com.sun.star.comp.rendering.SpriteCanvas. CANVAS_TECH
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx
b/canvas/source/directx/dx_surfacebitmap.cxx
index 084361a..abff201 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -72,37 +72,21 @@ namespace dxcanvas
private:
::basegfx::B2IVector maSize;
-#if DIRECTX_VERSION 0x0900
-mutable DDSURFACEDESC aSurfaceDesc;
-#else
mutable D3DLOCKED_RECT maLockedRect;
-#endif
mutable COMReferencesurface_type mpSurface;
bool mbAlpha;
};
sal_uInt8* DXColorBuffer::lock() const
{
-#if DIRECTX_VERSION 0x0900
-memset((void *)aSurfaceDesc, 0, sizeof(DDSURFACEDESC));
-aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
-const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
-if(SUCCEEDED(mpSurface-Lock(NULL,aSurfaceDesc,dwFlags,NULL)))
-return static_castsal_uInt8 *(aSurfaceDesc.lpSurface);
-#else
if(SUCCEEDED(mpSurface-LockRect(maLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
return static_castsal_uInt8 *(maLockedRect.pBits);
-#endif
return NULL;
}
void DXColorBuffer::unlock() const
{
-#if DIRECTX_VERSION 0x0900
-mpSurface-Unlock(NULL);
-#else
mpSurface-UnlockRect();
-#endif
}
sal_uInt32 DXColorBuffer::getWidth() const
@@ -117,11 +101,7 @@ namespace dxcanvas
sal_uInt32 DXColorBuffer::getStride() const
{
-#if DIRECTX_VERSION 0x0900
-return aSurfaceDesc.lPitch;
-#else
return maLockedRect.Pitch;
-#endif
}
canvas::IColorBuffer::Format DXColorBuffer::getFormat() const
@@ -343,29 +323,6 @@ namespace dxcanvas
BitmapSharedPtr pResult;
-#if DIRECTX_VERSION 0x0900
-DDSURFACEDESC aSurfaceDesc;
-memset(aSurfaceDesc, 0, sizeof(DDSURFACEDESC));
-aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
-const DWORD dwFlags =
DDLOCK_NOSYSLOCK|DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_READONLY;
-
-// lock the directx surface to receive the pointer to the surface
memory.
-if(SUCCEEDED(mpSurface-Lock(NULL,aSurfaceDesc,dwFlags,NULL)))
-{
-// decide about the format we pass the gdi+, the directx surface
is always
-// 32bit, either with or without alpha component.
-Gdiplus::PixelFormat nFormat = hasAlpha() ? PixelFormat32bppARGB :
PixelFormat32bppRGB;
-
-// construct a gdi+ bitmap from the raw pixel data.
-pResult.reset(new Gdiplus::Bitmap( maSize.getX(),maSize.getY(),
- aSurfaceDesc.lPitch,
- nFormat,
- (BYTE *)aSurfaceDesc.lpSurface
));
-
-// unlock the directx surface
-mpSurface-Unlock(NULL);
-}
-#else
D3DLOCKED_RECT aLockedRect;
if(SUCCEEDED(mpSurface-LockRect(aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY)))
{
@@ -381,7 +338,6 @@ namespace dxcanvas
mpSurface-UnlockRect();
}
-#endif
return pResult;
}
@@ -467,21 +423,6 @@ namespace dxcanvas
# if OSL_DEBUG_LEVEL 0
void DXSurfaceBitmap::imageDebugger()
{
-#if DIRECTX_VERSION 0x0900
-DDSURFACEDESC aSurfaceDesc;
-memset( aSurfaceDesc, 0, sizeof(DDSURFACEDESC) );
-aSurfaceDesc.dwSize = sizeof(DDSURFACEDESC);
-
-if( FAILED(mpSurface-Lock( NULL,
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/inc sw/qa sw/source
sw/inc/modeltoviewhelper.hxx | 25 ++---
sw/qa/core/uwriter.cxx | 34 ++---
sw/source/core/text/porlay.cxx |5 +
sw/source/core/txtnode/modeltoviewhelper.cxx | 70 ---
sw/source/core/txtnode/txtedt.cxx|2
5 files changed, 93 insertions(+), 43 deletions(-)
New commits:
commit 5ae6072774ab544fdfdfebf2364e97ca2fa2326a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 3 09:49:37 2014 +
Resolves: fdo#68347 fix word count with recorded changes
also see fdo#46757
a) We need to ignore redline-deleted text, but count redline-added text
b) each block of text is denoted by its end position in the model
and where that maps to in the view so a hidden portion
should record its end point not its starting point, and a non-hidden
deleted portion should always record its end point
c) when mapping a model position to the view we take the offset of
the model pos arg from the block end and use that to offset the
mapped block-end view pos to get the final view pos. But for
hidden portions that won't make a whole lot of sense, and
end up offsetting into prior portions, so map all positions within a
hidden portion to the same block-end view pos
add regression tests for these cases
(cherry picked from commit fa430e6b4e6f5d096bdf59db26e5d7393ca2297b)
Conflicts:
sw/qa/core/uwriter.cxx
Change-Id: I45c76bba47fd430bc3bccb5f919502660d415d9e
Reviewed-on: https://gerrit.libreoffice.org/12219
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 018b67c..d99c9db 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -65,19 +65,30 @@ class SwTxtNode;
#define EXPANDFIELDS 0x0001
#define EXPANDFOOTNOTE 0x0002
#define HIDEINVISIBLE 0x0004
-#define HIDEREDLINED 0x0008
+#define HIDEDELETIONS 0x0008
/// do not expand to content, but replace with ZWSP
#define REPLACEMODE0x0010
class ModelToViewHelper
{
-/** For each field in the model string, there is an entry in the conversion
-map. The first value of the ConversionMapEntry points to the field
-position in the model string, the second value points to the associated
-position in the view string. The last entry in the conversion map
-denotes the lengths of the model resp. view string.
+/** For each expanded/hidden portion in the model string, there is an
entry in
+the conversion map. The first value of the ConversionMapEntry points to
+the start position in the model string, the second value points to the
+associated start position in the view string. The last entry in the
+conversion map denotes the lengths of the model resp. view string.
*/
-typedef std::pair sal_Int32 , sal_Int32 ConversionMapEntry;
+struct ConversionMapEntry
+{
+ConversionMapEntry(sal_Int32 nModelPos, sal_Int32 nViewPos, bool
bVisible)
+: m_nModelPos(nModelPos)
+, m_nViewPos(nViewPos)
+, m_bVisible(bVisible)
+{
+}
+sal_Int32 m_nModelPos;
+sal_Int32 m_nViewPos;
+bool m_bVisible;
+};
typedef std::vector ConversionMapEntry ConversionMap;
typedef std::vectorsal_Int32 Positions;
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index bd6e000..1297c65 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -321,7 +321,7 @@ void SwDocTest::testModelToViewHelper()
}
{
-ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEREDLINED);
+ModelToViewHelper aModelToViewHelper(*pTxtNode, HIDEDELETIONS);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString(BB + OUString(CH_TXTATR_BREAKWORD) + C
+ OUString(CH_TXTATR_BREAKWORD) + D),
@@ -349,14 +349,14 @@ void SwDocTest::testModelToViewHelper()
}
{
-ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS |
HIDEREDLINED | EXPANDFOOTNOTE);
+ModelToViewHelper aModelToViewHelper(*pTxtNode, EXPANDFIELDS |
HIDEDELETIONS | EXPANDFOOTNOTE);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString(BB foo C foo D), sViewText);
}
{
ModelToViewHelper aModelToViewHelper(*pTxtNode,
-EXPANDFIELDS | HIDEREDLINED | EXPANDFOOTNOTE | REPLACEMODE);
+EXPANDFIELDS | HIDEDELETIONS | EXPANDFOOTNOTE | REPLACEMODE);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString(BB +
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/app/gtkinst.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 0c1b91b0c7fd0c8f38905ba88e3c1679b9cbe6d8 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue Nov 4 12:00:49 2014 +0100 vcl: gtk 2.4 is checked at configure time Change-Id: I08993551473fb9a8284e2a1ed772c99050f785d8 Reviewed-on: https://gerrit.libreoffice.org/12251 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 1ca67f1..c2f56aa 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -97,9 +97,6 @@ extern C if ( !g_thread_supported() ) g_thread_init( NULL ); -#if !GTK_CHECK_VERSION(2,4,0) -#error Requires gtk 2.4.0+ for lock hooking -#endif gdk_threads_set_lock_functions (GdkThreadsEnter, GdkThreadsLeave); SAL_INFO(vcl.gtk, Hooked gdk threads locks); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4759066933e87f6b56dde40e9e4c224bc1f723f Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue Nov 4 11:57:14 2014 +0100 Required MacOSX version is 10.8 Change-Id: I5dcfdb3106bfe3e83a64443cd8aff1c7ba023a5b Reviewed-on: https://gerrit.libreoffice.org/12244 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/Repository.mk b/Repository.mk index da317f1..91af283 100644 --- a/Repository.mk +++ b/Repository.mk @@ -298,7 +298,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ acc \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter-out 1050 1060,$(MACOSX_SDK_VERSION)),avmediaMacAVF) \ + avmediaMacAVF \ $(if $(ENABLE_MACOSX_SANDBOX),,avmediaQuickTime) \ ) \ $(call gb_Helper_optional,SCRIPTING, \ ___ 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/remotecontrol/BluetoothServer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bfc9a20ccea2689fec1ffe0654db1f95179bd4f Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Tue Nov 4 11:58:07 2014 +0100 remotecontrol: required version for MacOSX is 10.8 Change-Id: I11b64b79de90d776fd117aa687c971ed80172b76 Reviewed-on: https://gerrit.libreoffice.org/12245 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 5a7b914..d5bf966 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -42,7 +42,7 @@ #ifdef MACOSX #include osl/conditn.hxx #include premac.h - #if MACOSX_SDK_VERSION == 1070 || MACOSX_SDK_VERSION == 1080 + #if MACOSX_SDK_VERSION == 1080 #import IOBluetooth/IOBluetooth.h #else #import CoreFoundation/CoreFoundation.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 24 commits - chart2/inc chart2/qa chart2/source include/svx offapi/com offapi/UnoApi_offapi.mk oox/source svx/inc svx/source sw/source
chart2/inc/ChartView.hxx | 10 chart2/qa/extras/chart2import.cxx|2 chart2/source/view/axes/Tickmarks.hxx|5 chart2/source/view/axes/VAxisBase.cxx|4 chart2/source/view/axes/VAxisBase.hxx|2 chart2/source/view/axes/VAxisProperties.cxx |9 chart2/source/view/axes/VAxisProperties.hxx |4 chart2/source/view/axes/VCartesianAxis.cxx | 445 +-- chart2/source/view/axes/VCartesianAxis.hxx | 54 +- chart2/source/view/main/ChartView.cxx| 16 include/svx/charthelper.hxx |2 include/svx/sdr/contact/viewcontact.hxx |2 include/svx/sdr/properties/defaultproperties.hxx |2 include/svx/sdr/properties/properties.hxx| 13 include/svx/sdrpagewindow.hxx| 68 -- include/svx/svdobj.hxx |5 include/svx/svdotext.hxx |4 include/svx/svdpage.hxx |2 include/svx/svdpagv.hxx |4 include/svx/svdpntv.hxx |2 include/svx/svdtypes.hxx |2 offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/util/XUpdatable2.idl | 43 + oox/source/drawingml/chart/axismodel.cxx |2 svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx |2 svx/inc/sdr/properties/attributeproperties.hxx |2 svx/inc/sdr/properties/captionproperties.hxx |2 svx/inc/sdr/properties/circleproperties.hxx |2 svx/inc/sdr/properties/connectorproperties.hxx |2 svx/inc/sdr/properties/customshapeproperties.hxx |2 svx/inc/sdr/properties/e3dproperties.hxx |2 svx/inc/sdr/properties/emptyproperties.hxx |2 svx/inc/sdr/properties/graphicproperties.hxx |2 svx/inc/sdr/properties/groupproperties.hxx |2 svx/inc/sdr/properties/measureproperties.hxx |2 svx/inc/sdr/properties/pageproperties.hxx|2 svx/inc/sdr/properties/textproperties.hxx|2 svx/source/sdr/contact/viewcontact.cxx |6 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 32 + svx/source/sdr/contact/viewobjectcontact.cxx | 29 - svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx | 12 svx/source/sdr/properties/attributeproperties.cxx|8 svx/source/sdr/properties/captionproperties.cxx |6 svx/source/sdr/properties/circleproperties.cxx |6 svx/source/sdr/properties/connectorproperties.cxx|6 svx/source/sdr/properties/customshapeproperties.cxx |6 svx/source/sdr/properties/defaultproperties.cxx |6 svx/source/sdr/properties/e3dcompoundproperties.cxx |2 svx/source/sdr/properties/e3dproperties.cxx |6 svx/source/sdr/properties/emptyproperties.cxx|6 svx/source/sdr/properties/graphicproperties.cxx |6 svx/source/sdr/properties/groupproperties.cxx|4 svx/source/sdr/properties/measureproperties.cxx |6 svx/source/sdr/properties/pageproperties.cxx |6 svx/source/sdr/properties/properties.cxx | 10 svx/source/sdr/properties/textproperties.cxx |6 svx/source/svdraw/charthelper.cxx| 15 svx/source/svdraw/sdrpagewindow.cxx | 129 +++-- svx/source/svdraw/svdoashp.cxx | 100 ++-- svx/source/svdraw/svdobj.cxx | 136 - svx/source/svdraw/svdocapt.cxx | 28 - svx/source/svdraw/svdocirc.cxx | 122 ++--- svx/source/svdraw/svdoedge.cxx |6 svx/source/svdraw/svdograf.cxx | 16 svx/source/svdraw/svdomeas.cxx |2 svx/source/svdraw/svdomedia.cxx |2 svx/source/svdraw/svdoole2.cxx | 16 svx/source/svdraw/svdopath.cxx |8 svx/source/svdraw/svdorect.cxx | 86 +-- svx/source/svdraw/svdotext.cxx | 68 +- svx/source/svdraw/svdotxat.cxx |9 svx/source/svdraw/svdotxdr.cxx | 48 +- svx/source/svdraw/svdotxtr.cxx | 62 +- svx/source/svdraw/svdouno.cxx|4 svx/source/svdraw/svdpagv.cxx|7 svx/source/svdraw/svdpntv.cxx|6 svx/source/table/cell.cxx|8 svx/source/table/svdotable.cxx | 96 ++-- svx/source/unodraw/unopage.cxx | 29 - svx/source/unodraw/unoshape.cxx
[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 139 commits - apple_remote/source avmedia/Module_avmedia.mk bridges/Library_cpp_uno.mk bridges/source canvas/source chart2/inc chart2
Rebased ref, commits from common ancestor:
commit d1bf862cc75770e5931ac6a2b2135465091d9a45
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sat Oct 25 11:03:56 2014 -0400
vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5
(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)
plus, move conditional includes in salframe.cxx down a bit
Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6bef65a..8afcda5 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
#include osx/a11yfactory.h
#include quartz/utils.h
-#if MACOSX_SDK_VERSION 1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
#include salwtype.hxx
#include premac.h
@@ -54,6 +49,11 @@
#include Carbon/Carbon.h
#include postmac.h
+#if MACOSX_SDK_VERSION 1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
using namespace std;
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
[mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
}
+#endif
+
const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth,
maGeometry.nHeight )};
mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView
userData: nil assumeInside: NO];
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION 1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
[mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
#endif
}
commit d0530a36e43e9354ec686861d907d14f325abe48
Author: Douglas Mencken dougmenc...@gmail.com
Date: Sun Oct 26 06:38:10 2014 -0400
vcl: fix some cannot convert 'objc_object*' to... issues
Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// (getter with parameter)attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index b3efcae..f69fbf4 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpFrame = pFrame;
mMarkedRange = NSMakeRange(NSNotFound, 0);
mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
mpMouseEventListener = nil;
mpLastSuperEvent = nil;
}
@@ -1788,7 +1788,7 @@ private:
// some frames never become visible ..
::vcl::Window *pWindow = mpFrame - GetWindow();
if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
mpReferenceWrapper = new ReferenceWrapper;
mpReferenceWrapper - rAccessibleContext = pWindow -
/*GetAccessibleChildWindow( 0 ) -*/ GetAccessible() - getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
[NSNumber numberWithBool:NO],
@kCUIWindowFrameDrawTitleSeparatorKey,
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/source vcl/unx
vcl/source/opengl/OpenGLContext.cxx |3 ++-
vcl/unx/generic/gdi/salbmp.cxx |7 +--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 9eabde283b2c2806de4a5618cac7f1ebb394c228
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Nov 4 18:50:49 2014 +0100
use the configuration value
Change-Id: I9410a8f3ab40d56660280f5898ae6dec2672c39c
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 9078de6..6b2042c 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -44,6 +44,8 @@
#include unx/x11/xlimits.hxx
#include opengl/salbmp.hxx
+#include vcl/opengl/OpenGLHelper.hxx
+#include officecfg/Office/Common.hxx
#if defined HAVE_VALGRIND_HEADERS
#include valgrind/memcheck.h
@@ -55,8 +57,9 @@
SalBitmap* X11SalInstance::CreateSalBitmap()
{
-static const char* pOpenGL = getenv(USE_OPENGL);
-if (pOpenGL)
+static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL();
+bool bUseOpenGL = bOpenGLPossible ?
officecfg::Office::Common::VCL::UseOpenGL::get() : false;
+if (bUseOpenGL)
return new OpenGLSalBitmap();
else
return new X11SalBitmap();
commit f8d5d4d92e43cb4ffb3250267d7a45a815c1f4cd
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Nov 4 05:36:41 2014 +0100
add comment to find uncommented code again
Change-Id: Ice2f98f2e5d16ca4bc5b103e0ffba2fb1e2e5ad0
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index f1686e3..5e23427 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -540,7 +540,8 @@ bool OpenGLContext::init(HDC hDC, HWND hWnd)
bool OpenGLContext::ImplInit()
{
SAL_INFO(vcl.opengl, OpenGLContext::ImplInitstart);
-/*if(m_pWindow)
+/* TODO: moggi: FIXME add back
+ * if(m_pWindow)
m_pWindow-setPosSizePixel(0,0,0,0);
m_aGLWin.Width = 0;
m_aGLWin.Height = 0;*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/inc svx/source
include/svx/sdr/contact/viewcontact.hxx| 249 --
svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx| 91 +--
svx/source/sdr/contact/viewcontact.cxx | 498 ++---
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx | 321 ++---
4 files changed, 566 insertions(+), 593 deletions(-)
New commits:
commit 50228d22a62ecfbc974130f2ff3f7c4e03a9a033
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 4 12:57:56 2014 -0500
Unindent.
Change-Id: Ib274ec26768e8a3bd1006601679404799fed986a
diff --git a/include/svx/sdr/contact/viewcontact.hxx
b/include/svx/sdr/contact/viewcontact.hxx
index 8cdf1ce..dae75a5 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -24,144 +24,131 @@
#include svx/svxdllapi.h
#include drawinglayer/primitive2d/baseprimitive2d.hxx
-
-// predeclarations
-
class SetOfByte;
class SdrPage;
class SdrObject;
-namespace sdr
-{
-namespace contact
-{
-class ObjectContact;
-class ViewObjectContact;
-} // end of namespace contact
-} // end of namespace sdr
-
+namespace sdr { namespace contact {
+class ObjectContact;
+class ViewObjectContact;
-namespace sdr
+class SVX_DLLPUBLIC ViewContact
{
-namespace contact
-{
-class SVX_DLLPUBLIC ViewContact
-{
-private:
-// make ViewObjectContact a friend to exclusively allow it to use
-// AddViewObjectContact/RemoveViewObjectContact
-friend class ViewObjectContact;
-
-// List of ViewObjectContacts. This contains all VOCs which were
constructed
-// with this VC. Since the VOCs remember a reference to this VC,
this list needs
-// to be kept and is used e.g. at destructor to destroy all VOCs.
-// Registering and de-registering is done in the VOC
constructors/destructors.
-std::vector ViewObjectContact*
maViewObjectContactVector;
-
-// Primitive2DSequence of the ViewContact. This contains all
necessary information
-// for the graphical visualisation and needs to be supported by
all VCs which
-// can be visualized.
-drawinglayer::primitive2d::Primitive2DSequence
mxViewIndependentPrimitive2DSequence;
-
-// A new ViewObjectContact was created and shall be remembered.
-void AddViewObjectContact(ViewObjectContact rVOContact);
-
-// A ViewObjectContact was deleted and shall be forgotten.
-void RemoveViewObjectContact(ViewObjectContact rVOContact);
-
-// internal tooling to delete VOCs
-void deleteAllVOCs();
-
-protected:
-// Interface to allow derivates to travel over the registered VOC's
-sal_uInt32 getViewObjectContactCount() const { return
maViewObjectContactVector.size(); }
-ViewObjectContact* getViewObjectContact(sal_uInt32 a) const {
return maViewObjectContactVector[a]; }
-
-// Create a Object-Specific ViewObjectContact, set ViewContact and
-// ObjectContact. Always needs to return something. Default is to
create
-// a standard ViewObjectContact containing the given ObjectContact
and *this
-virtual ViewObjectContact
CreateObjectSpecificViewObjectContact(ObjectContact rObjectContact);
-
-// This method is responsible for creating the graphical
visualisation data derived ONLY from
-// the model data. It will be stored/buffered in
mxViewIndependentPrimitive2DSequence. The default implementation
-// creates a yellow replacement rectangle (1000, 1000, 5000, 3000)
to visualize missing
-// implementations. All implementations have to provide basic
geometry here, this is the central
-// visualisation method and will also be used for BoundRect
computations in the long run.
-// This means it's always an error when the default implementation
is called and thus gets
-// asserted there
-virtual drawinglayer::primitive2d::Primitive2DSequence
createViewIndependentPrimitive2DSequence() const;
-
-// method for flushing View Independent Primitive2DSequence for
VOC implementations
-void flushViewIndependentPrimitive2DSequence() {
mxViewIndependentPrimitive2DSequence.realloc(0); }
-
-// basic constructor. Since this is a base class only, it shall
-// never be called directly
-ViewContact();
-
-// Methods to react on start getting viewed or stop getting
-// viewed. This info is derived from the count of members of
-// registered ViewObjectContacts. Default does nothing.
-virtual void StartGettingViewed();
-virtual void StopGettingViewed();
-
-public:
-// basic destructor with needed cleanups
-virtual
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sw/qa sw/source
sw/qa/extras/ww8export/data/bnc636128.doc |binary
sw/qa/extras/ww8export/ww8export.cxx | 10 ++
sw/source/filter/ww8/wrtww8.cxx | 10 ++
sw/source/filter/ww8/ww8par.hxx |4 +++-
sw/source/filter/ww8/ww8par3.cxx |4 +++-
5 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 282bd32aac90f81520a4dd5cbb13053f6dbf6ed7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 15:36:02 2014 +0100
bnc#636128 DOC export: handle FFData.cch
Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46
(cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb)
diff --git a/sw/qa/extras/ww8export/data/bnc636128.doc
b/sw/qa/extras/ww8export/data/bnc636128.doc
new file mode 100644
index 000..5f92c3e
Binary files /dev/null and b/sw/qa/extras/ww8export/data/bnc636128.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 8a611e6..b4037ed 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -17,6 +17,7 @@
#include com/sun/star/view/XViewSettingsSupplier.hpp
#include com/sun/star/table/ShadowFormat.hpp
#include com/sun/star/text/GraphicCrop.hpp
+#include com/sun/star/text/XFormField.hpp
class Test : public SwModelTestBase
{
@@ -215,6 +216,15 @@ DECLARE_WW8EXPORT_TEST(testFdo59530, fdo59530.doc)
#endif
+DECLARE_WW8EXPORT_TEST(testBnc636128, bnc636128.doc)
+{
+// Import / export of FFData.cch was missing.
+uno::Referencetext::XFormField xFormField = getProperty
uno::Referencetext::XFormField (getRun(getParagraph(1), 2), Bookmark);
+uno::Referencecontainer::XNameContainer xParameters =
xFormField-getParameters();
+// This resulted in a container.NoSuchElementException.
+CPPUNIT_ASSERT_EQUAL(OUString(5),
xParameters-getByName(MaxLength).getOUString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 7530668..ec558c9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3663,6 +3663,16 @@ void WW8Export::WriteFormData( const
::sw::mark::IFieldmark rFieldmark )
ffres = 0;
}
aFldHeader.bits |= ( (ffres2) 0x7C );
+if (type == 0) // iTypeText
+{
+sw::mark::IFieldmark::parameter_map_t::const_iterator pParameter =
rFieldmark.GetParameters()-find(MaxLength);
+if (pParameter != rFieldmark.GetParameters()-end())
+{
+OUString aLength;
+pParameter-second = aLength;
+aFldHeader.cch = aLength.toUInt32();
+}
+}
std::vector OUString aListItems;
if (type==2)
commit 3a40e9d4b2338e8650c921ff4c8c2bb9e7cba33b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Nov 4 12:37:45 2014 +0100
bnc#636128 DOC import: handle FFData.cch
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f)
Conflicts:
sw/source/filter/ww8/ww8par3.cxx
Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 696d103..a9cca62 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -625,7 +625,7 @@ public:
WW8FormulaControl(const OUString rN, SwWW8ImplReader rR)
: rRdr(rR), fUnknown(0), fDropdownIndex(0),
fToolTip(0), fNoMark(0), fUseSize(0), fNumbersOnly(0), fDateOnly(0),
-fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), sName( rN )
+fUnused(0), nSize(0), hpsCheckBox(20), nChecked(0), mnMaxLen(0),
sName( rN )
{
}
sal_uInt8 fUnknown:2;
@@ -642,6 +642,8 @@ public:
sal_uInt16 nChecked;
sal_uInt16 nDefaultChecked;
+/// FFData.cch in the spec: maximum length, in characters, of the value of
the textbox.
+sal_uInt16 mnMaxLen;
OUString sTitle;
OUString sDefault;
OUString sFormatting;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 25da902..22e305e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -167,6 +167,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc*
pF, OUString rStr )
maFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
maFieldStack.back().getParameters()[Description] =
uno::makeAny(OUString(aFormula.sToolTip));
maFieldStack.back().getParameters()[Name] =
uno::makeAny(OUString(aFormula.sTitle));
+if (aFormula.mnMaxLen)
+maFieldStack.back().getParameters()[MaxLength] =
uno::makeAny(OUString::number(aFormula.mnMaxLen));
}
return FLD_TEXT;
}
@@ -2199,7 +2201,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
sal_uInt8 iRes = (bits1 0x7C) 2;
sal_uInt16 cch = 0;
-*pDataStream cch;
+*pDataStream
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sdr/contact/objectcontact.hxx | 249 +--
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 89 +---
include/svx/sdr/contact/viewobjectcontact.hxx | 199 -
svx/source/sdr/contact/objectcontact.cxx| 521 +++-
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 259 +--
5 files changed, 641 insertions(+), 676 deletions(-)
New commits:
commit 1bb27282558f23ee6f94bb046f5905a65c94ba3d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Nov 4 13:10:55 2014 -0500
Unindent.
Change-Id: I40f97fb81993ea59e23430d4680981c6b2ed35ad
diff --git a/include/svx/sdr/contact/objectcontact.hxx
b/include/svx/sdr/contact/objectcontact.hxx
index 89c3bb2..f10cb4a 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -24,20 +24,11 @@
#include svx/svxdllapi.h
#include drawinglayer/geometry/viewinformation2d.hxx
-
-// predeclarations
-
class SetOfByte;
class Rectangle;
class SdrPageView;
class OutputDevice;
-namespace sdr { namespace contact {
-class DisplayInfo;
-class ViewContact;
-class ViewObjectContactRedirector;
-}}
-
namespace sdr { namespace event {
class TimerEventHandler;
}}
@@ -47,172 +38,172 @@ namespace basegfx {
class B2DHomMatrix;
}
+namespace sdr { namespace contact {
+class DisplayInfo;
+class ViewContact;
+class ViewObjectContactRedirector;
-namespace sdr
+class SVX_DLLPUBLIC ObjectContact
{
-namespace contact
-{
-class SVX_DLLPUBLIC ObjectContact
-{
-private:
-// make ViewObjectContact a friend to exclusively allow it to use
-// AddViewObjectContact/RemoveViewObjectContact
-friend class ViewObjectContact;
+private:
+// make ViewObjectContact a friend to exclusively allow it to use
+// AddViewObjectContact/RemoveViewObjectContact
+friend class ViewObjectContact;
-// All VOCs which are created using this OC, thus remembering this
OC
-// as a reference. All those VOCs need to be deleted when the OC
goes down.
-// Registering and de-registering is done in the VOC
constructors/destructors.
-std::vector ViewObjectContact*
maViewObjectContactVector;
+// All VOCs which are created using this OC, thus remembering this OC
+// as a reference. All those VOCs need to be deleted when the OC goes down.
+// Registering and de-registering is done in the VOC
constructors/destructors.
+std::vector ViewObjectContact*maViewObjectContactVector;
-// A new ViewObjectContact was created and shall be remembered.
-void AddViewObjectContact(ViewObjectContact rVOContact);
+// A new ViewObjectContact was created and shall be remembered.
+void AddViewObjectContact(ViewObjectContact rVOContact);
-// A ViewObjectContact was deleted and shall be forgotten.
-virtual void RemoveViewObjectContact(ViewObjectContact
rVOContact);
+// A ViewObjectContact was deleted and shall be forgotten.
+virtual void RemoveViewObjectContact(ViewObjectContact rVOContact);
-// the primitiveAnimator which is used if this View and/or the
contained primitives
-// support animatedSwitchPrimitives
-sdr::animation::primitiveAnimator
maPrimitiveAnimator;
+// the primitiveAnimator which is used if this View and/or the contained
primitives
+// support animatedSwitchPrimitives
+sdr::animation::primitiveAnimator maPrimitiveAnimator;
-// the EventHandler for e.g. asynchronious loading of graphics
-sdr::event::TimerEventHandler* mpEventHandler;
+// the EventHandler for e.g. asynchronious loading of graphics
+sdr::event::TimerEventHandler* mpEventHandler;
-// The redirector. If set it is used to pipe all supported calls
-// to the redirector
-ViewObjectContactRedirector*
mpViewObjectContactRedirector;
+// The redirector. If set it is used to pipe all supported calls
+// to the redirector
+ViewObjectContactRedirector*
mpViewObjectContactRedirector;
-// the Primitive2DParameters containing view information
-drawinglayer::geometry::ViewInformation2D
maViewInformation2D;
+// the Primitive2DParameters containing view information
+drawinglayer::geometry::ViewInformation2D maViewInformation2D;
-// bitfield
-// flag for preview renderer
-bool
mbIsPreviewRenderer : 1;
+// bitfield
+// flag for preview renderer
+boolmbIsPreviewRenderer : 1;
-// method to create a EventHandler. Needs to give a result.
-
[Libreoffice-commits] core.git: 17 commits - connectivity/source forms/source include/vcl package/source store/source svx/source sw/source vcl/source
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 12 -
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |2
connectivity/source/drivers/odbc/OResultSet.cxx |2
connectivity/source/drivers/odbc/OStatement.cxx |2
forms/source/component/ListBox.cxx |2
include/vcl/salbtype.hxx|1
package/source/xstor/xstorage.cxx | 21
++
store/source/storpage.cxx |4 -
svx/source/engine3d/dragmt3d.cxx|3 +
svx/source/engine3d/obj3d.cxx |4 +
svx/source/engine3d/viewpt3d2.cxx |5 ++
sw/source/uibase/config/uinums.cxx |3 -
vcl/source/gdi/pdfwriter_impl.cxx |6 ++
13 files changed, 51 insertions(+), 16 deletions(-)
New commits:
commit c7ba28eaa766f2c1d4f0d3b25b40dd40777bc66b
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 4 19:35:44 2014 +0100
coverity#1242845 use of untrusted scalar
Change-Id: I25712384f1633506c047667606b4bc254e2ff04b
diff --git a/sw/source/uibase/config/uinums.cxx
b/sw/source/uibase/config/uinums.cxx
index 40de91d..107ce2a 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -398,7 +398,8 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal(
SvStream rStream,
{
sal_uInt16 nWhich, nVers;
rStream.ReadUInt16( nWhich ).ReadUInt16( nVers );
-aItems.push_back( GetDfltAttr( nWhich )-Create( rStream, nVers )
);
+if ( ( nWhich = POOLATTR_BEGIN ) ( nWhich POOLATTR_END ) )
+aItems.push_back( GetDfltAttr( nWhich )-Create( rStream,
nVers ) );
}
}
commit 025da16223a28263059d9d02be276459dcc9ca75
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 4 19:26:45 2014 +0100
coverity#1242933 unused value
Change-Id: I416144a4ccf2856ce85ab4b24a69958615276cb9
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index baf8f74..b97a945 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -968,7 +968,7 @@ storeError OStorePageManager::rebuild (
{
// Ordinary attributes.
sal_uInt32 nAttrib = 0;
-eErrCode = attrib (e.m_aKey, 0, e.m_nAttrib, nAttrib);
+attrib (e.m_aKey, 0, e.m_nAttrib, nAttrib);
}
}
}
commit 2ba3fd5a1aa1623703defa3772b1e8a2a122ebcc
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 4 19:23:17 2014 +0100
coverity#1242809 unused value
Change-Id: I16430567b3d57016458bd7877c36bc6e01197741
diff --git a/store/source/storpage.cxx b/store/source/storpage.cxx
index 28fd219..baf8f74 100644
--- a/store/source/storpage.cxx
+++ b/store/source/storpage.cxx
@@ -959,7 +959,7 @@ storeError OStorePageManager::rebuild (
if (eErrCode == store_E_None)
{
OStorePageKey aDstKey (aSrcPage.key());
-eErrCode = link (e.m_aKey, aDstKey);
+link (e.m_aKey, aDstKey);
}
e.m_nAttrib = ~STORE_ATTRIB_ISLINK;
}
commit 15492438f5dcb6e239c53d5c02d8ca442bd438a0
Author: David Tardon dtar...@redhat.com
Date: Tue Nov 4 18:54:38 2014 +0100
coverity#706578 uncaught exception
Change-Id: I70640f42db49da274118f7336ff072b1b53ac640
diff --git a/package/source/xstor/xstorage.cxx
b/package/source/xstor/xstorage.cxx
index 0b1193f..773fd79 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -5986,15 +5986,22 @@ uno::Reference embed::XExtendedStorageStream
SAL_CALL OStorage::openStreamEle
uno::Reference embed::XExtendedStorageStream xResult;
if ( aListPath.size() == 1 )
{
-// that must be a direct request for a stream
-// the transacted version of the stream should be opened
+try
+{
+// that must be a direct request for a stream
+// the transacted version of the stream should be opened
-SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath,
nOpenMode, false );
-assert(pElement pElement-m_pStream In case element can not be
created an exception must be thrown!);
+SotElement_Impl *pElement = OpenStreamElement_Impl( aStreamPath,
nOpenMode, false );
+assert(pElement pElement-m_pStream In case element can not
be created an exception must be thrown!);
-xResult = uno::Reference embed::XExtendedStorageStream (
-pElement-m_pStream-GetStream(
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||83798 --- Comment #14 from Cor Nouws c...@nouenoff.nl --- adding Bug 83798 - Chapter numbers (Outline numbering) not included in Table of Contents (TOC) -- 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: 16 commits - configmgr/qa icon-themes/crystal icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/sifr ico
configmgr/qa/unit/data.xcd |5 icon-themes/crystal/links.txt|4 icon-themes/galaxy/links.txt |3 icon-themes/hicontrast/links.txt |3 icon-themes/human/links.txt |4 icon-themes/industrial/links.txt |3 icon-themes/oxygen/links.txt |4 icon-themes/sifr/links.txt |4 icon-themes/tango/links.txt |4 icon-themes/tango_testing/links.txt |4 include/svx/ParaLineSpacingPopup.hxx | 50 include/svx/dialogs.hrc | 17 include/svx/svxcommands.h|1 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 12 svx/UIConfig_svx.mk |1 svx/sdi/svx.sdi |1 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 707 ++ svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 88 - svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx| 41 svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx| 49 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 38 svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 16 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx |6 svx/source/sidebar/paragraph/ParaPropertyPanel.src | 179 -- svx/uiconfig/ui/paralinespacingcontrol.ui| 284 svx/uiconfig/ui/sidebarparagraph.ui |3 sw/source/uibase/app/swmodule.cxx|4 sw/uiconfig/swriter/toolbar/textobjectbar.xml|4 28 files changed, 625 insertions(+), 914 deletions(-) New commits: commit 695d29e17feefb33ff54e7263ba2d322e665d176 Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 4 20:23:52 2014 +0100 line spacing: Some consistency. Change-Id: I9c5e3d27c4cc6b76eac9acd116417db9a363 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 9cb163c..c8daeca 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1608,7 +1608,7 @@ /node node oor:name=.uno:SpacePara15 oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USLine Spacing : 1.5/value + value xml:lang=en-USLine Spacing: 1.5/value /prop prop oor:name=Properties oor:type=xs:int value15/value @@ -1616,7 +1616,7 @@ /node node oor:name=.uno:SpacePara2 oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USLine Spacing : 2/value + value xml:lang=en-USLine Spacing: 2/value /prop prop oor:name=Properties oor:type=xs:int value15/value commit 6e4ee0c0f5b0e314ead2e87438e09eae513e5dc3 Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 4 20:22:58 2014 +0100 line spacing: Magic 'Property' that is needed to actually show the icon. Change-Id: I65ac0dc09936ba20d42f1485d628289d1cfab819 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index a15aa77..9cb163c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1594,6 +1594,9 @@ prop oor:name=Label oor:type=xs:string value xml:lang=en-USLine Spacing/value /prop +prop oor:name=Properties oor:type=xs:int + value15/value +/prop /node node oor:name=.uno:SpacePara1 oor:op=replace prop oor:name=Label oor:type=xs:string commit d694697d9d7b46435227ed50edbac304dbb0137f Author: Jan Holesovsky ke...@collabora.com Date: Tue Nov 4 18:07:03 2014 +0100 line spacing: Introduce an icon for that. Change-Id: I26922eb51120331c1f10b00e2bf59bdd7cd8d413 diff --git a/icon-themes/crystal/links.txt b/icon-themes/crystal/links.txt index 6b76367..7e5bb94f 100644 --- a/icon-themes/crystal/links.txt +++ b/icon-themes/crystal/links.txt @@ -1 +1,5 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png + +# paragraph line spacing +cmd/lc_linespacing.png
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/threadpool.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6f46cf4fe112bc2aec29a8975ef10861853716b6 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Nov 4 18:44:15 2014 + thread-pool: Initialize empty pools to start complete. Otherwise waiting for completion if we push no work hangs. Change-Id: I7103bdb779eb66a65cd8496091e72a0c65eb3567 diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index 3717ffb..77e9962 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -99,7 +99,7 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) : for( sal_Int32 i = 0; i nWorkers; i++ ) maWorkers.push_back( new ThreadWorker( this ) ); -maTasksComplete.reset(); +maTasksComplete.set(); osl::MutexGuard aGuard( maGuard ); for( size_t i = 0; i maWorkers.size(); i++ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source include/canvas include/toolkit
extensions/source/dbpilots/unoautopilot.hxx|2 +-
include/canvas/base/canvascustomspritebase.hxx | 12 ++--
include/canvas/base/spritecanvasbase.hxx |8
include/toolkit/awt/scrollabledialog.hxx |2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 148cde5f7daad47ae1df1f92f77dd16499c6ac75
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Nov 4 20:53:06 2014 +0100
-Werror,-Winconsistent-missing-override
(loplugin:saloverride does not warn about them because they depend on
template args)
Change-Id: I41a1dbfd7db24e58154f6f3810781219119418ba
diff --git a/extensions/source/dbpilots/unoautopilot.hxx
b/extensions/source/dbpilots/unoautopilot.hxx
index 29b6b79..d176321 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -81,7 +81,7 @@ namespace dbp
virtual ::cppu::IPropertyArrayHelper SAL_CALL getInfoHelper()
SAL_OVERRIDE;
// OPropertyArrayUsageHelper
-virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const
SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
diff --git a/include/canvas/base/canvascustomspritebase.hxx
b/include/canvas/base/canvascustomspritebase.hxx
index 92fa614..b448085 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -219,42 +219,42 @@ namespace canvas
}
// Sprite
-virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange
rUpdateArea ) const
+virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange
rUpdateArea ) const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.isAreaUpdateOpaque( rUpdateArea );
}
-virtual bool isContentChanged() const
+virtual bool isContentChanged() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return BaseType::mbSurfaceDirty;
}
-virtual ::basegfx::B2DPoint getPosPixel() const
+virtual ::basegfx::B2DPoint getPosPixel() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getPosPixel();
}
-virtual ::basegfx::B2DVector getSizePixel() const
+virtual ::basegfx::B2DVector getSizePixel() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getSizePixel();
}
-virtual ::basegfx::B2DRange getUpdateArea() const
+virtual ::basegfx::B2DRange getUpdateArea() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getUpdateArea();
}
-virtual double getPriority() const
+virtual double getPriority() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/spritecanvasbase.hxx
b/include/canvas/base/spritecanvasbase.hxx
index 7320986..a05f526 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -142,7 +142,7 @@ namespace canvas
}
// SpriteSurface
-virtual void showSprite( const Sprite::Reference rSprite )
+virtual void showSprite( const Sprite::Reference rSprite )
SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
@@ -151,7 +151,7 @@ namespace canvas
maRedrawManager.showSprite( rSprite );
}
-virtual void hideSprite( const Sprite::Reference rSprite )
+virtual void hideSprite( const Sprite::Reference rSprite )
SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
@@ -163,7 +163,7 @@ namespace canvas
virtual void moveSprite( const Sprite::Reference rSprite,
const ::basegfx::B2DPoint rOldPos,
const ::basegfx::B2DPoint rNewPos,
- const ::basegfx::B2DVectorrSpriteSize )
+ const ::basegfx::B2DVectorrSpriteSize )
SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
@@ -174,7 +174,7 @@ namespace canvas
virtual void updateSprite( const Sprite::Reference rSprite,
const ::basegfx::B2DPoint rPos,
- const ::basegfx::B2DRange rUpdateArea )
+ const ::basegfx::B2DRange rUpdateArea )
SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
diff --git a/include/toolkit/awt/scrollabledialog.hxx
[Libreoffice-commits] core.git: 6 commits - sc/source svtools/source svx/source sw/source
sc/source/core/tool/autoform.cxx|2 -
svtools/source/toolpanel/tabbargeometry.cxx | 12 +---
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 14 --
svx/source/svdraw/svddrgmt.cxx |4 ++
sw/source/core/crsr/crsrsh.cxx |4 ++
sw/source/uibase/config/uinums.cxx | 22 +++-
sw/source/uibase/docvw/edtwin.cxx |2 -
7 files changed, 44 insertions(+), 16 deletions(-)
New commits:
commit 0ce9c4f910afb2bf1ac0aec97ef49598493ac3a5
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 4 13:13:24 2014 +
Resolves: fdo#69049 Format in 'Outline Numbering' not saved anymore
Change-Id: Ibd129d989a32eec2f63413d1ed09962ad3b38c68
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 88f7b58..e9265b9 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -1070,7 +1070,7 @@ bool ScAutoFormat::Save()
SvtPathOptions aPathOpt;
aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
aURL.setFinalSlash();
-aURL.Append( OUString( sAutoTblFmtName ) );
+aURL.Append(sAutoTblFmtName);
SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE
);
SvStream* pStream = aMedium.GetOutStream();
diff --git a/sw/source/uibase/config/uinums.cxx
b/sw/source/uibase/config/uinums.cxx
index 107ce2a..0fe448d4 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -67,13 +67,23 @@ SwBaseNumRules::~SwBaseNumRules()
{
if( bModified )
{
+INetURLObject aURL;
SvtPathOptions aPathOpt;
-OUString sNm( aPathOpt.GetUserConfigPath() + / + sFileName );
-INetURLObject aTempObj(sNm);
-sNm = aTempObj.GetFull();
-SfxMedium aStrm( sNm, STREAM_WRITE | STREAM_TRUNC |
-STREAM_SHARE_DENYALL );
-Store( *aStrm.GetOutStream() );
+aURL.SetSmartURL( aPathOpt.GetUserConfigPath() );
+aURL.setFinalSlash();
+aURL.Append(sFileName);
+
+SfxMedium aMedium( aURL.GetMainURL(INetURLObject::NO_DECODE),
STREAM_WRITE );
+SvStream* pStream = aMedium.GetOutStream();
+bool bRet = (pStream pStream-GetError() == 0);
+if (bRet)
+{
+Store( *pStream );
+
+pStream-Flush();
+
+aMedium.Commit();
+}
}
for( sal_uInt16 i = 0; i nMaxRules; ++i )
commit c61b200fb0130f0b0f9f51b48e3799625b83
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 4 10:00:20 2014 +
coverity#735635 Division or modulo by float zero
and
coverity#735636 Division or modulo by float zero
Change-Id: Ib9c93ea843f63d38bdb8b0e5107f48afc2bdec52
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 920df9f..3011caa 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -21,6 +21,7 @@
#include math.h
#include tools/bigint.hxx
+#include o3tl/numeric.hxx
#include vcl/svapp.hxx
#include vcl/settings.hxx
#include svx/xattr.hxx
@@ -3851,6 +3852,9 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
basegfx::fround(aRangeNewNoShearNoRotate.getMaxY()));
// continue with the old original stuff
+if (!aOldRect.GetWidth() || !aOldRect.GetHeight())
+throw o3tl::divide_by_zero();
+
double fScaleX = ( aGraphicSize.Width() - rOldCrop.GetLeft() -
rOldCrop.GetRight() ) / (double)aOldRect.GetWidth();
double fScaleY = ( aGraphicSize.Height() - rOldCrop.GetTop() -
rOldCrop.GetBottom() ) / (double)aOldRect.GetHeight();
commit f075a3ad08f7d5b53790076d1965818e57628afa
Author: Caolán McNamara caol...@redhat.com
Date: Tue Nov 4 09:56:28 2014 +
coverity#735623 Division or modulo by float zero
Change-Id: Ibd53687416a4e20af7ac4a1e02c54407892aa470
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index ae31f00..7332449 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -552,12 +552,20 @@ void CalcDistances( const Polygon rPoly, std::vector
double rDistances )
void InsertMissingOutlinePoints( const Polygon /*rOutlinePoly*/, const
std::vector double rDistances, const Rectangle rTextAreaBoundRect,
Polygon rPoly )
{
-sal_uInt16 i = 0;
+sal_uInt16 nSize = rPoly.GetSize();
+if (nSize == 0)
+return;
+
+long nTextWidth = rTextAreaBoundRect.GetWidth();
+
+if (nTextWidth == 0)
+throw o3tl::divide_by_zero();
+
double fLastDistance = 0.0;
-for ( i = 0; i rPoly.GetSize(); i++ )
+for (sal_uInt16 i = 0; i nSize; ++i)
{
Point rPoint = rPoly[ i ];
-double fDistance = (double)( rPoint.X() -
Re: coverity warnings update, 120 remaining warnings
On Tue, 2014-11-04 at 16:44 +0100, Michael Stahl wrote: On 03.11.2014 22:03, Caolán McNamara wrote: Excellent, that one was super-bugging me. FWIW that leaves just one MIXED_ENUM warning left. 705369 where XML_TOK_ENCODING in dbaccess/source/filter/xml/xmlDataSourceInfo.cxx:67 is also from an utterly different enum from the rest of the cases :-( fixed in commit d1d84fcaa750a70f423ee53c7f2a98e24914cb0e Great, my next contender for most suspicious remaining warning is 1242526 Arguments in wrong order in sc/source/ui/Accessibility/AccessessiblePreviewTable.cxx:322 where rRowInfo.bIsHeader, rCorInfo.bIsHeader arguments are passed to the ScAccessiblePreviewHeaderCell ctor in the same postions as arguments named bIsColHdr and bIsRowHdr C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 56903] Moz-free Outlook Address Book driver
https://bugs.freedesktop.org/show_bug.cgi?id=56903 --- Comment #3 from DavidO d.ostrov...@gmx.de --- So what is the current name for the API? Windows Address Book (WAB) API or Windows Contacts API apparently they make a new one with every windows release? -- 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: svx/source
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 25 -
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 30 ++--
2 files changed, 22 insertions(+), 33 deletions(-)
New commits:
commit eca6f3056de43b2a74108f96df3b55633a486d0b
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Nov 4 22:08:36 2014 +0100
line spacing: Final cleanup.
Change-Id: Ide0e653493759e7583fbebb2b3d23d614bdb803c
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index d85e08b..4cfbca6 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -16,18 +16,14 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include ParaLineSpacingControl.hxx
-#include ParaPropertyPanel.hrc
-#include sfx2/sidebar/ResourceDefinitions.hrc
-#include svx/dialogs.hrc
-#include svx/dialmgr.hxx
-#include unotools/viewoptions.hxx
+
+#include editeng/editids.hrc
#include editeng/kernitem.hxx
+#include editeng/lspcitem.hxx
#include sfx2/dispatch.hxx
-#include sfx2/sidebar/Theme.hxx
-#include sfx2/viewfrm.hxx
#include svtools/unitconv.hxx
-#include vcl/settings.hxx
#define DEFAULT_LINE_SPACING 200
#define FIX_DIST_DEF 283
@@ -51,7 +47,6 @@
#define MIN_FIXED_DISTANCE28
using namespace svx;
-using namespace svx::sidebar;
ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId)
: SfxPopupWindow(nId, ParaLineSpacingControl,
svx/ui/paralinespacingcontrol.ui)
@@ -94,14 +89,14 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16
nId)
SetFieldUnit(*mpLineDistAtMetricBox, eUnit);
-initialize();
+Initialize();
}
ParaLineSpacingControl::~ParaLineSpacingControl()
{
}
-void ParaLineSpacingControl::initialize()
+void ParaLineSpacingControl::Initialize()
{
const SfxPoolItem* pItem;
SfxItemState eState =
SfxViewFrame::Current()-GetBindings().GetDispatcher()-QueryState(SID_ATTR_PARA_LINESPACE,
pItem);
@@ -287,8 +282,8 @@ void ParaLineSpacingControl::UpdateMetricFields()
mpActLineDistFld-Show();
mpActLineDistFld-Enable();
break;
+
case LLINESPACE_FIX:
-{
mpLineDistAtPercentBox-Hide();
mpActLineDistFld = mpLineDistAtMetricBox;
@@ -301,8 +296,7 @@ void ParaLineSpacingControl::UpdateMetricFields()
mpLineDistLabel-Enable();
mpActLineDistFld-Show();
mpActLineDistFld-Enable();
-}
-break;
+break;
}
}
@@ -348,10 +342,9 @@ void ParaLineSpacingControl::ExecuteLineSpace()
case LLINESPACE_DURCH:
case LLINESPACE_FIX:
SetLineSpace(aSpacing, nPos, GetCoreValue(*mpLineDistAtMetricBox,
meLNSpaceUnit));
-break;
+break;
default:
-OSL_ENSURE(false, error!!);
break;
}
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 087e6a8..07fb087 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -19,16 +19,11 @@
#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGCONTROL_HXX
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGCONTROL_HXX
-#include svx/sidebar/ValueSetWithTextControl.hxx
-#include sfx2/bindings.hxx
#include svtools/ctrlbox.hxx
-#include svtools/ctrltool.hxx
-#include vcl/fixed.hxx
-#include svl/poolitem.hxx
-#include editeng/lspcitem.hxx
-#include sfx2/sidebar/EnumContext.hxx
#include sfx2/tbxctrl.hxx
+class SvxLineSpacingItem;
+
namespace svx {
class ParaLineSpacingControl : public SfxPopupWindow
@@ -37,15 +32,6 @@ public:
ParaLineSpacingControl(sal_uInt16 nId);
virtual ~ParaLineSpacingControl();
-short GetLastCustomState();
-long GetLastCustomValue();
-
-void ExecuteLineSpace();
-void SetLineSpace( SvxLineSpacingItem rLineSpace,
-int eSpace, long lValue = 0 );
-
-void ExecuteLineSpacing(sal_uInt16 aEntry);
-
private:
SfxMapUnit meLNSpaceUnit;
@@ -63,7 +49,17 @@ private:
MetricField*mpLineDistAtMetricBox;
private:
-void initialize();
+/// Setup the widgets with values from the document.
+void Initialize();
+
+/// Take the values from the widgets, and update the paragraph accordingly.
+void ExecuteLineSpace();
+
+/// Set one particular value.
+void SetLineSpace(SvxLineSpacingItem rLineSpace, int eSpace, long lValue
= 0);
+
+/// For the buttons - set the values, and close the popup.
+void ExecuteLineSpacing(sal_uInt16 aEntry);
/// Set mpActlineDistFld and visibility of mpLineDist* fields according to
what is just selected.
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit acc1d00febdda920c1b824e69783185f5b08 Author: Michael Stahl mst...@redhat.com Date: Tue Nov 4 22:44:52 2014 +0100 Repository.mk: move conditional to the right place regression from 139a4b6229905e44f22a0b747ea9c44f30e468f4, thanks _david_ Change-Id: Ifce88cc5dd3dfc252a16407b4141ba2751564171 diff --git a/Repository.mk b/Repository.mk index 91af283..970435f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -804,11 +804,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ ) \ )) -ifeq ($(GUIBASE),unx) $(eval $(call gb_Helper_register_packages_for_install,ooo,\ xmlsec \ )) +ifeq ($(GUIBASE),unx) $(eval $(call gb_Helper_register_packages_for_install,base_brand,\ desktop_sbase_sh \ )) ___ 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/sidebar/paragraph/ParaPropertyPanel.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 8e19b7a0b3dc57fce7e2caf05af2c0451123c5be Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 4 21:50:07 2014 +0200 WaE: unused variable 'UNO_LINESPACING' Change-Id: Ica6d417b18136f0645d69a54a86ecddd255e17c1 diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 5e7604f..e683e6d 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -53,8 +53,6 @@ const char UNO_PROMOTE[] = .uno:Promote; const char UNO_DEMOTE[] = .uno:Demote; const char UNO_HANGINGINDENT2[] = .uno:HangingIndent2; -const char UNO_LINESPACING[] = .uno:LineSpacing; - const char UNO_PARASPACEINC[] = .uno:ParaspaceIncrease; const char UNO_PARASPACEDEC[] = .uno:ParaspaceDecrease; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/lfrb-vcl-opengl' - 3 commits - include/vcl vcl/inc vcl/opengl vcl/source vcl/unx
include/vcl/opengl/OpenGLHelper.hxx | 10 ++
include/vcl/outdev.hxx |2 ++
vcl/inc/generic/genpspgraphics.h|2 ++
vcl/inc/headless/svpgdi.hxx |2 ++
vcl/inc/openglgdiimpl.hxx |2 ++
vcl/inc/quartz/salgdi.h |2 ++
vcl/inc/salgdi.hxx |2 ++
vcl/inc/salgdiimpl.hxx |2 ++
vcl/inc/unx/salgdi.h|2 ++
vcl/inc/win/salgdi.h|2 ++
vcl/opengl/gdiimpl.cxx |6 ++
vcl/source/opengl/OpenGLContext.cxx | 14 +-
vcl/source/opengl/OpenGLHelper.cxx | 25 +
vcl/source/outdev/outdev.cxx|7 +++
vcl/source/window/paint.cxx |2 ++
vcl/unx/generic/app/saldisp.cxx |8
vcl/unx/generic/gdi/gdiimpl.hxx |2 ++
vcl/unx/generic/gdi/salgdi.cxx |5 +
18 files changed, 96 insertions(+), 1 deletion(-)
New commits:
commit 5c7b4ea3bdf05b4c80082e5737c34c8d1871ae99
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Tue Nov 4 17:32:48 2014 -0500
vcl: Add list of contexts sharing the same display list
Change-Id: Ib1bca0aaaf41140d6b9a17378094b0f20e469ebd
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 6b995b2..7babaf5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -25,6 +25,8 @@
using namespace com::sun::star;
+static std::vector GLXContext vShareList;
+
GLWindow::~GLWindow()
{
#if defined( UNX ) !defined MACOSX !defined IOS !defined ANDROID
@@ -56,6 +58,8 @@ OpenGLContext::~OpenGLContext()
#elif defined( UNX )
if(m_aGLWin.ctx)
{
+std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx );
+
glXMakeCurrent(m_aGLWin.dpy, None, NULL);
if( glGetError() != GL_NO_ERROR )
{
@@ -547,13 +551,21 @@ bool OpenGLContext::ImplInit()
#endif
if (!m_aGLWin.ctx)
{
+GLXContext pSharedCtx( NULL );
+
if (!m_aGLWin.dpy || !m_aGLWin.vi)
return false;
+if( !vShareList.empty() )
+pSharedCtx = vShareList.front();
+
m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
m_aGLWin.vi,
-0,
+pSharedCtx,
GL_TRUE);
+
+if( m_aGLWin.ctx )
+vShareList.push_back( m_aGLWin.ctx );
}
if( m_aGLWin.ctx == NULL )
{
commit efbf76b57ffc514ba307418dbf6a34a3ed20319f
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Tue Nov 4 17:31:12 2014 -0500
vcl: Get visual info for window from GLX when needed
Change-Id: Id8cea87391835694e20aa703b7fdb3f13434d47b
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index 8c04e32..092d7f4 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -16,6 +16,12 @@
#include rtl/ustring.hxx
+#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
+# include prex.h
+# include GL/glxew.h
+# include postx.h
+#endif
+
class VCLOPENGL_DLLPUBLIC OpenGLHelper
{
public:
@@ -46,6 +52,10 @@ public:
static float getGLVersion();
static void checkGLError(const char* aFile, size_t nLine);
+
+#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
+static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo
rVI);
+#endif
};
#define CHECK_GL_ERROR() OpenGLHelper::checkGLError(__FILE__, __LINE__)
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index c94e290..4e4b3d1 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -358,4 +358,29 @@ void OpenGLHelper::checkGLError(const char* pFile, size_t
nLine)
}
}
+#if defined UNX !defined MACOSX !defined IOS !defined ANDROID
+
+bool OpenGLHelper::GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo
rVI)
+{
+XVisualInfo* pVI;
+int aAttrib[] = { GLX_RGBA,
+ GLX_RED_SIZE, 8,
+ GLX_GREEN_SIZE, 8,
+ GLX_BLUE_SIZE, 8,
+ GLX_DEPTH_SIZE, 24,
+ GLX_DOUBLEBUFFER,
+ None };
+
+pVI = glXChooseVisual( pDisplay, nScreen, aAttrib );
+if( !pVI )
+return false;
+
+rVI = *pVI;
+XFree( pVI );
+
+return true;
+}
+
+#endif
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 85d3997..159263a 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -67,10 +67,14 @@
#include unx/sm.hxx
#include unx/wmadaptor.hxx
+#include vcl/opengl/OpenGLHelper.hxx
+
#include osl/socket.h
#include poll.h
#include boost/scoped_array.hpp
+#include officecfg/Office/Common.hxx
+
using namespace
[Libreoffice-commits] core.git: Branch 'private/tml/opencl-default-1' - officecfg/registry sc/inc sc/source sc/uiconfig
officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 30 +++ sc/inc/calcconfig.hxx| 14 + sc/source/core/tool/calcconfig.cxx | 139 +- sc/source/core/tool/formulagroup.cxx |2 sc/source/core/tool/formulaopt.cxx | 68 ++- sc/source/core/tool/token.cxx|4 sc/source/ui/optdlg/calcoptionsdlg.cxx | 143 ++- sc/source/ui/optdlg/calcoptionsdlg.hxx | 20 ++ sc/source/ui/unoobj/docuno.cxx |5 sc/uiconfig/scalc/ui/formulacalculationoptions.ui| 117 10 files changed, 517 insertions(+), 25 deletions(-) New commits: commit 24543f0ec25861b097d3672f265859ff396c4c26 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 5 00:34:35 2014 +0200 More work on the new OpenCL options Now the new options show up in the Detailed Calculation Settings dialog and are saved and restored from the per-user configuration. The code that manipulates the Detailed Calculation Settings dialog is quite ugly with all its manual hiding and showing of widgets depending on which detail it is that is being edited. This also means that the dialog cannot be designed using Glade. But no time now to re-work this. Change-Id: I03a3a51d902084e73aab5a787b588d22ea7578f2 diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index cb16b9b..d0eb9d1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1340,12 +1340,40 @@ info descContains settings for how to calculate formulae./desc /info + !-- Note: The default values below probably must correspond + to those assigned in setOpenCLConfigToDefault() in + sc/source/core/tool/calcconfig.cxx + -- prop oor:name=OpenCL oor:type=xs:boolean oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- info descWhether to use OpenCL for formula computation, if available./desc /info - valuefalse/value + valuetrue/value +/prop +prop oor:name=OpenCLSubsetOnly oor:type=xs:boolean oor:nillable=false + !-- UIHints: Tools - Options Spreadsheet Formula -- + info +descWhether to use only a subset of OpenCL./desc + /info + valuetrue/value +/prop +prop oor:name=OpenCLMinimumDataSize oor:type=xs:int + !-- UIHints: Tools - Options Spreadsheet Formula -- + 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 +/prop +prop oor:name=OpenCLSubsetOpCodes oor:type=xs:string oor:nillable=false + !-- UIHints: Tools - Options Spreadsheet Formula -- + info +descThe list of operator and function opcodes for which to use OpenCL. If a + formula contains only these operators and functions, it + might be calculated using OpenCL./desc + /info + !-- numeric values correspond to MIN;MAX;SUM;AVERAGE;SUMIFS -- + value222;223;224;226;403/value /prop prop oor:name=OpenCLAutoSelect oor:type=xs:boolean oor:nillable=false !-- UIHints: Tools - Options Spreadsheet Formula -- diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx index 77e944d..3a54efd 100644 --- a/sc/inc/calcconfig.hxx +++ b/sc/inc/calcconfig.hxx @@ -12,11 +12,11 @@ #include scdllapi.h +#include ostream #include set #include formula/grammar.hxx #include formula/opcode.hxx - #include rtl/ustring.hxx // have to match the registry values @@ -49,11 +49,13 @@ struct SC_DLLPUBLIC ScCalcConfig bool mbOpenCLSubsetOnly:1; bool mbOpenCLAutoSelect:1; OUString maOpenCLDevice; -int mnOpenCLMinimumFormulaGroupSize; -std::setOpCodeEnum maOpenCLSubsetFunctions; +sal_Int32 mnOpenCLMinimumFormulaGroupSize; +std::setOpCodeEnum maOpenCLSubsetOpCodes; ScCalcConfig(); +void setOpenCLConfigToDefault(); + void reset(); void MergeDocumentSpecific( const ScCalcConfig r ); @@ -61,6 +63,12 @@ struct SC_DLLPUBLIC ScCalcConfig bool operator!= (const ScCalcConfig r) const; }; +std::ostream SC_DLLPUBLIC operator(std::ostream rStream, const ScCalcConfig rConfig); + +OUString SC_DLLPUBLIC ScOpCodeSetToNumberString(const std::setOpCodeEnum rOpCodes); +OUString SC_DLLPUBLIC ScOpCodeSetToSymbolicString(const std::setOpCodeEnum rOpCodes); +std::setOpCodeEnum SC_DLLPUBLIC ScStringToOpCodeSet(const OUString rOpCodes); + #endif /* vim:set shiftwidth=4 softtabstop=4
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo85812.rtf |8
sw/qa/extras/rtfimport/rtfimport.cxx | 10 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 ++
3 files changed, 20 insertions(+)
New commits:
commit 88d3f9e4cf64e4ef037063b26ddf347fd42d8d84
Author: Michael Stahl mst...@redhat.com
Date: Tue Nov 4 22:45:48 2014 +0100
fdo#85812: RTF import: fix run type in new groups
Apparently the run type resets to LTR in a new group.
(regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662)
Change-Id: I61c0fcbe4e44b488a14cc78823063a1a1ad4f4b1
diff --git a/sw/qa/extras/rtfimport/data/fdo85812.rtf
b/sw/qa/extras/rtfimport/data/fdo85812.rtf
new file mode 100644
index 000..2f3e10c
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo85812.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi\deflang1049\deflangfe2052
+{\*\generator Microsoft Word 11.0.5604;}
+
+\pard\plain
+\lang1049\langfe2052\loch\hich\dbch\langnp1049\langfenp2052
+{\lang1033\langfe2052\dbch\langnp1033 \hich\dbch\loch This }
+{\lang1036\langfe2052\langnp1036 \par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 6639948..a4dd898 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -474,6 +474,16 @@ DECLARE_RTFIMPORT_TEST(testFdo48037, fdo48037.rtf)
CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
}
+DECLARE_RTFIMPORT_TEST(testFdo85812, fdo85812.rtf)
+{
+lang::Locale locale(getPropertylang::Locale(
+getRun(getParagraph(1), 1, This ), CharLocale));
+// the \lang inside the group was applied to CJK not Western
+CPPUNIT_ASSERT_EQUAL(OUString(en), locale.Language);
+CPPUNIT_ASSERT_EQUAL(OUString(US), locale.Country);
+
+}
+
DECLARE_RTFIMPORT_TEST(testFdo47764, fdo47764.rtf)
{
// \cbpat with zero argument should mean the auto (-1) color, not a
default color (black)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 53460e5..99693f3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4828,6 +4828,8 @@ int RTFDocumentImpl::pushState()
m_aStates.push(m_aStates.top());
}
m_aStates.top().aDestinationText.setLength(0); // was copied: always reset!
+m_aStates.top().isRightToLeft = false; // fdo#85812 group resets run type
+m_aStates.top().eRunType = RTFParserState::LOCH;
m_pTokenizer-pushGroup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/lo-all-static-libs
bin/lo-all-static-libs |1 + 1 file changed, 1 insertion(+) New commits: commit b7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 Author: Tor Lillqvist t...@collabora.com Date: Wed Nov 5 01:20:38 2014 +0200 liblibotouch.a and liblo-bootstrap.a now end up in workdir/LinkTarget/Library Not sure exactly why, but anyway, look for *.a there, too, then. Change-Id: Id85f4f7d5ffe47c636ac860131a2dfb10cdfdff8 diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 11c66d4..bbe950c 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -64,6 +64,7 @@ esac echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $foolibs \ $WORKDIR/LinkTarget/StaticLibrary/lib*.a \ + $WORKDIR/LinkTarget/Library/lib*.a \ $oslibs \ $nsslibs \ $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 55786] FILEOPEN: read error for unsupported Lotus123 .wk3, .wk4
https://bugs.freedesktop.org/show_bug.cgi?id=55786 Thomas Kluyver tho...@kluyver.me.uk changed: What|Removed |Added CC||tho...@kluyver.me.uk --- Comment #13 from Thomas Kluyver tho...@kluyver.me.uk --- I had to spend a while digging into an old WK4 file to extract some data. I thought I'd document my main finding here: opcode 0x17 appears to be a 10-byte extended precision float. After the record header, there is a two byte row number, one byte sheet number, and one byte column number. These are common to a few record types. The remainder of it is the value, in the format described here: http://en.wikipedia.org/wiki/Extended_precision#x86_Extended_Precision_Format I was able to extract these, at least for the small positive numbers in my sample, using the following Python code: a = int.from_bytes(r.data[-2:], 'little') sign = -1 if (a (115)) else 1 e = a - (a (1 15)) - 16383 m = int.from_bytes(r.data[4:-2], 'little') val = m / (1(63-e)) 0x16 is a label, with the same row/sheet/column fields. I started looking into making a patch, but I got confused because there appear to be opcode lookup tables both in optab.cxx and as switch statements in lotread.cxx, with different opcodes in them. -- 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
143 Potential Easy Hacks (kind of ;) )
Hi All, Just wanted to point out that we have a growing list of the equivalent of proposedEasyHack (remember we took this away per Markus' suggestion). My first is since we left that naming scheme the list is no longer looked at--perhaps this is wrong. So as a reminder - whiteboard status needsDevEval is proposedEasyHack. Link below - removing them from the list or moving them to easyHack greatly appreciated. https://bugs.freedesktop.org/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDlist_id=489401query_format=advancedstatus_whiteboard=needsDevEvalstatus_whiteboard_type=allwordssubstr Thanks! Best, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-11-05
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ TANGO: Adding insert index and symbol icons and fixing others
in https://gerrit.libreoffice.org/12259 from Yousuf Philips
about module icon-themes
+ Correct number format mapping for CJK numbered lists in rtf/doc/docx filt
in https://gerrit.libreoffice.org/12252 from Mark Hung
about module sw, writerfilter
+ Fix fdo#84573 - COLOR PICKER: Keyboard keys not functional when
in https://gerrit.libreoffice.org/12253 from juegen funk
about module svx
+ fdo#79761: parse BlockList.xml only once
in https://gerrit.libreoffice.org/12210 from Daniel Sikeler
about module editeng, include, sw
+ fdo#85809 - MENU: Rearranging the Insert Media submenu
in https://gerrit.libreoffice.org/12226 from Yousuf Philips
about module sc, sd, sw
+ Fraction: rewrite condition 'GetDenominator()==-1'
in https://gerrit.libreoffice.org/12240 from Juan Picca
about module vcl
End of freshness
+ HIG fixes for svx
in https://gerrit.libreoffice.org/12260 from Adolfo Jayme Barrientos
about module svx
+ fdo#39468 Translate German Comments - replace '//!' with '//FIXME:' - 1st
in https://gerrit.libreoffice.org/12241 from Christian M. Heller
about module sc
+ fdo#84938: replace TOOLBOXITEM_ constants with enum
in https://gerrit.libreoffice.org/12258 from Noel Grandin
about module accessibility, forms, framework, include, rsc, sfx2, vcl
+ fdo#50950 make Calc functions (ISO)WEEKNUM comply with ODFF1.2
in https://gerrit.libreoffice.org/12089 from Winfried Donkers
about module formula, include, sc, scaddins
+ Add build support for iwyu
in https://gerrit.libreoffice.org/12255 from Riccardo Magliocchetti
about module build
+ calc performance test
in https://gerrit.libreoffice.org/12218 from Laurent Godard
about module include, sc, test
+ Bump cairo version to 1.2.0
in https://gerrit.libreoffice.org/12250 from Riccardo Magliocchetti
about module build, canvas
+ perfcheck instrument existing test : replaceAll
in https://gerrit.libreoffice.org/12243 from Laurent Godard
about module sc, test
+ fdo#38835 strip out OUString globals
in https://gerrit.libreoffice.org/12214 from Noel Grandin
about module accessibility, avmedia, basctl, basic, chart2, comphelper,
connectivity, cui, dbaccess, desktop, drawinglayer, extensions, filter, forms,
fpicker, framework, idlc, jvmfwk, linguistic, mysqlc, oox, reportdesign, sax,
sc, scaddins, scripting, sd, sdext, sfx2, svgio, svl, svtools, svx, sw,
toolkit, unotools, unoxml, vbahelper, vcl, writerfilter, xmlhelp, xmloff,
xmlscript
* Merged changes on master for project core changed in the last 25 hours:
+ remotecontrol: required version for MacOSX is 10.8
in https://gerrit.libreoffice.org/12245 from Riccardo Magliocchetti
+ Required MacOSX version is 10.8
in https://gerrit.libreoffice.org/12244 from Riccardo Magliocchetti
+ fdo#80161 Add an icon to the 'Export as PDF' command
in https://gerrit.libreoffice.org/12228 from Yousuf Philips
+ vcl: gtk 2.4 is checked at configure time
in https://gerrit.libreoffice.org/12251 from Riccardo Magliocchetti
+ Kill directx 9 ifdefery
in https://gerrit.libreoffice.org/12246 from Riccardo Magliocchetti
+ fdo#85820 Have menu item for insert table and it called 'Insert Table'
in https://gerrit.libreoffice.org/12249 from Yousuf Philips
+ calc ScTable::ReplaceAll : avoid calling GetLastDataPos uselessly
in https://gerrit.libreoffice.org/12248 from Laurent Godard
+ calc ScTable::SearchAll : avoid calling GetLastDataPos uselessly
in https://gerrit.libreoffice.org/12225 from Laurent Godard
+ fdo#39468 Translate German Comments - sc/source/core/data/documen{4,5}.cx
in https://gerrit.libreoffice.org/12237 from Christian M. Heller
+ SdrFormatter: remove unused attribute
in https://gerrit.libreoffice.org/12227 from Juan Picca
+ fdo#67585 - fix missing flip icons in Calc menu
in https://gerrit.libreoffice.org/12229 from Yousuf Philips
+ fdo#80918 - 'Find' should be 'Find Next' in the 'Find Replace' dialog
in https://gerrit.libreoffice.org/12230 from Yousuf Philips
+ fdo#80716 - Adding an icon to the Tools Options menu entry
in https://gerrit.libreoffice.org/12232 from Yousuf Philips
+ fdo#75256 Improve Sifr Icontheme
in https://gerrit.libreoffice.org/12235 from Matthias Freund
+ fdo#75256 Improve Sifr Iconset
in https://gerrit.libreoffice.org/12233 from Matthias Freund
+ fdo#75256 Improve Sifr Icon Theme
in https://gerrit.libreoffice.org/12231 from Matthias Freund
+ Math: Add new colors in the Sidebar
in https://gerrit.libreoffice.org/12239 from Marcos Paulo de Souza
* Abandoned changes on master for project core changed in the last 25 hours:
+ calc ScTable::ReplaceAll : avoid calling GetLastDataPos uselessly
in https://gerrit.libreoffice.org/12256 from Laurent Godard
* Open changes needing tweaks, but being untouched for more than a week:
+
[Libreoffice-commits] core.git: accessibility/source forms/source framework/source include/rsc rsc/inc rsc/source sfx2/source vcl/source
accessibility/source/standard/vclxaccessibletoolboxitem.cxx |8 +-
forms/source/solar/control/navtoolbar.cxx |2
framework/source/uielement/addonstoolbarmanager.cxx |4 -
framework/source/uielement/toolbarmanager.cxx |2
include/rsc/rsc-vcl-shared-types.hxx|4 -
rsc/inc/rscdb.hxx |2
rsc/source/parser/rscicpx.cxx |8 +-
sfx2/source/toolbox/imgmgr.cxx |2
vcl/source/window/toolbox.cxx | 42 ++--
vcl/source/window/toolbox2.cxx | 30
10 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 3c58f0768049718fae3d47d5ebfa6c7485ad52b1
Author: Noel Grandin n...@peralex.com
Date: Tue Nov 4 21:10:34 2014 +0200
fdo#84938: replace TOOLBOXITEM_ constants with enum
Change-Id: I08c4a456f9e80f70719ca8c3ad5c0f0d2d8282f6
Reviewed-on: https://gerrit.libreoffice.org/12258
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 7906f64..b3143a3 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -80,7 +80,7 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
ToolBoxItemType eType = m_pToolBox-GetItemType(
(sal_uInt16)m_nIndexInParent );
switch ( eType )
{
-case TOOLBOXITEM_BUTTON :
+case ToolBoxItemType::BUTTON :
{
ToolBoxItemBits nBits = m_pToolBox-GetItemBits( m_nItemId );
if (
@@ -99,12 +99,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem(
ToolBox* _pToolBox, sal_In
break;
}
-case TOOLBOXITEM_SPACE :
+case ToolBoxItemType::SPACE :
m_nRole = AccessibleRole::FILLER;
break;
-case TOOLBOXITEM_SEPARATOR :
-case TOOLBOXITEM_BREAK :
+case ToolBoxItemType::SEPARATOR :
+case ToolBoxItemType::BREAK :
m_nRole = AccessibleRole::SEPARATOR;
break;
diff --git a/forms/source/solar/control/navtoolbar.cxx
b/forms/source/solar/control/navtoolbar.cxx
index 7e78b7f..587192b 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -357,7 +357,7 @@ namespace frm
for ( sal_uInt16 i=0; inItemCount; ++i )
{
sal_uInt16 nId = m_pToolbar-GetItemId( i );
-if ( ( TOOLBOXITEM_BUTTON == m_pToolbar-GetItemType( i ) )
!isArtificialItem( nId ) )
+if ( ( ToolBoxItemType::BUTTON == m_pToolbar-GetItemType( i ) )
!isArtificialItem( nId ) )
aFormFeatures.push_back( nId );
}
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx
b/framework/source/uielement/addonstoolbarmanager.cxx
index 35abdca..467976d 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -242,7 +242,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence
Sequence PropertyValue
if ( aURL == TOOLBOXITEM_SEPARATOR_STR )
{
sal_uInt16 nCount = m_pToolBar-GetItemCount();
-if ( nCount 0 ( m_pToolBar-GetItemType( nCount-1 ) !=
TOOLBOXITEM_SEPARATOR ) nElements 0 )
+if ( nCount 0 ( m_pToolBar-GetItemType( nCount-1 ) !=
ToolBoxItemType::SEPARATOR ) nElements 0 )
{
nElements = 0;
m_pToolBar-InsertSeparator();
@@ -251,7 +251,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence
Sequence PropertyValue
else
{
sal_uInt16 nCount = m_pToolBar-GetItemCount();
-if ( bAppendSeparator nCount 0 (
m_pToolBar-GetItemType( nCount-1 ) != TOOLBOXITEM_SEPARATOR ))
+if ( bAppendSeparator nCount 0 (
m_pToolBar-GetItemType( nCount-1 ) != ToolBoxItemType::SEPARATOR ))
{
// We have to append a separator first if the last item is
not a separator
m_pToolBar-InsertSeparator();
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index c211604..01541fc 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1719,7 +1719,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
for ( nPos = 0; nPos m_pToolBar-GetItemCount(); ++nPos )
{
-if ( m_pToolBar-GetItemType(nPos) == TOOLBOXITEM_BUTTON )
+if ( m_pToolBar-GetItemType(nPos) ==
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #14 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=705c48d32eec0aa5180e60ca157daca4b154e4a3 fdo#38835 strip out OUString globals 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
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.4.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 84938] replace #defined constants with ‘enum class’
https://bugs.freedesktop.org/show_bug.cgi?id=84938 --- Comment #3 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3c58f0768049718fae3d47d5ebfa6c7485ad52b1 fdo#84938: replace TOOLBOXITEM_ constants with enum 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
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Hi Joel, Joel Madero wrote on 04-11-14 04:47: So I just booted about 50 bugs over to UNCONFIRMED so that list has jumped. I'm going through the rest of the list of about 280 more bugs - Sorry that I'm not fully aware of what's going on here, but I'm rather annoyed by the fact that bugs that I have spend precious time on in the past, to test and confirm, now are reset to unconfirmed... e.g. 35275, 35917, 35954, 83373. If the goal is that the issues are retested for some reason, then pls indicate that. Or do it yourself. Thanks! -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: * Seattle Hackfest (Robinson/Norbert) ... + badly need ways to stop 'building' consuming the hack-fest (Michael) + or a way to keep hand-holding after the hack-fest (Bjoern) ... + vast majority of people wanted access to VM + monster communication problem with cloph ... + Robinson was briefed on how to do that (cloph) + Info emailed to hackfest devs (Robinson) - communication droppeded - Incidentally it was just pointed out to me that monster communication problem with cloph could read as some hyper-criticism of him =) that's by no means the case - as (I hope) the context points out as we started to dig deeper there were probably several failures of communication / preparedness on the topic somewhere in the gap between cloph - Robinson - other mentors - hack-fest attendees. My minuting, never perfect was much less than ideal here; sorry for that. We love you cloph ! =) ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Yes because they were set to REOPENED incorrectly. REOPENED has a specific definition and they were incorrectly there. Furthermore, some of those bugs were self confirmed which we recommend against. That being said, if a bug is confirmed and I set it to UNCONFIRMED just set it to NEW and move onthere were 350+ bugs incorrectly set...you'll see more moving to UNCONFIRMED if they were set incorrectly to begin with. Also the comments that you points out didn't clearly confirm the bugs that I asked. Anyways, expect more. Best, Joel On 11/04/2014 01:13 AM, Cor Nouws wrote: Hi Joel, Joel Madero wrote on 04-11-14 04:47: So I just booted about 50 bugs over to UNCONFIRMED so that list has jumped. I'm going through the rest of the list of about 280 more bugs - Sorry that I'm not fully aware of what's going on here, but I'm rather annoyed by the fact that bugs that I have spend precious time on in the past, to test and confirm, now are reset to unconfirmed... e.g. 35275, 35917, 35954, 83373. If the goal is that the issues are retested for some reason, then pls indicate that. Or do it yourself. Thanks! ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] retest ping to UNCONFIRMED bugs older than 6 months
For now I'm not doing this just because there are so many other things to do and as of now I'm not seeing a clear message as to what we're doingI've seen at least 3-4 proposals with different links and the like. I suggest this be resolved on QA call, finalized, maybe a wiki written as to what the plan is, then we can move forward. Best, Joel On 11/03/2014 09:06 PM, Tommy wrote: On Sun, 02 Nov 2014 06:49:35 +0100, Tommy ba...@quipo.it wrote: once 4.2.7 and 4.3.3 are now available, I think we could run the please retest automated message to UNCONFIRMED bugs older than 6 months. actually there's 94 out of them. see list: http://snipurl.com/29eckcc let's see what's the feedback ratio and then decide if doing the same on older NEW bugs (excluding easy hacks as already discussed in the mailing list( or maybe we could ping older than 100 days bug from this list (193 bugs): http://snipurl.com/29ejxgd ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
@ Cor - if you'd like you can take a look yourself and move them to NEW if you believe they should be there, here are the bugs in REOPENED status that you are a commenter on: https://bugs.freedesktop.org/buglist.cgi?bug_status=REOPENEDemail1=cno%40nouenoff.nlemaillongdesc1=1emailtype1=substringlist_id=489142product=LibreOfficequery_format=advanced Note that REOPENED should only be used if (1) the bug is assigned to a developer; (2) the bug was previously marked fixed by assigned developer; (3) you can reproduce the same issue on a later version after the assigned developer reported as FIXED. Any bug that doesn't meet the above criteria should be set to NEW (if confirmed of course, hopefully by a third party independent person...), or UNCONFIRMED (if not confirmed) Best, Joel On 11/04/2014 07:15 AM, Joel Madero wrote: Yes because they were set to REOPENED incorrectly. REOPENED has a specific definition and they were incorrectly there. Furthermore, some of those bugs were self confirmed which we recommend against. That being said, if a bug is confirmed and I set it to UNCONFIRMED just set it to NEW and move onthere were 350+ bugs incorrectly set...you'll see more moving to UNCONFIRMED if they were set incorrectly to begin with. Also the comments that you points out didn't clearly confirm the bugs that I asked. Anyways, expect more. Best, Joel On 11/04/2014 01:13 AM, Cor Nouws wrote: Hi Joel, Joel Madero wrote on 04-11-14 04:47: So I just booted about 50 bugs over to UNCONFIRMED so that list has jumped. I'm going through the rest of the list of about 280 more bugs - Sorry that I'm not fully aware of what's going on here, but I'm rather annoyed by the fact that bugs that I have spend precious time on in the past, to test and confirm, now are reset to unconfirmed... e.g. 35275, 35917, 35954, 83373. If the goal is that the issues are retested for some reason, then pls indicate that. Or do it yourself. Thanks! ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Hi Joel, Furthermore, some of those bugs were self confirmed which we recommend against. That being said, if a bug is confirmed and I set it to UNCONFIRMED just set it to NEW and move onthere were 350+ bugs incorrectly set...you'll see more moving to UNCONFIRMED if they were set incorrectly to begin with. Sometimes I reported bugs and the bugs where set to New directly by the system, not by me. Don't know why the system decided the bug is confirmed and new ... Regards Robert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Hey Robert, Hi Joel, Furthermore, some of those bugs were self confirmed which we recommend against. That being said, if a bug is confirmed and I set it to UNCONFIRMED just set it to NEW and move onthere were 350+ bugs incorrectly set...you'll see more moving to UNCONFIRMED if they were set incorrectly to begin with. Sometimes I reported bugs and the bugs where set to New directly by the system, not by me. Don't know why the system decided the bug is confirmed and new ... Yeah there are some fun hiccups in bugzilla ;) But all in all: New = Confirmed; Unconfirmed = not confirmed; Reopened = bug is assigned to a developer who claimed they fixed it but the issue can still be reproduced on a later version of LibreOffice. Sometimes you have to put a bug into NEEDINFO and then move it to another status (for instance you can't go directly from REOPENED to UNCONFIRMED - which is kind of crappy ;) ) Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
On 11/04/2014 07:58 AM, Cor Nouws wrote: Joel Madero wrote on 04-11-14 16:34: @ Cor - if you'd like you can take a look yourself and move them to NEW Thanks for explaining Joel. By how did they end in the wrong REOPENED state in the first place? I have been looking at the history to see if the bug was ever marked as NEW - I touched about 55 bugs yesterday and some moved directly to NEW. As to how they got to REOPENED status - who knows, sometimes a user incorrectly set it after a bug was set to NEEDINFO, sometimes a QA member incorrectly set it, etc . . . it's hard to say that there is consistency. So I suppose I'll apologize if I move any of yours to UNCONFIRMED - there are only 27 more that you are cc'ed on and I'll try to be extra careful with these - but currently the REOPENED status are completely ignored by QA because they are not consistent. Management of these bugs (ie. moving them correctly to the right status, or at least an effort to do so) is better than continuing to ignore them. Best, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Joel Madero wrote on 04-11-14 17:06: On 11/04/2014 07:58 AM, Cor Nouws wrote: Joel Madero wrote on 04-11-14 16:34: @ Cor - if you'd like you can take a look yourself and move them to NEW Thanks for explaining Joel. By how did they end in the wrong REOPENED state in the first place? I have been looking at the history to see if the bug was ever marked as NEW - I touched about 55 bugs yesterday and some moved directly to NEW. As to how they got to REOPENED status - who knows, sometimes a user incorrectly set it after a bug was set to NEEDINFO, sometimes a QA member incorrectly set it, etc . . . it's hard to say that there is consistency. Trying to get consistency is good. But I'm quite confident that it's hard too with may different /new volunteers. And people - like me - not looking too much at documentation, for some reason.. So I suppose I'll apologize if I move any of yours to UNCONFIRMED - there are only 27 more that you are cc'ed on and I'll try to be extra careful with these - but currently the REOPENED status are completely ignored by QA because they are not consistent. Management of these bugs (ie. moving them correctly to the right status, or at least an effort to do so) is better than continuing to ignore them. Hè hè ;) As written, I'll try half an hour this evening to look at some of the 27. Thanks for your work and patience here. Cor -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Tue, Nov 4, 2014 at 6:29 AM, Kohei Yoshida kohei.yosh...@collabora.com wrote: And also, my comment was never meant as a criticism of someone not doing the job. It was rather a simple piece of feedback that I hoped would be useful for future hackfest planning. So, let's not take this as a failure please. We had a successful hackfest, and everybody chipped in what they could. No need to paint this negatively. I would like to add, in a more general sens: the point of these ESC call is, in big part, to discuss and review 'pain points', thinks that are causing trouble, hindering work, etc... and to try to find practical and actionable solutions to re-mediate, improve things... it is never to 'assign blame'. So, to all readers of the minutes out there, always assume the former not the later :-) Norbert. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Robert Großkopf wrote on 04-11-14 16:34: Sometimes I reported bugs and the bugs where set to New directly by the system, not by me. Don't know why the system decided the bug is confirmed and new ... I think that depends on how you start. When you start from https://bugs.freedesktop.org/query.cgi and select new at the top and then Libreoffice, it will be UNCONFIRMED When you start from the link File a new bug in the LibreOffice product that sets it to NEW. Anyway, that's what I think ;) -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Cor Nouws wrote on 04-11-14 17:18: Robert Großkopf wrote on 04-11-14 16:34: Sometimes I reported bugs and the bugs where set to New directly by the system, not by me. Don't know why the system decided the bug is confirmed and new ... I think that depends on how you start. When you start from https://bugs.freedesktop.org/query.cgi and select new at the top and then Libreoffice, it will be UNCONFIRMED When you start from the link File a new bug in the LibreOffice product available after running a query... product that sets it to NEW. Anyway, that's what I think ;) -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
On 11/04/2014 08:13 AM, Cor Nouws wrote: Joel Madero wrote on 04-11-14 17:06: On 11/04/2014 07:58 AM, Cor Nouws wrote: Joel Madero wrote on 04-11-14 16:34: @ Cor - if you'd like you can take a look yourself and move them to NEW Thanks for explaining Joel. By how did they end in the wrong REOPENED state in the first place? I have been looking at the history to see if the bug was ever marked as NEW - I touched about 55 bugs yesterday and some moved directly to NEW. As to how they got to REOPENED status - who knows, sometimes a user incorrectly set it after a bug was set to NEEDINFO, sometimes a QA member incorrectly set it, etc . . . it's hard to say that there is consistency. Trying to get consistency is good. But I'm quite confident that it's hard too with may different /new volunteers. And people - like me - not looking too much at documentation, for some reason.. Indeed it's hard but to me that doesn't mean ignore the problem. REOPENED bugs are literally ignored by everyone - devs don't touch them, QA don't touch them, they just sit forever. 275 isn't too bad for me to handle alone and get them either into NEW or to UNCONFIRMED. After this point, we can keep track of them better and keep them under control by spreading out the work amongst all the volunteers. Not paying attention to documentation shouldn't prevent us from at least trying to do it right ;) Warm Regards, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Unconfirmed jump - sorry!
Hi Cor, Robert Großkopf wrote on 04-11-14 16:34: Sometimes I reported bugs and the bugs where set to New directly by the system, not by me. Don't know why the system decided the bug is confirmed and new ... I think that depends on how you start. When you start from https://bugs.freedesktop.org/query.cgi and select new at the top and then Libreoffice, it will be UNCONFIRMED When you start from the link File a new bug in the LibreOffice product available after running a query... That's it. Most times I run a query for see all open bugs of Base - then I start from the query with File new ... Robert ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: + would be nice to have some blog-posts / picture posts (Bjoern) I just finished mine. http://kohei.us/2014/11/03/seattle-librefest/ Kohei ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ... - correction ...
On Tue, 2014-11-04 at 11:38 +, Michael Meeks wrote: On Thu, 2014-10-30 at 16:39 +, Michael Meeks wrote: * Seattle Hackfest (Robinson/Norbert) ... + badly need ways to stop 'building' consuming the hack-fest (Michael) + or a way to keep hand-holding after the hack-fest (Bjoern) ... + vast majority of people wanted access to VM + monster communication problem with cloph ... + Robinson was briefed on how to do that (cloph) + Info emailed to hackfest devs (Robinson) - communication droppeded - Incidentally it was just pointed out to me that monster communication problem with cloph could read as some hyper-criticism of him =) that's by no means the case - as (I hope) the context points out as we started to dig deeper there were probably several failures of communication / preparedness on the topic somewhere in the gap between cloph - Robinson - other mentors - hack-fest attendees. And also, my comment was never meant as a criticism of someone not doing the job. It was rather a simple piece of feedback that I hoped would be useful for future hackfest planning. So, let's not take this as a failure please. We had a successful hackfest, and everybody chipped in what they could. No need to paint this negatively. Kohei ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] retest ping to UNCONFIRMED bugs older than 6 months
On Tue, 04 Nov 2014 16:24:44 +0100, Joel Madero jmadero@gmail.com wrote: For now I'm not doing this just because there are so many other things to do and as of now I'm not seeing a clear message as to what we're doingI've seen at least 3-4 proposals with different links and the like. I suggest this be resolved on QA call, finalized, maybe a wiki written as to what the plan is, then we can move forward. I agree with you. QA call must decide that. regarding the multiple links you saw they are only because of different periods of time selected (1 year, 6 months, 100 days etc etc)... again the correct timeframe we want to ping has to be decided with the QA team. moreover we have to decide if pinging just UNCONFIRMED old bugs or even NEW bugs (excluding the easy hacks). in recent weeks I've seen many of UNCONF and NEW old bugs turning into WFM after retest with recent LibO releases (by me or other QA guys like beluga and Stuart Foote) --- Questa e-mail è priva di virus e malware perché è attiva la protezione avast! Antivirus. http://www.avast.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 84051] Distribute on multiple sheets of paper does not work any more in 4.3.2.1
https://bugs.freedesktop.org/show_bug.cgi?id=84051 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=63905 --- Comment #7 from Kevin Suo suokunl...@gmail.com --- Commit a7eed1e17cfb101210db8aa839171f00d0730582 is the most suspicious. authorEilidh McAdam eil...@lanedo.com2014-06-23 19:55:21 (GMT) committerMatúš Kukan matus.ku...@collabora.com2014-08-20 06:40:03 (GMT) commita7eed1e17cfb101210db8aa839171f00d0730582 (patch) Make Draw use paper size when printing - fdo#63905 Previously, Draw/Impress use the default size from the printer. Now Draw uses the paper size (specified in page formatting). Impress still uses the old method - not sure if this is correct but printing handouts etc probably complicate print/paper size. That commit fixed Bug 63905 - FORMATTING: Page format in draw is not sent to the printer. (In Draw, there is a feature to Distribute on multiple sheets of paper when printing. But the fix to bug 63905 makes this useful feature broken). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63905] FORMATTING: Page format in draw is not sent to the printer
https://bugs.freedesktop.org/show_bug.cgi?id=63905 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84051 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80607] Generic file picker has redrawing issue when maximized (KDE4)
https://bugs.freedesktop.org/show_bug.cgi?id=80607 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||momonas...@gmail.com Component|Libreoffice |graphics stack Summary|Open close dialog does not |Generic file picker has |redraw |redrawing issue when ||maximized (KDE4) Ever confirmed|0 |1 --- Comment #2 from Maxim Monastirsky momonas...@gmail.com --- Confirmed with 4.2.7 under Fedora 20. On the same system master (abc22a091c27b92c5b20964375098faa11d3546e) also has a redrawing issue, but less severe. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63905] FORMATTING: Page format in draw is not sent to the printer
https://bugs.freedesktop.org/show_bug.cgi?id=63905 Kevin Suo suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com --- Comment #14 from Kevin Suo suokunl...@gmail.com --- Hi, the fix to this bug caused a new regression, it makes the feature Distribute on multiple sheets of paper broken in draw. See bug 84051. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85838] New: [EDITING] Add text with the cursor in Find bar when that is started with Ctrl+F
https://bugs.freedesktop.org/show_bug.cgi?id=85838 Bug ID: 85838 Summary: [EDITING] Add text with the cursor in Find bar when that is started with Ctrl+F Product: LibreOffice Version: unspecified Hardware: Other OS: All Status: NEW Severity: enhancement Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: c...@nouenoff.nl In the Basic IDE, when the cursor is on foo and you hit Ctrl+H, the FR dialog opens with foo in the field find. It would be great if the same happens when you hit Ctrl+F :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82746] EDITING: In-place editing of input fields - don't work Backspace
https://bugs.freedesktop.org/show_bug.cgi?id=82746 --- Comment #8 from tobia tobia.confo...@gruppo4.it --- I'm not sure we're talking about the same bug. The original bug reported the backspace key being blocked inside input fields, in a regular, non-protected section. Delete key works ok. I confirmed this bug on OS X in all 4.3.x versions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85825] TOOLBAR: Renaming 'Align Center Horizontally'
https://bugs.freedesktop.org/show_bug.cgi?id=85825 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added CC||momonas...@gmail.com --- Comment #1 from Maxim Monastirsky momonas...@gmail.com --- IMHO it's important to keep to word Horizontally, to indicate that it centers only horizontally. You can see what I mean, when a cell is higher that the text height. And there is similar (hidden) button Align Center Vertically, which does only vertial alignment. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
