[Libreoffice-commits] core.git: editeng/source lotuswordpro/source sc/source sw/source
editeng/source/items/xmlcnitm.cxx|2 +-
lotuswordpro/source/filter/lwppara1.cxx |2 +-
sc/source/core/data/markdata.cxx |2 +-
sc/source/filter/excel/xiescher.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit cbf9b547b685ef0dd3cdf143987176b01c007d56
Author: Noel Grandin
Date: Thu Aug 4 10:07:15 2016 +0200
use std::move in a few places
found by
git grep -n '.reset.*.release'
Change-Id: I498709bd32b21d9dbbaa73603ce21d21c274f8dc
Reviewed-on: https://gerrit.libreoffice.org/27863
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/items/xmlcnitm.cxx
b/editeng/source/items/xmlcnitm.cxx
index 96cbd49..07883f6 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -141,7 +141,7 @@ bool SvXMLAttrContainerItem::PutValue( const css::uno::Any&
rVal, sal_uInt8 /*nM
}
if( nAttr == nCount )
-pImpl.reset( pNewImpl.release() );
+pImpl = std::move(pNewImpl);
else
return false;
}
diff --git a/lotuswordpro/source/filter/lwppara1.cxx
b/lotuswordpro/source/filter/lwppara1.cxx
index 7499af4..58436d09 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -542,7 +542,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty* pProps)
pOver->OverrideLevel(m_nLevel);
}
-m_pParaNumbering.reset(pOver.release());
+m_pParaNumbering = std::move(pOver);
}
void LwpPara::FindLayouts()
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 9cb5329..39a5728 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -721,7 +721,7 @@ void ScMarkData::GetSelectionCover( ScRange& rRange )
if ( bCurColUnMarked )
pPrevColMarkedRows.reset( nullptr );
else
-pPrevColMarkedRows.reset( pCurColMarkedRows.release() );
+pPrevColMarkedRows = std::move( pCurColMarkedRows );
}
for( auto& rKV : aRowToColSegmentsInTopEnvelope )
{
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 30ccf35..e22d69a 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3546,7 +3546,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream&
rDffStrm, DffObjData& rDffO
// try to create a custom SdrObject that overwrites the passed object
SdrObjectPtr xNewSdrObj( xDrawObj->CreateSdrObject( *this, rAnchorRect,
true ) );
if( xNewSdrObj )
-xSdrObj.reset( xNewSdrObj.release() );
+xSdrObj = std::move( xNewSdrObj );
// process the SdrObject
if( xSdrObj )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e77e164..b489623 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4894,7 +4894,7 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
}
m_bStartedParaSdt = bStartedParaSdt;
-m_pPostponedOLEs.reset(pPostponedOLEs.release());
+m_pPostponedOLEs = std::move(pPostponedOLEs);
}
void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const
Point& rNdTopLeft )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source chart2/source
canvas/source/cairo/cairo_canvas.hxx |2 +- canvas/source/cairo/cairo_canvasbitmap.hxx |2 +- canvas/source/cairo/cairo_canvascustomsprite.cxx |2 +- canvas/source/cairo/cairo_canvascustomsprite.hxx |2 +- canvas/source/cairo/cairo_canvashelper.cxx |4 ++-- canvas/source/cairo/cairo_devicehelper.hxx |2 +- canvas/source/cairo/cairo_spritecanvas.hxx |2 +- canvas/source/cairo/cairo_spritedevicehelper.hxx |2 +- canvas/source/cairo/cairo_surfaceprovider.hxx |2 +- canvas/source/opengl/ogl_spritedevicehelper.cxx|4 ++-- chart2/source/controller/dialogs/ChartTypeDialogController.hxx |4 ++-- chart2/source/controller/dialogs/DataBrowser.cxx |2 +- chart2/source/controller/dialogs/tp_Scale.hxx |2 +- chart2/source/controller/inc/ChartController.hxx |2 +- chart2/source/controller/main/CommandDispatch.hxx |3 +-- chart2/source/controller/main/FeatureCommandDispatchBase.hxx |2 +- chart2/source/controller/sidebar/ChartElementsPanel.cxx|2 +- chart2/source/inc/AxisHelper.hxx |4 ++-- chart2/source/inc/CommonConverters.hxx |2 +- chart2/source/inc/DataSeriesHelper.hxx |2 +- chart2/source/inc/DiagramHelper.hxx|5 ++--- chart2/source/inc/RegressionCurveCalculator.hxx|2 +- chart2/source/inc/RegressionCurveHelper.hxx|2 +- chart2/source/inc/TitleHelper.hxx |2 +- chart2/source/tools/RangeHighlighter.cxx |5 +++-- chart2/source/view/axes/Tickmarks_Equidistant.cxx |2 +- chart2/source/view/axes/Tickmarks_Equidistant.hxx |2 +- chart2/source/view/charttypes/AreaChart.cxx|2 +- chart2/source/view/charttypes/AreaChart.hxx|2 +- chart2/source/view/charttypes/GL3DBarChart.cxx |2 +- chart2/source/view/charttypes/NetChart.hxx |2 +- chart2/source/view/charttypes/PieChart.cxx |2 +- chart2/source/view/charttypes/VSeriesPlotter.cxx |2 +- chart2/source/view/inc/3DChartObjects.hxx |2 +- chart2/source/view/inc/AbstractShapeFactory.hxx| 10 +- chart2/source/view/inc/GL3DBarChart.hxx|2 +- chart2/source/view/inc/GL3DRenderer.hxx|2 +- chart2/source/view/inc/OpenglShapeFactory.hxx |8 chart2/source/view/inc/PolarLabelPositionHelper.hxx|4 ++-- chart2/source/view/inc/ShapeFactory.hxx|8 chart2/source/view/inc/VSeriesPlotter.hxx |8 chart2/source/view/main/DataPointSymbolSupplier.cxx|2 +- chart2/source/view/main/ShapeFactory.cxx |4 ++-- chart2/source/view/main/VLegendSymbolFactory.cxx |8 44 files changed, 69 insertions(+), 70 deletions(-) New commits: commit f22fa994603311a36f467a6afea19bc4fad03814 Author: Noel Grandin Date: Thu Aug 4 11:35:36 2016 +0200 loplugin:countusersofdefaultparams in canvas,chart2 Change-Id: Id66a706171b73affeb508812744028d9f30133af Reviewed-on: https://gerrit.libreoffice.org/27868 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index fe712e3..920b37a 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -133,7 +133,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; -virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override; +virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override; virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override; virtual ::cairo::SurfaceSharedPtr changeSurface() override; virtual OutputDevice* getOutputDevice() override; diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index e6c9f0c..d795418 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -93,7 +93,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; -virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aC
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - graphite/graphite-2.3.1.patch
graphite/graphite-2.3.1.patch | 12
1 file changed, 12 insertions(+)
New commits:
commit 5b6c4bddf6134f377a61446d8bcf1be2f096aad1
Author: Don Lewis
Date: Fri Aug 5 05:49:46 2016 +
Fix --enable-debug build with clang as the compiler.
Clang warns about this expression in graphite:
if (!m_srAttachTo == 0)
Operator precedence rules require this to be evaluated as:
if ((!m_srAttachTo) == 0)
but clang worries that the author might have intended this to mean:
if (!(m_srAttachTo == 0))
Fortunately these two are equivalent, as is:
if (m_srAttachTo != 0)
and the latter is much easier for humans to understand.
For some reason, --enable-debug adds -Werror to the graphite CFLAGS even
though its makefile.mk specifies:
EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch
index 85a8aa3..768c139 100644
--- a/graphite/graphite-2.3.1.patch
+++ b/graphite/graphite-2.3.1.patch
@@ -2452,3 +2452,15 @@
bool operator!=(const GlyphSetIterator & rhs) const throw() {
return !(*this == rhs); }
// Random access iterator requirements
+diff -ur misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h
misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h
+--- misc/silgraphite-2.3.1/engine/src/segment/GrSlotState.h2009-01-27
18:01:29.0 -0800
misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h
2016-08-02 17:22:26.300396000 -0700
+@@ -481,7 +481,7 @@
+ {
+ Assert(false); // Should have already been set in
HandleModifiedPosition,
+ // but just in case.
+- if (!m_srAttachTo == 0)
++ if (m_srAttachTo != 0)
+ return 0;
+ else
+ m_mAttachAtX = 0; // attach on the right
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/node.hxx| 16
starmath/source/node.cxx |6 +++---
starmath/source/visitors.cxx |6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ce97110f37825f9666bff8ff2df0d2092620ae17
Author: Takeshi Abe
Date: Thu Aug 4 18:22:51 2016 +0900
starmath: SmBinHorNode's symbol is not always an SmMathSymbolNode
E.g. it is an SmGlyphSpecialNode in the "boper" case.
Change-Id: I6311e0dca8e71c617d2c4c681b0b049217ec9867
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index c22e9a7..e0b2019 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -842,8 +842,8 @@ public:
virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override;
void Accept(SmVisitor* pVisitor) override;
-SmMathSymbolNode* Symbol();
-const SmMathSymbolNode* Symbol() const;
+SmNode* Symbol();
+const SmNode* Symbol() const;
SmNode* LeftOperand();
const SmNode* LeftOperand() const;
SmNode* RightOperand();
@@ -1293,18 +1293,18 @@ inline const SmNode* SmDynIntegralNode::Body() const
}
-inline SmMathSymbolNode* SmBinHorNode::Symbol()
+inline SmNode* SmBinHorNode::Symbol()
{
-OSL_ASSERT( GetNumSubNodes() > 1 && GetSubNode( 1 )->GetType() == NMATH );
-return static_cast< SmMathSymbolNode* >( GetSubNode( 1 ));
+assert( GetNumSubNodes() == 3 );
+return GetSubNode( 1 );
}
-inline const SmMathSymbolNode* SmBinHorNode::Symbol() const
+inline const SmNode* SmBinHorNode::Symbol() const
{
return const_cast< SmBinHorNode* >( this )->Symbol();
}
inline SmNode* SmBinHorNode::LeftOperand()
{
-OSL_ASSERT( GetNumSubNodes() > 0 );
+assert( GetNumSubNodes() == 3 );
return GetSubNode( 0 );
}
inline const SmNode* SmBinHorNode::LeftOperand() const
@@ -1313,7 +1313,7 @@ inline const SmNode* SmBinHorNode::LeftOperand() const
}
inline SmNode* SmBinHorNode::RightOperand()
{
-OSL_ASSERT( GetNumSubNodes() > 2 );
+assert( GetNumSubNodes() == 3 );
return GetSubNode( 2 );
}
inline const SmNode* SmBinHorNode::RightOperand() const
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index c1d53f1..5b45745 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -824,9 +824,9 @@ void SmDynIntegralNode::CreateTextFromNode(OUString &rText)
void SmBinHorNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
{
-SmNode *pLeft = GetSubNode(0),
- *pOper = GetSubNode(1),
- *pRight = GetSubNode(2);
+SmNode *pLeft = LeftOperand(),
+ *pOper = Symbol(),
+ *pRight = RightOperand();
assert(pLeft);
assert(pOper);
assert(pRight);
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 87d177b..cf3e92e 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -2185,9 +2185,9 @@ void SmNodeToTextVisitor::Visit( SmUnHorNode* pNode )
void SmNodeToTextVisitor::Visit( SmBinHorNode* pNode )
{
-SmNode *pLeft = pNode->GetSubNode( 0 ),
- *pOper = pNode->GetSubNode( 1 ),
- *pRight = pNode->GetSubNode( 2 );
+SmNode *pLeft = pNode->LeftOperand(),
+ *pOper = pNode->Symbol(),
+ *pRight = pNode->RightOperand();
Separate( );
pLeft->Accept( this );
Separate( );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
An annoying problem
Hi all, Currently i'm meeting such an problem that is as follows: When i run the swriter.exe from the directory "instdir", and then insert a chart, the program is ok. But when i install the msi program from the directory "workdir/installation", and then insert a chart, LO crashes. I am puzzled. I analyze it must be the problem of msi. So i suspect the above two ways use different dlls from the operation system(i am using Windows 7 64-bit). I think maybe there is something wrong while the process of making msi. But i can not find it now. So please give me some more information and help me to solve the problem. Thanks in advance. ps. i'm using the source of LO 5.0.6.3, MS visual studio 2013, cygwin 64-bit Best regards, Weike Liang weike.li...@cs2c.com.cn ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: git clone compile errors on isnan
On 08/04/2016 03:24 PM, Larry Evans wrote: Following directions here: https://www.libreoffice.org/about-us/source-code/ [snip] Then, did the ./autogen.sh followed by make; however, the make resulted in several errors. [snip] My OS is: Linux lje-OptiPlex-9020 4.4.0-31-generic #50-Ubuntu SMP Wed Jul 13 00:07:12 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
git clone compile errors on isnan
Following directions here:
https://www.libreoffice.org/about-us/source-code/
cloned libreoffice source:
Welcome to the Emacs shell
~/dwnlds/LibreOffice $ git clone git://anongit.freedesktop.org
/libreoffice/core libreoffice
then, following instructions later on here:
https://www.libreoffice.org/about-us/source-code/
did some apt-get's:
sudo apt-get build-dep libreoffice
sudo apt-get install libgnome-vfsmm-2.6-dev
the latter failed because:
E: Unable to locate package libgnome-vfsmm-2.6-dev
E: Couldn't find any package by glob 'libgnome-vfsmm-2.6-dev'
E: Couldn't find any package by regex 'libgnome-vfsmm-2.6-dev'
Then, did the ./autogen.sh followed by make; however, the make
resulted in several errors. Did I clone the wrong git?
Here's the compile errors:
$ make
mkdir -p /home/evansl/dwnlds/LibreOffice/libreoffice/instdir
/home/evansl/dwnlds/LibreOffice/libreoffice/solenv/bin/install-gdb-printers
-a /home/evansl/dwnlds/LibreOffice/libreoffice/instdir -c
/usr/bin/make -j 4 -rs -f
/home/evansl/dwnlds/LibreOffice/libreoffice/Makefile.gbuildall
[build DEP] LNK:Library/libneon.so
[build PKG] icu
[build PKG] nss
[build PAT] liborcus
[build PRJ] libgltf
[build MOD] codemaker
[build JAR] sdbc_hsqldb
[build EPK] apache_commons_logging
[build EPK] beanshell
[build CXX]
workdir/UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month.cpp
[build EPK] coinmp
[build BIN] glew
[build BIN] hsqldb
[build EPK] icu
[build BIN] lcms2
[build MOD] libexttextcat
[build BIN] libgltf
[build BIN] liblangtag
[build EPK] lpsolve
[build MOD] more_fonts
[build PAT] mythes
[build C ] UnpackedTarball/neon/src/ne_acl3744.c
[build C ] UnpackedTarball/neon/src/ne_alloc.c
[build C ] UnpackedTarball/neon/src/ne_auth.c
[build C ] UnpackedTarball/neon/src/ne_basic.c
In file included from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/lexical_cast/detail/inf_nan.hpp:35:0,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/lexical_cast/detail/converter_lexical_streams.hpp:63,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/lexical_cast/detail/converter_lexical.hpp:54,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/lexical_cast/try_lexical_convert.hpp:42,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/lexical_cast.hpp:32,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/external/boost/include/boost/lexical_cast.hpp:22,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/date_time/date_names_put.hpp:20,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/date_time/date_formatting_locales.hpp:18,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/date_time/gregorian/greg_facet.hpp:13,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month.cpp:15:
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/math/special_functions/fpclassify.hpp:
In function ‘bool boost::math_detail::is_nan_helper(__float128, const
true_type&)’:
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/math/special_functions/fpclassify.hpp:137:75:
error: ‘::isnan’ has not been declared
inline bool is_nan_helper(__float128 f, const boost::true_type&) {
return ::isnan(static_cast(f)); }
^
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/math/special_functions/fpclassify.hpp:137:75:
note: suggested alternatives:
In file included from /usr/local/include/c++/4.9.0/random:38:0,
from /usr/local/include/c++/4.9.0/bits/stl_algo.h:66,
from /usr/local/include/c++/4.9.0/algorithm:62,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/smart_ptr/shared_ptr.hpp:38,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/shared_ptr.hpp:17,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/external/boost/include/boost/shared_ptr.hpp:22,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/date_time/gregorian/greg_month.hpp:14,
from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month.cpp:14:
/usr/local/include/c++/4.9.0/cmath:632:5: note: ‘std::isnan’
isnan(_Tp __x)
^
In file included from
/home/evansl/dwnlds/LibreOffice/libreoffice/workdir/UnpackedTarball/boost/boost/math/special_functions/sign.hpp:17:0,
from
/home/evansl/dwnlds/LibreOffice/libreoffice
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforscan.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 39e300612c97b7742c8d8417d4dc6c0022cfa040
Author: Laurent Balland-Poirier
Date: Wed Aug 3 11:56:16 2016 +0200
tdf#101147 New approach to fix minute/month detection
Other formats may be differently interpreted
HH YY/MM => Month expected
HH DD/MM => Month expected
Change-Id: Iabb17911bf2907c02b6b898052b6933692f8074a
Reviewed-on: https://gerrit.libreoffice.org/27823
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index a59617d..d0a462e 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1162,6 +1162,8 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
That are the Excel rules. BUT, we break it because certainly
in something like {HH -MM-DD} the MM is NOT meant to be
minute, so not if MM is between YY and DD or DD and YY.
+ Actually not if any date specific keyword followed a time
+ setting keyword.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
@@ -1169,12 +1171,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
-(bIsTimeDetected &&
- !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_) &&
-(nIndexNex == NF_KEY_D || nIndexNex == NF_KEY_DD)) ||
- ((nIndexPre == NF_KEY_D || nIndexPre == NF_KEY_DD) &&
-(nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_)))
-) || // tdf#101147
+bIsTimeDetected || // tdf#101147
PreviousChar(i) == '[' ) // [M
{
eNewType = css::util::NumberFormat::TIME;
@@ -1212,6 +1209,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
case NF_KEY_R : // R
case NF_KEY_RR :// RR
eNewType = css::util::NumberFormat::DATE;
+bIsTimeDetected = false;
break;
case NF_KEY_CCC:// CCC
eNewType = css::util::NumberFormat::CURRENCY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svl/source
svl/source/numbers/zforscan.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 21639ac7f5b075808925186cdd5a102eb8d7a02a
Author: Laurent Balland-Poirier
Date: Wed Aug 3 11:56:16 2016 +0200
tdf#101147 New approach to fix minute/month detection
Other formats may be differently interpreted
HH YY/MM => Month expected
HH DD/MM => Month expected
Change-Id: Iabb17911bf2907c02b6b898052b6933692f8074a
Reviewed-on: https://gerrit.libreoffice.org/27887
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 608d0f3..1552d81 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1162,6 +1162,8 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
That are the Excel rules. BUT, we break it because certainly
in something like {HH -MM-DD} the MM is NOT meant to be
minute, so not if MM is between YY and DD or DD and YY.
+ Actually not if any date specific keyword followed a time
+ setting keyword.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
@@ -1169,12 +1171,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
-(bIsTimeDetected &&
- !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_) &&
-(nIndexNex == NF_KEY_D || nIndexNex == NF_KEY_DD)) ||
- ((nIndexPre == NF_KEY_D || nIndexPre == NF_KEY_DD) &&
-(nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_)))
-) || // tdf#101147
+bIsTimeDetected || // tdf#101147
PreviousChar(i) == '[' ) // [M
{
eNewType = css::util::NumberFormat::TIME;
@@ -1212,6 +1209,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
case NF_KEY_R : // R
case NF_KEY_RR :// RR
eNewType = css::util::NumberFormat::DATE;
+bIsTimeDetected = false;
break;
case NF_KEY_CCC:// CCC
eNewType = css::util::NumberFormat::CURRENCY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svl/source
svl/source/numbers/zforscan.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 85badce0b8dce3c1c1cc4b7af2d71ec2ff8da4ef
Author: Laurent Balland-Poirier
Date: Wed Aug 3 11:56:16 2016 +0200
tdf#101147 New approach to fix minute/month detection
Other formats may be differently interpreted
HH YY/MM => Month expected
HH DD/MM => Month expected
Change-Id: Iabb17911bf2907c02b6b898052b6933692f8074a
Reviewed-on: https://gerrit.libreoffice.org/27886
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 7e4b259..228afe7 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1162,6 +1162,8 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
That are the Excel rules. BUT, we break it because certainly
in something like {HH -MM-DD} the MM is NOT meant to be
minute, so not if MM is between YY and DD or DD and YY.
+ Actually not if any date specific keyword followed a time
+ setting keyword.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
@@ -1169,12 +1171,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
-(bIsTimeDetected &&
- !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_) &&
-(nIndexNex == NF_KEY_D || nIndexNex == NF_KEY_DD)) ||
- ((nIndexPre == NF_KEY_D || nIndexPre == NF_KEY_DD) &&
-(nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_)))
-) || // tdf#101147
+bIsTimeDetected || // tdf#101147
PreviousChar(i) == '[' ) // [M
{
eNewType = css::util::NumberFormat::TIME;
@@ -1212,6 +1209,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
case NF_KEY_R : // R
case NF_KEY_RR :// RR
eNewType = css::util::NumberFormat::DATE;
+bIsTimeDetected = false;
break;
case NF_KEY_CCC:// CCC
eNewType = css::util::NumberFormat::CURRENCY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/loolwsd.spec.in
loolwsd/loolwsd.spec.in | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 5e91d6a15d0778d3956b3245356a5905972bfc54
Author: Jan Holesovsky
Date: Thu Aug 4 23:15:33 2016 +
Allow specifying a name suffix.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index d298198..ace0c87 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -6,7 +6,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+%if 0%{?name_suffix:1}
+Name: loolwsd%{name_suffix}
+%else
Name: loolwsd
+%endif
Version:@PACKAGE_VERSION@
Release:1%{?dist}
Vendor: Collabora
@@ -42,14 +46,14 @@ Requires: libPocoCrypto42 >= 1.7.1
libPocoFoundation42 >= 1.7.1 libPocoJSO
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
%endif
-Provides: loleaflet = 1.5.8
+Provides: loleaflet = 1.5.8, loolwsd
Obsoletes: loleaflet <= 1.5.8
%description
%prep
-%setup
-%setup -T -D -a 1
+%setup -n loolwsd-@PACKAGE_VERSION@
+%setup -n loolwsd-@PACKAGE_VERSION@ -T -D -a 1
%build
%configure \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 3 commits - loleaflet/Makefile loolwsd/configure.ac loolwsd/loolwsd.spec.in
loleaflet/Makefile |2 +-
loolwsd/configure.ac|2 +-
loolwsd/loolwsd.spec.in | 10 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit e697b5ab895e79fd1242b0b1d0a632119e6dda2c
Author: Jan Holesovsky
Date: Thu Aug 4 23:15:33 2016 +
Allow specifying a name suffix.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index d298198..ace0c87 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -6,7 +6,11 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+%if 0%{?name_suffix:1}
+Name: loolwsd%{name_suffix}
+%else
Name: loolwsd
+%endif
Version:@PACKAGE_VERSION@
Release:1%{?dist}
Vendor: Collabora
@@ -42,14 +46,14 @@ Requires: libPocoCrypto42 >= 1.7.1
libPocoFoundation42 >= 1.7.1 libPocoJSO
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
%endif
-Provides: loleaflet = 1.5.8
+Provides: loleaflet = 1.5.8, loolwsd
Obsoletes: loleaflet <= 1.5.8
%description
%prep
-%setup
-%setup -T -D -a 1
+%setup -n loolwsd-@PACKAGE_VERSION@
+%setup -n loolwsd-@PACKAGE_VERSION@ -T -D -a 1
%build
%configure \
commit 023836c0a0b01c158f2c1695a884c8412f8658ac
Author: Jan Holesovsky
Date: Thu Aug 4 08:51:47 2016 +
Bump version to 1.8.1 after tarball
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4a549c5..19bdd4b 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.8.0
+VERSION=1.8.1
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index a9c9378..dacbb28 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.8.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.8.1], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
commit 9d8411e30ea25364fd88e04db99b3add577940d9
Author: Jan Holesovsky
Date: Thu Aug 4 08:39:57 2016 +
Bump version to 1.8.0 before tarball.
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 46f3e97..4a549c5 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.7.3
+VERSION=1.8.0
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index fa87ed4..a9c9378 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.7.3], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.8.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svl/source
svl/source/numbers/zforscan.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 97c0d2cf817d0d995dbc3d0901dbbfb4491e9664
Author: Eike Rathke
Date: Tue Aug 2 23:46:22 2016 +0200
break the Excel rule for YMD and DMY, tdf#101147 follow-up
Clearly in {HH -MM-DD} the MM should not be minute. Also not in
{HH DD.MM.YY}. Don't follow every bullshit. Period.
It is debatable how to treat MDY, {HH:MM DD/YY} should be different from
{HH MM/DD/YY}, Excel ironically takes both as minute, even in an en-US
locale.
(cherry picked from commit 88134dcba680418496f7a1c70a47fde0159ce390)
Conflicts:
svl/qa/unit/svl.cxx
Change-Id: I13d39a36294e3c40cc0e9bf72026804b299bb264
Reviewed-on: https://gerrit.libreoffice.org/27814
Tested-by: Jenkins
Reviewed-by: Laurent BP
Reviewed-by: Eike Rathke
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index e73d2bd..608d0f3 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1156,9 +1156,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
Minute if one of:
* preceded by time keyword H (ignoring separators)
* followed by time keyword S (ignoring separators)
- * H or S was detected
+ * H or S was detected and this is the first M following
* preceded by '[' amount bracket
Else month.
+ That are the Excel rules. BUT, we break it because certainly
+ in something like {HH -MM-DD} the MM is NOT meant to be
+ minute, so not if MM is between YY and DD or DD and YY.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
@@ -1166,7 +1169,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
-bIsTimeDetected || // tdf#101147
+(bIsTimeDetected &&
+ !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_) &&
+(nIndexNex == NF_KEY_D || nIndexNex == NF_KEY_DD)) ||
+ ((nIndexPre == NF_KEY_D || nIndexPre == NF_KEY_DD) &&
+(nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_)))
+) || // tdf#101147
PreviousChar(i) == '[' ) // [M
{
eNewType = css::util::NumberFormat::TIME;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svl/source
svl/source/numbers/zforscan.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 0b168901ed5e767651262686af65994029b3039b
Author: Eike Rathke
Date: Tue Aug 2 23:46:22 2016 +0200
break the Excel rule for YMD and DMY, tdf#101147 follow-up
Clearly in {HH -MM-DD} the MM should not be minute. Also not in
{HH DD.MM.YY}. Don't follow every bullshit. Period.
It is debatable how to treat MDY, {HH:MM DD/YY} should be different from
{HH MM/DD/YY}, Excel ironically takes both as minute, even in an en-US
locale.
(cherry picked from commit 88134dcba680418496f7a1c70a47fde0159ce390)
Conflicts:
svl/qa/unit/svl.cxx
Change-Id: I13d39a36294e3c40cc0e9bf72026804b299bb264
Reviewed-on: https://gerrit.libreoffice.org/27813
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 37ec6db..7e4b259 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1156,9 +1156,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
Minute if one of:
* preceded by time keyword H (ignoring separators)
* followed by time keyword S (ignoring separators)
- * H or S was detected
+ * H or S was detected and this is the first M following
* preceded by '[' amount bracket
Else month.
+ That are the Excel rules. BUT, we break it because certainly
+ in something like {HH -MM-DD} the MM is NOT meant to be
+ minute, so not if MM is between YY and DD or DD and YY.
*/
nIndexPre = PreviousKeyword(i);
nIndexNex = NextKeyword(i);
@@ -1166,7 +1169,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
nIndexPre == NF_KEY_HH || // HH
nIndexNex == NF_KEY_S || // S
nIndexNex == NF_KEY_SS || // SS
-bIsTimeDetected || // tdf#101147
+(bIsTimeDetected &&
+ !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_) &&
+(nIndexNex == NF_KEY_D || nIndexNex == NF_KEY_DD)) ||
+ ((nIndexPre == NF_KEY_D || nIndexPre == NF_KEY_DD) &&
+(nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_)))
+) || // tdf#101147
PreviousChar(i) == '[' ) // [M
{
eNewType = css::util::NumberFormat::TIME;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Firebird - status update
Hi, I'm still working on https://gerrit.libreoffice.org/27642/ which seems to work on Windows at last. On MAC, the external Firebird module builds like a charm too. The problem I got here currently is that it looks for the ICU libraries with a wrong path, which are used by library ibclient. To specify the linking path to the ICU libs, there is a DYLD_LIBRARY_PATH macro used in builds/posix/prefix.darwin. The problem is that a relative path should be used in our case. I tried to use this magic gbuild tool with a lot of underscore '_' characters, (see changes in darwin.defaults, patch: firebird-macosx.patch.1), but it doesn't work for me yet. Tamás Bunth ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - avmedia/Module_avmedia.mk postprocess/Rdb_services.mk vcl/osx
avmedia/Module_avmedia.mk |2 ++ postprocess/Rdb_services.mk |4 +++- vcl/osx/PictToBmpFlt.cxx|1 - 3 files changed, 5 insertions(+), 2 deletions(-) New commits: commit a4e81b7c313e5cb0e0f23a8605502b4b0b7f599e Author: Tor Lillqvist Date: Thu Aug 4 23:29:12 2016 +0300 No QuickTime in the 10.12 SDK Finally. It has been documented as deprecated for years, after all. Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index fb9497d..a037b4d 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -37,11 +37,13 @@ endif ifeq ($(OS),MACOSX) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) +ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) endif endif +endif ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,avmedia,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 775022a..f56e55b 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -127,7 +127,9 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter MACOSX,$(OS)), \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ + $(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ + ) \ ) \ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ fpicker/source/aqua/fps_aqua \ commit aabfbdbd8b096d4dfc31cb75aa6a119a19d705ef Author: Tor Lillqvist Date: Thu Aug 4 23:24:12 2016 +0300 Drop unneeded include There is no in the 10.12 SDK anyway. Change-Id: I0d937d4b036d118fcb503543a516e55f859a3718 diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx index af8740b..153c036 100644 --- a/vcl/osx/PictToBmpFlt.cxx +++ b/vcl/osx/PictToBmpFlt.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/spreadsheet.css| 68 +++---
loleaflet/src/control/Control.ColumnHeader.js | 15 +++--
loleaflet/src/control/Control.RowHeader.js| 16 +++---
3 files changed, 70 insertions(+), 29 deletions(-)
New commits:
commit 3336af0804b919b2441d162626f298c09ddcac16
Author: Henry Castro
Date: Thu Aug 4 16:48:47 2016 -0400
loleaflet: add Column/Row cursor resize
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 7537600..7927b23 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -99,24 +99,12 @@
.spreadsheet-header-column {
border-right: 1px solid darkgrey;
- font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
-
display: inline-block;
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
+ text-align: left;
padding: 0px;
padding-top: 1px;
margin: 0px;
height: 100%;
- cursor: pointer;
-
- /* Make the text unselectable for all browsers */
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
}
.spreadsheet-header-column:hover {
@@ -146,14 +134,56 @@
.spreadsheet-header-row {
border-bottom: 1px solid darkgrey;
- font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+ padding: 0px;
+ margin: 0px;
+ height: 100%;
+ cursor: pointer;
+ }
+
+.spreadsheet-header-row:hover {
+ background-color: #DDD;
+ }
+.spreadsheet-header-column-text {
+ display: inline-block;
+ vertical-align: top;
+ font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
text-overflow: ellipsis;
- text-align: center;
white-space: nowrap;
+ text-align: center;
+ height: 100%;
+ margin: 0px;
+ border: 0px;
padding: 0px;
+ cursor: pointer;
+
+ /* Make the text unselectable for all browsers */
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ }
+
+.spreadsheet-header-column-resize {
+ display: inline-block;
+ vertical-align: top;
+ cursor: col-resize;
+ height: 100%;
margin: 0px;
+ border: 0px;
+ padding: 0px;
+ }
+
+.spreadsheet-header-row-text {
+ font: 12px/1.5 "Segoe UI", Tahoma, Arial, Helvetica, sans-serif;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ text-align: center;
height: 100%;
+ margin: 0px;
+ border: 0px;
+ padding: 0px;
cursor: pointer;
/* Make the text unselectable for all browsers */
@@ -164,6 +194,10 @@
-ms-user-select: none;
}
-.spreadsheet-header-row:hover {
- background-color: #DDD;
+.spreadsheet-header-row-resize {
+ cursor: row-resize;
+ height: 100%;
+ margin: 0px;
+ border: 0px;
+ padding: 0px;
}
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index a5cfcdc..45d48b5 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -92,24 +92,27 @@ L.Control.ColumnHeader = L.Control.extend({
},
fillColumns: function (columns, converter, context) {
- var iterator, twip, width, text;
+ var iterator, twip, width, column, text, resize;
this.clearColumns();
for (iterator = 0; iterator < columns.length; iterator++) {
width = columns[iterator].size - (iterator > 0 ?
columns[iterator - 1].size : 0);
twip = new L.Point(width, width);
- text = L.DomUtil.create('div',
'spreadsheet-header-column', this._columns);
+ column = L.DomUtil.create('div',
'spreadsheet-header-column', this._columns);
+ text = L.DomUtil.create('div',
'spreadsheet-header-column-text', column);
+ resize = L.DomUtil.create('div',
'spreadsheet-header-column-resize', column);
var content = columns[iterator].text;
text.setAttribute('rel', 'spreadsheet-column-' +
content); // for easy addressing
text.innerHTML = content;
- width = Math.round(converter.call(context, twip).x) - 1
+ 'px';
- if (width === '-1px') {
+ width = Math.round(converter.call(context, twip).x) - 1;
+ if (width === -1) {
L.DomUtil.setStyle(text, 'display', 'none');
}
else {
-
[Libreoffice-commits] core.git: include/vcl sfx2/source vcl/source
include/vcl/tabctrl.hxx |5 +
sfx2/source/notebookbar/NotebookBarPopupMenu.cxx |5 +
vcl/source/control/tabctrl.cxx | 74 +++
3 files changed, 82 insertions(+), 2 deletions(-)
New commits:
commit d3c3dcb4d581544d9fabc3b4b9160cbc9443543d
Author: Szymon KÅos
Date: Thu Aug 4 16:58:48 2016 +0200
GSoC: notebookbar, position of popup menu
Change-Id: Ia4491a8659c8e6532681f7fca83b432e311d79d6
Reviewed-on: https://gerrit.libreoffice.org/27881
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index e162b19..4c57793 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -179,7 +179,7 @@ public:
virtual void SetSizePixel(const Size& rNewSize) override;
virtual void SetPosSizePixel(const Point& rNewPos, const Size& rNewSize)
override;
-Size calculateRequisition() const;
+virtual Size calculateRequisition() const;
void setAllocation(const Size &rAllocation);
void markLayoutDirty()
@@ -207,6 +207,8 @@ public:
virtual sal_uInt16 GetPageId( const Point& rPos ) const override;
virtual voidSelectTabPage( sal_uInt16 nPageId ) override;
virtual voidSetCurPageId( sal_uInt16 nPageId ) override;
+virtual SizecalculateRequisition() const override;
+static sal_uInt16 GetHeaderHeight();
protected:
virtual bool ImplPlaceTabs( long nWidth ) override;
@@ -216,6 +218,7 @@ private:
bool bLastContextWasSupported;
vcl::EnumContext::Context eLastContext;
Link m_aIconClickHdl;
+static sal_uInt16 m_nHeaderHeight;
};
#endif // INCLUDED_VCL_TABCTRL_HXX
diff --git a/sfx2/source/notebookbar/NotebookBarPopupMenu.cxx
b/sfx2/source/notebookbar/NotebookBarPopupMenu.cxx
index a78b15c..72c4145 100644
--- a/sfx2/source/notebookbar/NotebookBarPopupMenu.cxx
+++ b/sfx2/source/notebookbar/NotebookBarPopupMenu.cxx
@@ -54,7 +54,10 @@ void NotebookBarPopupMenu::Execute(NotebookBar* pNotebookbar,
{
if (pNotebookbar)
{
-sal_uInt16 nSelected = PopupMenu::Execute(pNotebookbar, Point(0, 40));
+sal_uInt16 nTop = NotebookbarTabControl::GetHeaderHeight();
+sal_uInt16 nSelected = PopupMenu::Execute(pNotebookbar,
+Rectangle(0, nTop, 0, nTop),
+
PopupMenuFlags::ExecuteDown|PopupMenuFlags::NoMouseUpClose);
if (nSelected)
{
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d165f21..7b2c3f3 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2203,6 +2203,8 @@ FactoryFunction TabControl::GetUITestFactory() const
VCL_BUILDER_FACTORY(NotebookbarTabControl);
+sal_uInt16 NotebookbarTabControl::m_nHeaderHeight = 0;
+
NotebookbarTabControl::NotebookbarTabControl(vcl::Window* pParent, WinBits
nStyle)
: TabControl(pParent, nStyle)
, bLastContextWasSupported(true)
@@ -2285,6 +2287,11 @@ void NotebookbarTabControl::SetCurPageId( sal_uInt16
nPageId )
TabControl::SetCurPageId( nPageId );
}
+sal_uInt16 NotebookbarTabControl::GetHeaderHeight()
+{
+return m_nHeaderHeight;
+}
+
bool NotebookbarTabControl::ImplPlaceTabs( long nWidth )
{
if ( nWidth <= 0 )
@@ -2653,4 +2660,71 @@ void
NotebookbarTabControl::ImplPaint(vcl::RenderContext& rRenderContext, const
mbSmallInvalidate = true;
}
+Size NotebookbarTabControl::calculateRequisition() const
+{
+Size aOptimalPageSize(0, 0);
+
+sal_uInt16 nOrigPageId = GetCurPageId();
+for( std::vector< ImplTabItem >::const_iterator it =
mpTabCtrlData->maItemList.begin();
+ it != mpTabCtrlData->maItemList.end(); ++it )
+{
+const TabPage *pPage = it->mpTabPage;
+//it's a real nuisance if the page is not inserted yet :-(
+//We need to force all tabs to exist to get overall optimal size for
dialog
+if (!pPage)
+{
+NotebookbarTabControl *pThis =
const_cast(this);
+pThis->SetCurPageId(it->mnId);
+pThis->ActivatePage();
+pPage = it->mpTabPage;
+}
+
+if (!pPage)
+continue;
+
+Size aPageSize(VclContainer::getLayoutRequisition(*pPage));
+
+if (aPageSize.Width() > aOptimalPageSize.Width())
+aOptimalPageSize.Width() = aPageSize.Width();
+if (aPageSize.Height() > aOptimalPageSize.Height())
+aOptimalPageSize.Height() = aPageSize.Height();
+}
+
+//fdo#61940 If we were forced to activate pages in order to on-demand
+//create them to get their optimal size, then switch back to the original
+//page and re-activate it
+if (nOrigPageId != GetCurPageId())
+{
+NotebookbarTabControl *pThis =
const_cast(this);
+pThis->SetCurPageId(nOrigPageId);
+pThis->ActivatePage();
+}
+
+long nTabLabelsBottom = 0, nTabLabels
[Libreoffice-commits] core.git: external/python3
external/python3/ExternalProject_python3.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 55a4fd60b1df233ad0b35ed302f4dd0e308d3551 Author: Tor Lillqvist Date: Thu Aug 4 23:09:43 2016 +0300 Don't use functions introduced in 10.12 when building to run on older getentropy() and clock_gettime() are new in macOS Sierra (10.12). Change-Id: I93640bbf20056d925c3116df336aeaebaaffda18 diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index e81166f..757d782 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -57,6 +57,12 @@ endif $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_ExternalProject_run,build,\ + $(if $(filter MACOSX,$(OS)), \ + $(if $(filter 10.8 10.9 10.10 10.11,$(MACOSX_DEPLOYMENT_TARGET)), \ + ac_cv_func_getentropy=no \ + ac_cv_func_clock_gettime=no \ + ) \ + ) \ ./configure \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(ENABLE_VALGRIND),--with-valgrind) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 4c94b91718a65b34038b917dd29f738be3f4f6cb
Author: Tor Lillqvist
Date: Thu Aug 4 22:48:22 2016 +0300
Accept also macOS SDK 10.12
Change-Id: I2e654de8af40486ef63146ad42a3f2988f9c3579
diff --git a/configure.ac b/configure.ac
index e378892..50fec94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2842,7 +2842,7 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use])
-for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
+for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -2873,8 +2873,11 @@ if test $_os = Darwin; then
10.11)
MACOSX_SDK_VERSION=101100
;;
+10.12)
+MACOSX_SDK_VERSION=101200
+;;
*)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.8--11])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.8--12])
;;
esac
@@ -2906,8 +2909,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MIN_REQUIRED="101100"
;;
+10.12)
+MAC_OS_X_VERSION_MIN_REQUIRED="101200"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.8--11])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.8--12])
;;
esac
@@ -2943,8 +2949,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MAX_ALLOWED="101100"
;;
+10.12)
+MAC_OS_X_VERSION_MAX_ALLOWED="101200"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.8--11])
+AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.8--12])
;;
esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi, On Thu, Aug 04, 2016 at 05:13:26PM +0100, Michael Meeks wrote: > * writer regressions (Bjoern) >+ since 5.0 no fully triaged, bibisected regression in writer https://twitter.com/Sweet5hark/status/760830653571170316 >+ if you remove filters & perf. issues down to 25 bibisected issues (of > 125). whops, that was when I was looking at Linux only: https://bugs.documentfoundation.org/buglist.cgi?bug_status=NEW&component=Writer&f1=keywords&f2=short_desc&keywords=bibisected%2C%20regression%2C%20&keywords_type=allwords&list_id=625809&o1=nowordssubstr&o2=nowords&op_sys=All&op_sys=Linux%20%28All%29&order=bug_id&product=LibreOffice&query_format=advanced&resolution=---&v1=filt%20perf&v2=FILEOPEN%20FILESAVE without restricting to Linux its 33 bugs: https://bugs.documentfoundation.org/buglist.cgi?bug_status=NEW&component=Writer&f1=keywords&f2=short_desc&keywords=bibisected%2C%20regression%2C%20&keywords_type=allwords&list_id=625809&o1=nowordssubstr&o2=nowords&order=bug_id&product=LibreOffice&query_format=advanced&resolution=---&v1=filt%20perf&v2=FILEOPEN%20FILESAVE >+ are perf. regression a big part of our load ? (Michael) they are not: not filtering out perf moves the count from 33 to 38 https://bugs.documentfoundation.org/buglist.cgi?bug_status=NEW&component=Writer&f1=keywords&f2=short_desc&keywords=bibisected%2C%20regression%2C%20&keywords_type=allwords&list_id=625810&o1=nowordssubstr&o2=nowords&product=LibreOffice&query_format=advanced&resolution=---&v1=filt&v2=FILEOPEN%20FILESAVE >+ not sure if they are, but hard to bibisect. >+ particularly with dbgutil build bibisection ! (Miklos) > + do we have repositories ? > + we have Windows + Mac, but not Linux. > https://gerrit.libreoffice.org/#/admin/projects/?filter=bisect >+ filter issues are the main part right: https://bugs.documentfoundation.org/buglist.cgi?bug_status=NEW&component=Writer&f1=keywords&f2=short_desc&keywords=bibisected%2C%20regression%2C%20&keywords_type=allwords&list_id=625811&o1=nowordssubstr&o2=nowords&product=LibreOffice&query_format=advanced&resolution=--- so 92-33=59 (64%) of the fully triaged regressions are filter stuff On an additional note: Indeed our bibisect quote could be better: e.g. in Writer 92/211 = 43% isnt too good. 2/28 = 7% out of Writer 5.x regressions is even worse. Clearly some room for improvement there. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_formula.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 124eec677920b4109f5a8b961aa54925548a9f7d
Author: Eike Rathke
Date: Thu Aug 4 21:23:58 2016 +0200
add unit test for nested array IF with range references as conditions
Change-Id: I37d95ba9d8f84e5a7aeefd67628436545c942da7
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index d3c158f..acc99cb 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3926,7 +3926,7 @@ void Test::testFuncIF()
m_pDoc->SetValue(ScAddress(1,0,0), 3.0);
CPPUNIT_ASSERT_EQUAL(OUString("not two"),
m_pDoc->GetString(ScAddress(0,0,0)));
-// Test nested IF in array/matrix if the nested IF is not already a matrix.
+// Test nested IF in array/matrix if the nested IF condition is a scalar.
ScMarkData aMark;
aMark.SelectOneTable(0);
m_pDoc->InsertMatrixFormula(0,2, 1,2, aMark, "=IF({1;0};IF(1;23);42)");
@@ -3934,6 +3934,24 @@ void Test::testFuncIF()
CPPUNIT_ASSERT_EQUAL(23.0, m_pDoc->GetValue(ScAddress(0,2,0)));
CPPUNIT_ASSERT_EQUAL(42.0, m_pDoc->GetValue(ScAddress(1,2,0)));
+// Test nested IF in array/matrix if nested IF conditions are range
+// references, data in A5:C8, matrix formula in D4 so there is no
+// implicit intersection between formula and ranges.
+{
+const char* aData[][3] = {
+{ "1", "1", "16" },
+{ "0", "1", "32" },
+{ "1", "0", "64" },
+{ "0", "0", "128" }
+};
+ScAddress aPos(0,4,0);
+ScRange aRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_EQUAL(aPos, aRange.aStart);
+}
+m_pDoc->InsertMatrixFormula(3,3, 3,3, aMark,
"=SUM(IF(A5:A8;IF(B5:B8;C5:C8;0);0))");
+// Result must be 16, only the first row matches all criteria.
+CPPUNIT_ASSERT_EQUAL(16.0, m_pDoc->GetValue(ScAddress(3,3,0)));
+
m_pDoc->DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/orcus-odf' - 4 commits - sc/qa sc/source
sc/qa/unit/data/xml/styles.xml |5 ---
sc/qa/unit/subsequent_filters-test.cxx | 50
sc/source/filter/inc/orcusinterface.hxx |2 +
sc/source/filter/orcus/interface.cxx| 14 +++-
4 files changed, 64 insertions(+), 7 deletions(-)
New commits:
commit 2ec19dbd744cbc27f31f603fe9f05bffbfd047e3
Author: Jaskaran Singh
Date: Fri Aug 5 00:13:37 2016 +0530
Add diagonal border test for orcus interface
Change-Id: I762e3b5f634b96664a3687e89b1a117895265bee
diff --git a/sc/qa/unit/data/xml/styles.xml b/sc/qa/unit/data/xml/styles.xml
index f6f9183..85c1e49 100644
--- a/sc/qa/unit/data/xml/styles.xml
+++ b/sc/qa/unit/data/xml/styles.xml
@@ -4,10 +4,7 @@
-
-
-
-
+
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 1f7780a..7ce70ee 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include "validat.hxx"
#include "formulacell.hxx"
@@ -2677,6 +2678,9 @@ void ScFiltersTest::testOrcusODSStyleInterface()
pOrcus->importODS_Styles(aDoc, aValidPath);
ScStyleSheetPool* pStyleSheetPool = aDoc.GetStyleSheetPool();
+/* Test cases for Style "Name1"
+ * Has Border and Fill.
+ */
ScStyleSheet* pStyleSheet = pStyleSheetPool->FindCaseIns("Name1",
SfxStyleFamily::Para);
const SfxPoolItem* pItem = nullptr;
@@ -2700,6 +2704,52 @@ void ScFiltersTest::testOrcusODSStyleInterface()
ASSERT_DOUBLES_EQUAL_MESSAGE("Error with right width", 1,
pBoxItem->GetRight()->GetWidth());
ASSERT_DOUBLES_EQUAL_MESSAGE("Error with top width", 1,
pBoxItem->GetTop()->GetWidth());
ASSERT_DOUBLES_EQUAL_MESSAGE("Error with bottom width", 1,
pBoxItem->GetBottom()->GetWidth());
+
+CPPUNIT_ASSERT_MESSAGE("Style Name1 : Has Attribute border, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_PROTECTION, &pItem));
+CPPUNIT_ASSERT_MESSAGE("Style Name1 : Has Attribute font, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_FONT, &pItem));
+CPPUNIT_ASSERT_MESSAGE("Style Name1 : Has Attribute number format, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_VALUE_FORMAT, &pItem));
+
+/* Test for Style "Name2"
+ * Has 4 sided borders + Diagonal borders.
+ */
+pStyleSheet = pStyleSheetPool->FindCaseIns("Name2", SfxStyleFamily::Para);
+
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Doesn't have Attribute background,
but it should have.",
+pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem));
+
+pBoxItem = static_cast(pItem);
+CPPUNIT_ASSERT_EQUAL(Color(0, 0, 0), pBoxItem->GetLeft()->GetColor());
+CPPUNIT_ASSERT_EQUAL(Color(255, 0, 0), pBoxItem->GetRight()->GetColor());
+CPPUNIT_ASSERT_EQUAL(pBoxItem->GetLeft()->GetBorderLineStyle(),
::com::sun::star::table::BorderLineStyle::SOLID);
+CPPUNIT_ASSERT_EQUAL(pBoxItem->GetRight()->GetBorderLineStyle(),
::com::sun::star::table::BorderLineStyle::DOTTED);
+ASSERT_DOUBLES_EQUAL_MESSAGE("Error with left width", 0,
pBoxItem->GetLeft()->GetWidth());
+ASSERT_DOUBLES_EQUAL_MESSAGE("Error with right width", 14,
pBoxItem->GetRight()->GetWidth());
+
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Doesn't have Attribute
diagonal(tl-br) border, but it should have.",
+pStyleSheet->GetItemSet().HasItem(ATTR_BORDER_TLBR, &pItem));
+
+const SvxLineItem* pTLBR= static_cast(pItem);
+CPPUNIT_ASSERT_EQUAL(Color(18, 0, 0), pTLBR->GetLine()->GetColor());
+CPPUNIT_ASSERT_EQUAL(pTLBR->GetLine()->GetBorderLineStyle(),
::com::sun::star::table::BorderLineStyle::DASH_DOT);
+ASSERT_DOUBLES_EQUAL_MESSAGE("Error with diagonal tl-br width", 14,
pTLBR->GetLine()->GetWidth());
+
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Doesn't have Attribute
diagonal(bl-tr) border, but it should have.",
+pStyleSheet->GetItemSet().HasItem(ATTR_BORDER_BLTR, &pItem));
+
+const SvxLineItem* pBLTR= static_cast(pItem);
+CPPUNIT_ASSERT_EQUAL(Color(255, 204, 238), pBLTR->GetLine()->GetColor());
+CPPUNIT_ASSERT_EQUAL(pBLTR->GetLine()->GetBorderLineStyle(),
::com::sun::star::table::BorderLineStyle::DASHED);
+ASSERT_DOUBLES_EQUAL_MESSAGE("Error with diagonal tl-br width", 34,
pBLTR->GetLine()->GetWidth());
+
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Has Attribute background, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_BACKGROUND, &pItem));
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Has Attribute font, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_FONT, &pItem));
+CPPUNIT_ASSERT_MESSAGE("Style Name2 : Has Attribute number format, but it
shouldn't.",
+!pStyleSheet->GetItemSet().HasItem(ATTR_VALUE_FORMAT, &pItem));
}
#endif
commit 5b01704f51ec389b05fc979d452fc26963685cca
Author: Jaskaran Singh
Date: Fri Aug 5 00:12:
[Libreoffice-commits] core.git: include/LibreOfficeKit
include/LibreOfficeKit/LibreOfficeKitInit.h | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3f02b2aa51e32c46d5b6610480bc1ba22156a3ec
Author: Miklos Vajna
Date: Thu Aug 4 18:08:34 2016 +0200
LOK init: avoid non-inline function definition in header file
To prevent possible ODR violations.
Change-Id: Ic9538244a0bf3760808904d2bcf608151c53f899
Reviewed-on: https://gerrit.libreoffice.org/27883
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index bdda642..47b9553 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -42,7 +42,7 @@ extern "C"
#endif
#define SEPARATOR '/'
-void *lok_loadlib(const char *pFN)
+inline void *lok_loadlib(const char *pFN)
{
return dlopen(pFN, RTLD_LAZY
#if defined LOK_LOADLIB_GLOBAL
@@ -51,22 +51,22 @@ extern "C"
);
}
-char *lok_dlerror(void)
+inline char *lok_dlerror(void)
{
return dlerror();
}
-void *lok_dlsym(void *Hnd, const char *pName)
+inline void *lok_dlsym(void *Hnd, const char *pName)
{
return dlsym(Hnd, pName);
}
-int lok_dlclose(void *Hnd)
+inline int lok_dlclose(void *Hnd)
{
return dlclose(Hnd);
}
-void extendUnoPath(const char *pPath)
+inline void extendUnoPath(const char *pPath)
{
(void)pPath;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx |6 +-
sc/source/core/inc/interpre.hxx | 19 +++
sc/source/core/tool/interpr1.cxx |6 +++---
sc/source/core/tool/interpr4.cxx | 19 +++
4 files changed, 34 insertions(+), 16 deletions(-)
New commits:
commit e85bb29a029300bbed18ca0c25bdc9a31773e9cc
Author: Eike Rathke
Date: Thu Aug 4 18:57:46 2016 +0200
re-enable unit test for tdf#100637 nested array IF with scalar
Change-Id: If2b6d5d8dcbad1472d12753083ba431b59713a7f
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index f5f65bf..d3c158f 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3926,17 +3926,13 @@ void Test::testFuncIF()
m_pDoc->SetValue(ScAddress(1,0,0), 3.0);
CPPUNIT_ASSERT_EQUAL(OUString("not two"),
m_pDoc->GetString(ScAddress(0,0,0)));
-/* FIXME: temporarily disabled because e54cd3fbf40300416ef337981bd356b88ad44a41
- * reverted; reactivate when fixed again. */
-#if 0
-// Test nested IF in array/matrix.
+// Test nested IF in array/matrix if the nested IF is not already a matrix.
ScMarkData aMark;
aMark.SelectOneTable(0);
m_pDoc->InsertMatrixFormula(0,2, 1,2, aMark, "=IF({1;0};IF(1;23);42)");
// Results must be 23 and 42.
CPPUNIT_ASSERT_EQUAL(23.0, m_pDoc->GetValue(ScAddress(0,2,0)));
CPPUNIT_ASSERT_EQUAL(42.0, m_pDoc->GetValue(ScAddress(1,2,0)));
-#endif
m_pDoc->DeleteTab(0);
}
commit e5632d9b2f194a89ec4e60cd99fc050691b14a1e
Author: Eike Rathke
Date: Thu Aug 4 18:56:20 2016 +0200
Resolves: tdf#100637 nested array jump condition needs own JumpMatrix
context
... even if scalar. For all IF, CHOOSE, IFERROR, IFNA.
Change-Id: If776dbcd7e5991b7a5629fff0b894a6015918572
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 37afbda..f1b8e0d 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -360,11 +360,17 @@ void PopExternalDoubleRef(ScMatrixRef& rMat);
void GetExternalDoubleRef(sal_uInt16 nFileId, const OUString& rTabName, const
ScComplexRefData& aData, ScExternalRefCache::TokenArrayRef& rArray);
bool PopDoubleRefOrSingleRef( ScAddress& rAdr );
void PopDoubleRefPushMatrix();
-// If MatrixFormula: convert formula::svDoubleRef to svMatrix, create
JumpMatrix.
+// If MatrixFormula: convert svDoubleRef to svMatrix, create JumpMatrix.
// Else convert area reference parameters marked as ForceArray to array.
// Returns true if JumpMatrix created.
bool ConvertMatrixParameters();
-inline void MatrixJumpConditionToMatrix(); // if MatrixFormula:
PopDoubleRefPushMatrix
+// If MatrixFormula: ConvertMatrixJumpConditionToMatrix()
+inline void MatrixJumpConditionToMatrix();
+// For MatrixFormula (preconditions already checked by
+// MatrixJumpConditionToMatrix()): convert svDoubleRef to svMatrix, or if
+// JumpMatrix currently in effect convert also other types to svMatrix so
+// another JumpMatrix will be created by jump commands.
+void ConvertMatrixJumpConditionToMatrix();
// If MatrixFormula or ForceArray: ConvertMatrixParameters()
inline bool MatrixParameterConversion();
ScMatrixRef PopMatrix();
@@ -977,11 +983,8 @@ public:
inline void ScInterpreter::MatrixJumpConditionToMatrix()
{
-if ( (bMatrixFormula || pCur->IsInForceArray()) && GetStackType() ==
formula::svDoubleRef )
-{
-GetTokenMatrixMap();// make sure it exists, create if not.
-PopDoubleRefPushMatrix();
-}
+if (bMatrixFormula || pCur->IsInForceArray())
+ConvertMatrixJumpConditionToMatrix();
}
inline bool ScInterpreter::MatrixParameterConversion()
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 9f64ea0..ed433e3 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1374,6 +1374,25 @@ void ScInterpreter::PopDoubleRefPushMatrix()
SetError( errNoRef );
}
+void ScInterpreter::ConvertMatrixJumpConditionToMatrix()
+{
+StackVar eStackType = GetStackType();
+if (eStackType == svUnknown)
+return; // can't do anything, some caller will catch that
+if (eStackType == svMatrix)
+return; // already matrix, nothing to do
+
+if (eStackType != svDoubleRef && GetStackType(2) != svJumpMatrix)
+return; // always convert svDoubleRef, others only in JumpMatrix
context
+
+GetTokenMatrixMap();// make sure it exists, create if not.
+ScMatrixRef pMat = GetMatrix();
+if ( pMat )
+PushMatrix( pMat );
+else
+PushIllegalParameter();
+}
+
ScTokenMatrixMap* ScInterpreter::CreateTokenMatrixMap()
{
return new ScTokenMatrixMap;
commit 4e2673a5465f8c9f3124049f8240cefdeed453b3
Author: Eike Rathke
Date: Thu Aug 4 16:39:23 2016 +0200
rename MatrixDoubleRefToMatrix() to MatrixJumpConditionToMatrix()
... because that is actually where and how it is used and functionality is
to
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/gdi/x11cairotextrender.cxx | 23 +--
1 file changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 705d7597480b2307d7e4929ce9386d80ce2a0f16
Author: Caolán McNamara
Date: Thu Aug 4 17:23:30 2016 +0100
Related: tdf#101213 speculative drop of CAIRO_OPERATOR_DIFFERENCE use
for tdf#99446 and rhbz#1283420 there is a hackaround which ended up in
5.1.5,
which is not in 5.1.4, for corrupt glyphs under X. I can still reproduce the
problem if I drop the CAIRO_OPERATOR_DIFFERENCE usage here with master and
gtk2.
This alternative hackaround to force a read of the underlying surface works
just as well (help->license information is the reproducer).
Change-Id: Ie3c5b07409537a1734226b4ce034620351297e25
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx
b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index cf8bc99..f25ed1f 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -38,10 +38,6 @@ struct _XRegion
BOX extents;
};
-#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
-#define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
-#endif
-
X11CairoTextRender::X11CairoTextRender(X11SalGraphics& rParent)
: mrParent(rParent)
{
@@ -56,17 +52,16 @@ cairo_t* X11CairoTextRender::getCairoContext()
{
cairo_t *cr = mrParent.getCairoContext();
-//rhbz#1283420 bodge to draw and undraw something which has the side effect
-//of making the mysterious xrender related problem go away
-if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
+//rhbz#1283420 bodge to force a read from the underlying surface which has
+//the side effect of making the mysterious xrender related problem go away
{
-cairo_save(cr);
-cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
-cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
-cairo_rectangle(cr, 0, 0, 1, 1);
-cairo_fill_preserve(cr);
-cairo_fill(cr);
-cairo_restore(cr);
+cairo_surface_t *target = cairo_get_target(cr);
+cairo_surface_t *throw_away = cairo_surface_create_similar(target,
cairo_surface_get_content(target), 1, 1);
+cairo_t *force_read_cr = cairo_create(throw_away);
+cairo_set_source_surface(force_read_cr, target, 0, 0);
+cairo_paint(force_read_cr);
+cairo_destroy(force_read_cr);
+cairo_surface_destroy(throw_away);
}
return cr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
Present: + Jan-Marek, Michael M, Kendy, Miklos, Christian, Caolán, Robinson, jan i, Sophie, Bjoern, Heiko, Olivier, Eike, Michael S * Completed Action Items: + re-work large-scale cosmetic change page proposal (Michael M) + https://wiki.documentfoundation.org/Development/LargeScaleChanges * Pending Action Items: + poke at MSDN licenses (Michael) [ waiting for a response on new process, on holiday ? ] + investigate a cron job that queries & auto-merges (Norbert) [ the solution proposed by David - using his query & a JSON script to refine it - will work - needs a bit more python (Norbert) ] + tweak UI and get LiveConnect API key / build case for board (Christian) + attempt to re-build a recent gstreamer 1.0 / core spec file on our CentOS6 base (tdf#94508) (Christian) * Release Engineering update (Christian) + 5.1.5 and 5.2.0 released as final yesterday + 5.1.6 - in October + 5.2.1 RC1 + due next week, tag Tuesday + RC2 2 week later + Android & iOS Remote + report wrt. performance regression in calc in 5.1.5 vs. 5.1.4 (Bjoern) + https://bugs.documentfoundation.org/show_bug.cgi?id=101213 + Linux issue, perhaps Idle related ? + not PPA only - TDF builds too, apparently only on old distros. + glib related problem ? (Michael) * LibreOffice Conference in Brno (Kendy) + https://blog.documentfoundation.org/blog/2016/04/08/libreoffice-brno-conference-call-for-paper/ + need to start weeding out weaker papers (Kendy) + and accepting people's papers. AI: + Program committee to work on it (Kendy, Thorsten, Italo, Marina) + travelling to Brno -> fly to Prague / Vienna unlikely to go direct (BMI has a flight from Munich, others from London). + https://conference.libreoffice.org/2016/practical-info/general-planing/ + Community-day -> no ESC, meet in the evening. * Membership Committee plug (Michael) + Please send nominations and self-nominations via e-mail to electi...@documentfoundation.org (which reaches the Board of Directors in private) and also (!) to board-disc...@documentfoundation.org (which is a public mailing list). We kindly ask nominees who would like to stand for elections to provide a statement of up to 75 words on their candidacy as continuous text (so no bullet lists or multiple paragraphs). In addition, please also provide your full name, e-mail address and your corporate affiliation, if any, and please announce that you will provide information on all future changes as soon as possible. + tooling uses git & is user-friendly for devs. * Documentation (Olivier) + Added patch enhancing Classification (TSCP/BAF/BAILs) help page. + patch in gerrit. + Amend patch for Menu Help->Get Help Online. + infra will decide where to direct it → hub.libreoffice.org + reviewing the Calc guide vs. 4.x - needs lots of updating for 5 * GSoC 2016 (?) + Next deadline is August 23rd for final evaluation. + reminder - blogging at a minimum helps docs / QA teams etc. * Adding Breeze, Sifr, and Tango originals to LibO git / gerrit (Heiko) + Breeze was started by Nitro at github + the originals were there + this repo was abandoned / retired https://plus.google.com/+NitruxInside/posts/SoxqbwVaPjN + now somewhere else. https://github.com/apachelogger/plasma-next-icons + do we want to store it ? + Sifr, Tango added later by Jay + improved these icon sets - be ideal to host them in our repo. + for now - only the SVG (which we don't use) + missing piece is ? (Michael) + commit access for contributors (Heiko) + will TDF be the maintainers or just have a copy (Cloph) + how well does it fit with our naming ? (Michael) + its LibreOffice focused anyway (Heiko) + so no re-naming / etc. needed + why not just do it in core ? (Bjoern) + just add the SVGs to core.git (Heiko) + for Elementary this is already the case (Bjoern) => find out who needs commit access & enable them to do it. AI: + find out who those people are (Heiko) + encourage them to commit only to icon-themes/ and add SVGs. * Anonymous/low reputation upvoting on ask.libreoffice (Heiko) + https://bugs.documentfoundation.org/show_bug.cgi?id=101267 + voting is not used because of the restrictive procedure (max v=11 at 7k views) + voting is just a minor additional cue to relevance, "spamming" would be white noise + get a better result if we give voting to more people ? + status on ask site is you need 5 karma points to up-vote (Cloph) + you gain 10 if your question is up-voted - so a very low bar + don't want spam questions to be up-voted before they use them. + just need to encourage people to vote (Cloph) => continue discussion with infra.
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar.ui | 333 +- 1 file changed, 246 insertions(+), 87 deletions(-) New commits: commit f13b2af50ebb4c32694c4fea5703796586b5b8ee Author: Szymon KÅos Date: Thu Aug 4 18:05:45 2016 +0200 GSoC notebookbar: updated .ui files Change-Id: Ibc79cb49ed85ba3d96811bc5790faa16ea488472 diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index c156c41..1ed4f9c 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -14,6 +14,11 @@ False cmd/lc_comparedocuments.png + +True +False +cmd/lc_crop.png + True False @@ -44,6 +49,11 @@ False cmd/lc_gallery.png + +True +False +cmd/lc_graphicdialog.png + True False @@ -433,14 +443,24 @@ False vertical - + True -True -True -.uno:Cut -none -0 -True +False +False + + +False +True +False +True +.uno:Cut +True + + +False +True + + False @@ -449,14 +469,24 @@ - + True -True -True -.uno:Copy -none -0 -True +False +False + + +False +True +False +True +.uno:Copy +True + + +False +True + + False @@ -633,6 +663,18 @@ + +True +False +vertical + + +False +True +1 + + + True False @@ -669,7 +711,32 @@ False True -1 +2 + + + + +True +False +vertical + + +False +True +end +3 + + + + +True +False +vertical + + +False +True +4 @@ -710,7 +777,7 @@ False True end -2 +5
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/richstring.hxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 0d8f433144413952ffe1c228289a558fc056094c
Author: Jochen Nitschke
Date: Thu Aug 4 15:58:13 2016 +0200
remove unused enum
last user of BiffFontPortionMode was removed with
commit 18825a4d596f69793ee11e643f6ea34317a880c9
Change-Id: Ia352008ae9ac17966e952dd0ecad53cf7fb4424a
Reviewed-on: https://gerrit.libreoffice.org/27880
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/sc/source/filter/inc/richstring.hxx
b/sc/source/filter/inc/richstring.hxx
index e00aad4..ad5789e 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -74,13 +74,6 @@ private:
typedef std::shared_ptr< RichStringPortion > RichStringPortionRef;
-enum BiffFontPortionMode
-{
-BIFF_FONTPORTION_8BIT, /// Font portion with 8-bit values.
-BIFF_FONTPORTION_16BIT, /// Font portion with 16-bit values.
-BIFF_FONTPORTION_OBJ/// Font portion in OBJ or TXO record.
-};
-
/** Represents a position in a rich-string containing current font identifier.
This object stores the position of a formatted character in a rich-string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf |binary
writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf |binary
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 49
+-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +
4 files changed, 31 insertions(+), 24 deletions(-)
New commits:
commit 51ea0875a7d3c6cd794cdec885b610efe635544c
Author: Caolán McNamara
Date: Fri Jul 29 08:48:22 2016 +0100
fftester: null DestinationText
(cherry picked from commit 0dd22165346f4296718656d17ae98ebbfe563719)
Change-Id: Icdd71733c4e9f4b36e6e957e4dea772087890faa
Reviewed-on: https://gerrit.libreoffice.org/27670
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
b/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf
new file mode 100644
index 000..63465b0
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-1.rtf differ
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
b/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf
new file mode 100644
index 000..f0152b0
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/fail/destinationtest-2.rtf differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d51dd1d..8b2efd6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -186,26 +186,27 @@ static util::DateTime lcl_getDateTime(RTFParserState&
aState)
aState.nDay, aState.nMonth, aState.nYear, false);
}
-static void lcl_DestinationToMath(OUStringBuffer& rDestinationText,
oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor)
+static void lcl_DestinationToMath(OUStringBuffer* pDestinationText,
oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor)
{
-OUString aStr = rDestinationText.makeStringAndClear();
-if (!aStr.isEmpty())
-{
-rMathBuffer.appendOpeningTag(M_TOKEN(r));
-if (rMathNor)
-{
-rMathBuffer.appendOpeningTag(M_TOKEN(rPr));
-// Same as M_TOKEN(lit)
-rMathBuffer.appendOpeningTag(M_TOKEN(nor));
-rMathBuffer.appendClosingTag(M_TOKEN(nor));
-rMathBuffer.appendClosingTag(M_TOKEN(rPr));
-rMathNor = false;
-}
-rMathBuffer.appendOpeningTag(M_TOKEN(t));
-rMathBuffer.appendCharacters(aStr);
-rMathBuffer.appendClosingTag(M_TOKEN(t));
-rMathBuffer.appendClosingTag(M_TOKEN(r));
-}
+if (!pDestinationText)
+return;
+OUString aStr = pDestinationText->makeStringAndClear();
+if (aStr.isEmpty())
+return;
+rMathBuffer.appendOpeningTag(M_TOKEN(r));
+if (rMathNor)
+{
+rMathBuffer.appendOpeningTag(M_TOKEN(rPr));
+// Same as M_TOKEN(lit)
+rMathBuffer.appendOpeningTag(M_TOKEN(nor));
+rMathBuffer.appendClosingTag(M_TOKEN(nor));
+rMathBuffer.appendClosingTag(M_TOKEN(rPr));
+rMathNor = false;
+}
+rMathBuffer.appendOpeningTag(M_TOKEN(t));
+rMathBuffer.appendCharacters(aStr);
+rMathBuffer.appendClosingTag(M_TOKEN(t));
+rMathBuffer.appendClosingTag(M_TOKEN(r));
}
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const&
xContext,
@@ -1210,7 +1211,7 @@ void RTFDocumentImpl::text(OUString& rString)
rString = rString.copy(0, rString.getLength() - 1);
bEnd = true;
}
-m_aStates.top().pDestinationText->append(rString);
+m_aStates.top().appendDestinationText(rString);
if (bEnd)
{
// always clear, necessary in case of group-less fonttable
@@ -1314,7 +1315,7 @@ void RTFDocumentImpl::text(OUString& rString)
case Destination::MGROW:
case Destination::INDEXENTRY:
case Destination::TOCENTRY:
-m_aStates.top().pDestinationText->append(rString);
+m_aStates.top().appendDestinationText(rString);
break;
default:
bRet = false;
@@ -1343,7 +1344,7 @@ void RTFDocumentImpl::text(OUString& rString)
// Don't return earlier, a bookmark start has to be in a paragraph group.
if (m_aStates.top().eDestination == Destination::BOOKMARKSTART)
{
-m_aStates.top().pDestinationText->append(rString);
+m_aStates.top().appendDestinationText(rString);
return;
}
@@ -5111,7 +5112,7 @@ RTFError RTFDocumentImpl::pushState()
m_aStates.top().eRunType = RTFParserState::LOCH;
if (m_aStates.top().eDestination == Destination::MR)
-lcl_DestinationToMath(*m_aStates.top().pDestinationText,
m_aMathBuffer, m_bMathNor);
+lcl_DestinationToMath(m_aStates.top().pDestinationText,
m_aMathBuffer, m_bMathNor);
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/control/edit.cxx| 30 --
vcl/source/control/listbox.cxx |8
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 628a21e7e4dad565f676252fdd50cd7423e12f6f
Author: Caolán McNamara
Date: Thu Aug 4 15:46:48 2016 +0100
like listbox put margins on both sides of an edit too
Change-Id: I425b1005297b20ace85181edce72ab5829006a0e
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 8e41d0e..d4d9936 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1819,15 +1819,12 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
if ( GetStyle() & WB_CENTER )
nTextStyle |= DrawTextFlags::Center;
else if ( GetStyle() & WB_RIGHT )
-{
nTextStyle |= DrawTextFlags::Right;
-aTextRect.Left() += nOffX;
-}
else
-{
nTextStyle |= DrawTextFlags::Left;
-aTextRect.Right() -= nOffX;
-}
+
+aTextRect.Left() += nOffX;
+aTextRect.Right() -= nOffX;
OUStringaText = ImplGetText();
longnTextHeight = pDev->GetTextHeight();
commit cc62d87d5f1abcff2affd56f1077114289c68c7e
Author: Caolán McNamara
Date: Thu Aug 4 15:43:37 2016 +0100
use same scheme in Edit and ListBox for rendering text in ::Draw
Change-Id: I5b17103e838f221cf3815002979c6b8c9c443300
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b6a4989..8e41d0e 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1811,11 +1811,27 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
}
}
+const long nOnePixel = GetDrawPixel( pDev, 1 );
+const long nOffX = 3*nOnePixel;
+DrawTextFlags nTextStyle = DrawTextFlags::VCenter;
+Rectangle aTextRect( aPos, aSize );
+
+if ( GetStyle() & WB_CENTER )
+nTextStyle |= DrawTextFlags::Center;
+else if ( GetStyle() & WB_RIGHT )
+{
+nTextStyle |= DrawTextFlags::Right;
+aTextRect.Left() += nOffX;
+}
+else
+{
+nTextStyle |= DrawTextFlags::Left;
+aTextRect.Right() -= nOffX;
+}
+
OUStringaText = ImplGetText();
longnTextHeight = pDev->GetTextHeight();
longnTextWidth = pDev->GetTextWidth( aText );
-longnOnePixel = GetDrawPixel( pDev, 1 );
-longnOffX = 3*nOnePixel;
longnOffY = (aSize.Height() - nTextHeight) / 2;
// Clipping?
@@ -1829,18 +1845,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
pDev->IntersectClipRegion( aClip );
}
-if ( GetStyle() & WB_CENTER )
-{
-aPos.X() += (aSize.Width() - nTextWidth) / 2;
-nOffX = 0;
-}
-else if ( GetStyle() & WB_RIGHT )
-{
-aPos.X() += aSize.Width() - nTextWidth;
-nOffX = -nOffX;
-}
-
-pDev->DrawText( Point( aPos.X() + nOffX, aPos.Y() + nOffY ), aText );
+pDev->DrawText( aTextRect, aText, nTextStyle );
pDev->Pop();
if ( GetSubEdit() )
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 5b35044..b95c1dc 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -412,7 +412,8 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, Dr
}
}
-long nOnePixel = GetDrawPixel( pDev, 1 );
+const long nOnePixel = GetDrawPixel( pDev, 1 );
+const long nOffX = 3*nOnePixel;
DrawTextFlags nTextStyle = DrawTextFlags::VCenter;
Rectangle aTextRect( aPos, aSize );
@@ -423,15 +424,14 @@ void ListBox::Draw( OutputDevice* pDev, const Point&
rPos, const Size& rSize, Dr
else
nTextStyle |= DrawTextFlags::Left;
-aTextRect.Left() += 3*nOnePixel;
-aTextRect.Right() -= 3*nOnePixel;
+aTextRect.Left() += nOffX;
+aTextRect.Right() -= nOffX;
if ( IsDropDownBox() )
{
OUString aText = GetSelectEntry();
long nTextHeight = pDev->GetTextHeight();
long nTextWidth = pDev->GetTextWidth( aText );
-long nOffX = 3*nOnePixel;
long nOffY = (aSize.Height()-nTextHeight) / 2;
// Clipping?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - config_host.mk.in configure.ac desktop/CppunitTest_desktop_app.mk instsetoo_native/util Makefile.in registry/Module_registry.mk scp2/source solenv/bin sysui
Makefile.in | 24 +++---
config_host.mk.in|2
configure.ac | 21 ++---
desktop/CppunitTest_desktop_app.mk |8 ++
instsetoo_native/util/openoffice.lst.in |2
registry/Module_registry.mk |3
scp2/source/ooo/directory_ooo_macosx.scp |2
solenv/bin/macosx-codesign-app-bundle| 123 ---
solenv/bin/ooinstall |5 -
sysui/desktop/macosx/Info.plist.in |4 -
10 files changed, 103 insertions(+), 91 deletions(-)
New commits:
commit 97746e61ffe48cf3612d2dff5535914a8a1219f6
Author: Tor Lillqvist
Date: Thu Aug 4 17:32:29 2016 +0300
Update to match what has been used for the products in the Mac App Store
Hopefully will not break building for a dmg-stye distribution.
Change-Id: Ibf32bb8e43fe4745461eb78e9e7e60d37163934f
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index 37245c1..e7942eb 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -1,9 +1,8 @@
#!/bin/bash
-# Script to sign dylibs and frameworks in an app bundle plus the
-# bundle itself. Called from
-# installer::simplepackage::create_package() in
-# solenv/bin/modules/installer/simplepackage.pm
+# Script to sign executables, dylibs and frameworks in an app bundle
+# plus the bundle itself. Called from
+# the test-install target in Makefile.in
test `uname` = Darwin || { echo This is for OS X only; exit 1; }
@@ -19,91 +18,97 @@ for V in \
fi
done
-echo "codesigning using
MACSOX_CODESIGNING_IDENTITY=[${MACOSX_CODESIGNING_IDENTITY?}]"
-
APP_BUNDLE="$1"
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
+# In a sandboxed build executables need the entitlements
+entitlements="--entitlements $BUILDDIR/lo.xcent"
+# We use --enable-canonical-installation-tree-structure so all
+# data files in Resources are included in the app bundle signature
+# through that. I think.
+other_files=''
+else
+# In a non-sandboxed build (distributed outside the App Store)
+# we traditionally have use --resource-rules. Let's not touch that?
+resource_rules="--resource-rules
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
+# And there we then want to sign data files, too, hmm.
+other_files="\
+ -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
+ -or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name
'LICENSE.html' \
+ -or -name '*.applescript' -or -name '*.odt'"
+fi
+
# Sign dylibs
#
-# Executables get signed right after linking, see
-# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
-# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
-# right after linking. So do it here.
-#
# The dylibs in the Python framework are called *.so. Go figure
#
# On Mavericks also would like to have data files signed...
# add some where it makes sense. Make a depth-first search to sign the contents
# of e.g. the spotlight plugin before attempting to sign the plugin itself
-find -d "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.so' -or -name '*.fodt'
-or -name '*.odt' \
--or -name 'schema.strings' -or -name 'schema.xml' -or -name
'*.mdimporter' \
--or -name '*.jar' -or -name '*.jnilib' -or -name 'LICENSE' -or -name
'LICENSE.html' \
--or -name '*.applescript' \) ! -type l | grep -v
"LibreOfficePython\.framework" | \
+find "$APP_BUNDLE" \( -name '*.dylib' -or -name '*.dylib.*' -or -name '*.so' \
+$other_files \) ! -type l |
while read file; do
id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign
"$MACOSX_CODESIGNING_IDENTITY" "$file" || exit 1
done
-find "$APP_BUNDLE" -name '*.dylib.*' ! -type l | \
-while read dylib; do \
-id=`basename "$dylib"`; \
-id=`echo $id | sed -e 's/dylib.*/dylib/'`; \
-codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign
"$MACOSX_CODESIGNING_IDENTITY" "$dylib" || exit 1
+# Sign executables
+
+find "$APP_BUNDLE/Contents/MacOS" -type f |
+while read file; do
+id=`echo ${file#${APP_BUNDLE}/Contents/} | sed -e 's,/,.,g'`
+codesign --force --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$file"
done
-# The executables have already been signed by
-# gb_LinkTarget__command_dynamiclink in
-# solenv/gbuild/platform/macosx.mk, but sign the handful of scripts remaining
-# in MacOS
-# ( "OS X
-# Code Signing In Depth" suggests we should get rid of them rather sooner than
-# later, but they appear to be OK for now):
-
-for i in python senddoc unoinfo
-do
-if [ -f "$APP_BUNDLE/Contents/MacOS/$i" ]
-then
-codesign --verbose --identifier="$MACOSX_BUNDLE_I
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/window/menufloatingwindow.cxx | 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
New commits:
commit 1288a0682ab4c960915722d2bb52a200e75580a3
Author: Caolán McNamara
Date: Tue Aug 2 13:08:39 2016 +0100
Related: tdf#92516 make menu accelerators always work even if...
keyboard not used yet.
The gtk2/3 menus appear to work this way. (And when not in gtk2/3
it shouldn't disable the accelerators for other platforms anyway)
(cherry picked from commit f6d0d92a5e249413df99a7f3677a28efe6d45426)
Change-Id: Ib7a99bd9039cd07120b3b77380f810b5b028fd57
Reviewed-on: https://gerrit.libreoffice.org/27795
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/window/menufloatingwindow.cxx
b/vcl/source/window/menufloatingwindow.cxx
index 1cb95ed..b6d6c96 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1112,18 +1112,9 @@ void MenuFloatingWindow::KeyInput( const KeyEvent&
rKEvent )
sal_Unicode nCharCode = rKEvent.GetCharCode();
sal_uInt16 nPos = 0;
sal_uInt16 nDuplicates = 0;
-MenuItemData* pData = (nCharCode && pMenu) ?
+MenuItemData* pData = (nCharCode && pMenu &&
ImplGetSVData()->maNWFData.mbEnableAccel) ?
pMenu->GetItemList()->SearchItem(nCharCode,
rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : nullptr;
-bool bConsume = false;
-bool accel = ImplGetSVData()->maNWFData.mbEnableAccel;
-if (pData && accel)
-{
-Menu *men = pMenu;
-while (men && !men->IsMenuBar())
-men = men->pStartedFrom;
-bConsume = !men ||
(static_cast(men->pWindow.get()))->GetMBWMenuKey();
-}
-if (bConsume)
+if (pData)
{
if ( pData->pSubMenu || nDuplicates > 1 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl svl/source
include/svl/undo.hxx |5 +
svl/source/undo/undo.cxx |8
2 files changed, 13 insertions(+)
New commits:
commit 33a5ab1eb74d140265b471fb33ca98aca7cfb1a6
Author: Miklos Vajna
Date: Thu Aug 4 15:55:45 2016 +0200
svl: track creation time of SfxUndoAction instances
It's not yet clear how to expose this on the UI, though.
Change-Id: Iee6737922d36e896653b4fae557442747dda1b8b
Reviewed-on: https://gerrit.libreoffice.org/27878
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 032738e..789fd17 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -21,6 +21,7 @@
#include
#include
+#include
#include
#include
@@ -61,11 +62,15 @@ public:
virtual sal_uInt16 GetId() const;
/// ID of the view shell that created this undo action.
virtual sal_Int32 GetViewShellId() const;
+/// Timestamp when this undo item was created.
+const DateTime& GetDateTime() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
private:
SfxUndoAction( const SfxUndoAction& ) = delete;
SfxUndoAction& operator=( const SfxUndoAction& ) = delete;
+
+DateTime m_aDateTime;
};
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index a198f27..7ccafe3 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -51,6 +52,7 @@ SfxUndoAction::~SfxUndoAction()
SfxUndoAction::SfxUndoAction()
+: m_aDateTime(DateTime::SYSTEM)
{
}
@@ -77,6 +79,11 @@ sal_Int32 SfxUndoAction::GetViewShellId() const
return -1;
}
+const DateTime& SfxUndoAction::GetDateTime() const
+{
+return m_aDateTime;
+}
+
OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
{
return GetComment();
@@ -130,6 +137,7 @@ void SfxUndoAction::dumpAsXml(xmlTextWriterPtr pWriter)
const
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("symbol"),
BAD_CAST(typeid(*this).name()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("comment"),
BAD_CAST(GetComment().toUtf8().getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("viewShellId"),
BAD_CAST(OString::number(GetViewShellId()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("dateTime"),
BAD_CAST(utl::toISO8601(m_aDateTime.GetUNODateTime()).toUtf8().getStr()));
xmlTextWriterEndElement(pWriter);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
sw/source/core/text/itrcrsr.cxx |1 +
sw/source/core/text/porfly.cxx |5 +
sw/source/core/text/porfly.hxx |1 +
3 files changed, 7 insertions(+)
New commits:
commit 5703c3bdf1f4b60067207993f9f42430d9901e1c
Author: Caolán McNamara
Date: Thu Aug 4 08:50:57 2016 +0100
Resolves: tdf#101269 cannot click/edit text inside a frame
regression from...
commit b0c0a074a2318a231f3f635784da494f1b713c53
Date: Mon Apr 18 11:03:43 2016 +0200
clang-tidy clang-analyzer-deadcode.DeadStores
suspect that some of these may reveal latent bugs
and restore method then removed by
commit 47f62540bd2c2f107313bb0c6f141cd4460b6379
Date: Thu May 19 10:31:47 2016 +0200
loplugin:unusedmethods in sw
Change-Id: I14826eecadbc1a74e408f8907eea8746debe4db4
(cherry picked from commit 24c009de4d6d27233027e9bcd86ea181d230be8f)
pPos can never be null
Change-Id: Ib7b57d628fbd80a1d2214917cd439e09d4803d91
(cherry picked from commit 2702796806cae2b28ae78e78d29c3559bf97607e)
SwLinePortion::GetCursorOfst is const and its ret is ignored here
so nOfst is unnecessary
Change-Id: I27f73057b55ebdf30eb69a19ee1b0647ba25583e
(cherry picked from commit 35f4248206e844cabd83757ec57ddde1c2ef66b4)
only called if !bDraw
Change-Id: I7310b5f8cbbc4176e76d92ce2bcd49168470843c
(cherry picked from commit cc7a55450658696009fe01e94632e80bb3785d5b)
the sole caller is ok with rPoint being modified, so change to non-const arg
Change-Id: I40a24502e2e8ad312e13e0c47ee1fde3118d2251
(cherry picked from commit 2b3112b30a8dea8a009c11ddb209e12697f72e32)
Reviewed-on: https://gerrit.libreoffice.org/27865
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 3f8acaa..b6f9928 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1713,6 +1713,7 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos,
const Point &rPoint,
if( bChgNodeInner && pTmp->Frame().IsInside( aTmpPoint ) &&
!( pTmp->IsProtected() ) )
{
+
static_cast(pPor)->GetFlyCursorOfst(aTmpPoint, *pPos, pCMS);
// After a change of the frame, our font must be still
// available for/in the OutputDevice.
// For comparison: Paint and new SwFlyCntPortion !
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 0eca9ca..e38e99d 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -414,6 +414,11 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame,
const Point &rBase,
}
}
+void SwFlyCntPortion::GetFlyCursorOfst(Point &rPoint, SwPosition &rPos,
SwCursorMoveState* pCMS) const
+{
+GetFlyFrame()->GetCursorOfst(&rPos, rPoint, pCMS);
+}
+
sal_Int32 SwFlyCntPortion::GetCursorOfst( const sal_uInt16 nOfst ) const
{
// OSL_FAIL("SwFlyCntPortion::GetCursorOfst: use GetFlyCursorOfst()");
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 417c347..129bf39 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -79,6 +79,7 @@ public:
long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent,
AsCharFlags nFlags );
+void GetFlyCursorOfst(Point &rPoint, SwPosition& rPos, SwCursorMoveState*
pCMS) const;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |5 +
vcl/source/edit/vclmedit.cxx |7 +--
vcl/source/window/window2.cxx |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 5a5db03acc605a02c76c0f2977079b3dcf48de22
Author: Caolán McNamara
Date: Thu Aug 4 12:12:40 2016 +0100
Resolves: tdf#97120 printing controls uses wrong font and font sizes
regression apparently since
commit 825b3df7f1d987021ec4a08ff8e7ed78e5772c97
Date: Thu Oct 22 19:03:01 2015 +0200
tdf#94138 fix printing of edit form fields
revert the GetDrawPixelFont part of that so the font is pulled
from the control and not the device its printed to, this makes
tdf#97120 and tdf#97120 work properly again
then revert
commit 6c41727484a04ab89005ffb052937dae5d7dc223
Date: Tue Dec 1 17:44:23 2015 +0100
tdf#94138 Use correct fonts for multiline edit when printing
because that replicates the original GetDrawPixelFont behaviour
so its not needed after the other revert.
Then, to solve the original tdf#94138, in the edit StateChanged handler call
ApplySettings(*this); like FixedText::StateChanged does to merge in the
controlfont setting to the underlying OutputDevice of the control, which
presumably is what is then retrieved from GetDrawPixelFont
Change-Id: I992a0e2011ffce7748d39f7f2bc49fbf6b8eaa79
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0f64127..b6a4989 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2238,6 +2238,7 @@ void Edit::StateChanged( StateChangedType nType )
{
if (!mpSubEdit)
{
+ApplySettings(*this);
ImplShowCursor();
Invalidate();
}
@@ -2246,6 +2247,7 @@ void Edit::StateChanged( StateChangedType nType )
{
if (!mpSubEdit)
{
+ApplySettings(*this);
ImplShowCursor();
Invalidate();
}
@@ -2254,6 +2256,7 @@ void Edit::StateChanged( StateChangedType nType )
{
if (!mpSubEdit)
{
+ApplySettings(*this);
Invalidate();
}
}
@@ -2261,6 +2264,7 @@ void Edit::StateChanged( StateChangedType nType )
{
if (!mpSubEdit)
{
+ApplySettings(*this);
Invalidate();
}
}
@@ -2277,6 +2281,7 @@ void Edit::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( !mpSubEdit )
{
+ApplySettings(*this);
ImplShowCursor();
Invalidate();
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index a1b3a21..3079dbd 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1360,12 +1360,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const
Point& rPos, const Size&
Point aPos = pDev->LogicToPixel( rPos );
Size aSize = pDev->LogicToPixel( rSize );
-vcl::Font aFont = pImpVclMEdit->GetTextWindow()->GetPointFont(*this);
-Size aFontSize = aFont.GetFontSize();
-MapMode aPtMapMode(MAP_POINT);
-aFontSize = pDev->LogicToPixel(aFontSize, aPtMapMode);
-aFont.SetFontSize(aFontSize);
-
+vcl::Font aFont = pImpVclMEdit->GetTextWindow()->GetDrawPixelFont(pDev);
aFont.SetTransparent( true );
OutDevType eOutDevType = pDev->GetOutDevType();
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 17b48cb..9149863 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -644,7 +644,7 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
vcl::Font Window::GetDrawPixelFont(OutputDevice* pDev) const
{
-vcl::Font aFont = GetPointFont(*pDev);
+vcl::Font aFont = GetPointFont(*const_cast(this));
Size aFontSize = aFont.GetFontSize();
MapMode aPtMapMode(MAP_POINT);
aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - icon-themes/galaxy
icon-themes/galaxy/cmd/lc_freezepanes.png |binary icon-themes/galaxy/cmd/lc_resetattributes.png |binary icon-themes/galaxy/cmd/sc_styleupdatebyexample.png |binary 3 files changed New commits: commit 32b4c63a8915bfeda0c7912e2b61295aa4cfa4b0 Author: Yousuf Philips Date: Thu Aug 4 09:17:17 2016 +0400 Galaxy: Minor fixes to newly created icons Change-Id: I8c3deef63cf48dc8d7334df5baa5e49fc49a9e6a Reviewed-on: https://gerrit.libreoffice.org/27860 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/icon-themes/galaxy/cmd/lc_freezepanes.png b/icon-themes/galaxy/cmd/lc_freezepanes.png index fdad6a9..d3aacc9 100644 Binary files a/icon-themes/galaxy/cmd/lc_freezepanes.png and b/icon-themes/galaxy/cmd/lc_freezepanes.png differ diff --git a/icon-themes/galaxy/cmd/lc_resetattributes.png b/icon-themes/galaxy/cmd/lc_resetattributes.png index e490692..073a7f6 100644 Binary files a/icon-themes/galaxy/cmd/lc_resetattributes.png and b/icon-themes/galaxy/cmd/lc_resetattributes.png differ diff --git a/icon-themes/galaxy/cmd/sc_styleupdatebyexample.png b/icon-themes/galaxy/cmd/sc_styleupdatebyexample.png index c06febf..4729f60 100644 Binary files a/icon-themes/galaxy/cmd/sc_styleupdatebyexample.png and b/icon-themes/galaxy/cmd/sc_styleupdatebyexample.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/links.txt |4 1 file changed, 4 insertions(+) New commits: commit c63aaa624aa6e949e127fb8ef00c4f3744c72b76 Author: Yousuf Philips Date: Thu Aug 4 13:50:33 2016 +0400 Sifr: Add thesaurus duplicate to links.txt Change-Id: I0cfecbef999bb251c1fd8829aed0a4f0268e176c Reviewed-on: https://gerrit.libreoffice.org/27870 Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index dc1e369..c17cb57 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -54,6 +54,10 @@ sc/imglst/nc06.png cmd/sc_insertannotation.png sc/imglst/nc08.png cmd/sc_insertdraw.png sc/res/table.png cmd/sc_inserttable.png +# Thesaurus +cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png +cmd/sc_thesaurusdialog.png cmd/sc_thesaurus.png + # File Menu cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/rowheightcontext.hxx |6 ++-
sc/inc/segmenttree.hxx |1
sc/source/core/data/colorscale.cxx |1
sc/source/core/data/column2.cxx | 23 ++---
sc/source/core/data/rowheightcontext.cxx |3 +
sc/source/core/data/segmenttree.cxx | 25 ++
sc/source/core/data/table1.cxx | 54 +--
7 files changed, 75 insertions(+), 38 deletions(-)
New commits:
commit ef3ca1da6b6d994ea8c39f28a49a599f5cf67915
Author: Markus Mohrhard
Date: Thu Aug 4 02:41:14 2016 +0200
save about 50% of the import time for nearly empty ods documents
It seems that currently most of the time is spent iterating through all
the cells to get the optimal row height. We can easily optimize by using
mdds::flat_segment_tree.
Now we don't need to iterate through all cells and instead can work on
whole blocks.
Change-Id: Id9a0686490b0e91ad6552b428c38a9f6635a7938
Reviewed-on: https://gerrit.libreoffice.org/27856
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index f801ee4..d1a8f8f 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -18,11 +18,13 @@
#include
+#include "segmenttree.hxx"
+
namespace sc {
class SC_DLLPUBLIC RowHeightContext
{
-std::vector maHeights;
+ScFlatUInt16RowSegments maHeights;
double mfPPTX;
double mfPPTY;
@@ -53,7 +55,7 @@ public:
void setForceAutoSize( bool b );
bool isForceAutoSize() const { return mbForceAutoSize;}
-std::vector& getHeightArray();
+ScFlatUInt16RowSegments& getHeightArray();
};
}
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 25eecec..897b4db 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -135,6 +135,7 @@ public:
~ScFlatUInt16RowSegments();
void setValue(SCROW nRow1, SCROW nRow2, sal_uInt16 nValue);
+void setValueIf(SCROW nRow1, SCROW nRow2, sal_uInt16 nValue, const
std::function& rPredicate);
sal_uInt16 getValue(SCROW nRow);
sal_uInt32 getSumValue(SCROW nRow1, SCROW nRow2);
bool getRangeData(SCROW nRow, RangeData& rData);
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index da7f42e6..cfd6acf 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -956,6 +956,7 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const
ScAddress& rAddr) const
nValMax = CalcValue(nMin, nMax, itr);
++itr;
}
+
if(nVal >= nValMax)
++nIndex;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index d3ed5e4..cae1ff5 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -785,7 +785,7 @@ static sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr&
rPattern, sal_uInt16
void ScColumn::GetOptimalHeight(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, sal_uInt16
nMinHeight, SCROW nMinStart )
{
-std::vector& rHeights = rCxt.getHeightArray();
+ScFlatUInt16RowSegments& rHeights = rCxt.getHeightArray();
ScAttrIterator aIter( pAttrArray, nStartRow, nEndRow );
SCROW nStart = -1;
@@ -887,9 +887,8 @@ void ScColumn::GetOptimalHeight(
if ( nDefHeight <= nMinHeight && nStdEnd >= nMinStart )
nStdEnd = (nMinStart>0) ? nMinStart-1 : 0;
-for (SCROW nRow = nStart; nRow <= nStdEnd; ++nRow)
-if (nDefHeight > rHeights[nRow-nStartRow])
-rHeights[nRow-nStartRow] = nDefHeight;
+if (nStart <= nStdEnd)
+rHeights.setValueIf(nStart, nStdEnd, nDefHeight,
[=](sal_uInt16 nRowHeight){ return nDefHeight > nRowHeight; });
if ( bStdOnly )
{
@@ -910,22 +909,22 @@ void ScColumn::GetOptimalHeight(
{
if ( nCjkHeight == 0 )
nCjkHeight = lcl_GetAttribHeight(
*pPattern, ATTR_CJK_FONT_HEIGHT );
-if (nCjkHeight > rHeights[nRow-nStartRow])
-rHeights[nRow-nStartRow] = nCjkHeight;
+if (nCjkHeight > rHeights.getValue(nRow))
+rHeights.setValue(nRow, nRow, nCjkHeight);
}
else if ( nScript == SvtScriptType::COMPLEX )
{
if ( nCtlHeight == 0 )
nCtlHeight = lcl_GetAttribHeight(
*pPattern, ATTR_CTL_FONT_HEIGHT );
-if (nCtlHeight > rHeights[nRow-nStartRow])
-rHeights[nRow-nStartRow] = nCtlHeight;
+if (nCtlHeight > rHeights.
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05020301.xhp | 65 ++--- 1 file changed, 53 insertions(+), 12 deletions(-) New commits: commit 63f0834e7b6747c46e3e4402ee5acd7fcc596d2b Author: Laurent Balland-Poirier Date: Wed Aug 3 17:13:56 2016 +0200 Update Number formats Codes - Insert bookmark links - Add 4th section (text) of a format - Add fraction representation - Correct uppercase for time formats codes, + warning disambiguation minute/month Change-Id: Ib2ba34c9572db340909f7efb4da45fa978b8dad2 Reviewed-on: https://gerrit.libreoffice.org/27831 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp index f06d812..934a9bf 100644 --- a/source/text/shared/01/05020301.xhp +++ b/source/text/shared/01/05020301.xhp @@ -36,10 +36,14 @@ Euro; currency formats date formats times, formats +percentages, formats +scientific notation, formats +engineering notation, formats +fraction, formats mw made "time formats" a two level entry and deleted 2x "formats;" Number Format Codes -Number format codes can consist of up to three sections separated by a semicolon (;). +Number format codes can consist of up to four sections separated by a semicolon (;). In a number format code with two sections, the first section applies to positive values and zero, and the second section applies to negative values. @@ -50,6 +54,9 @@ You can also assign conditions to the three sections, so that the format is only applied if a condition is met. + +Fourth section applies if the content is not a value, but some text. Content is represented by an at sign (@). + Decimal Places and Significant Digits Use zero (0), the number sign (#) or the question mark (?) as placeholders in your number format code to represent numbers. The (#) only displays significant digits, while the (0) displays zeroes if there are fewer digits in the number than in the number format. The (?) works as the (#) but adds a space character to keep decimal alignment if there is a hidden non-significant zero. @@ -151,7 +158,7 @@ Thousands Separator -Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000. +Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000 for each separator. @@ -228,20 +235,29 @@ You can define a number format so that it only applies when the condition that you specify is met. Conditions are enclosed by square brackets [ ]. You can use any combination of numbers and the <, <=, >, >=, = and <> operators. For example, if you want to apply different colors to different temperature data, enter: -[BLUE][<0]#,0 "°C";[RED][>30]#,0 "°C";[BLACK]#,0 "°C" +[BLUE][<0]#.0 "°C";[RED][>30]#.0 "°C";[BLACK]#.0 "°C" All temperatures below zero are blue, temperatures between 0 and 30 °C are black, and temperatures higher than 30 °C are red. Positive and Negative Numbers To define a number format that adds a different text to a number depending on if the number is positive, negative, or equal to zero, use the following format: "plus" 0;"minus" 0;"null" 0 -Percentages and Scientific Notation + +Percentages, Scientific Notation and Fraction Representation Percentages To display numbers as percentages, add the percent sign (%) to the number format. Scientific Notation Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 65 is written as 6.5 x 10^5, and 0.65 as 6.5 x 10^-5. Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.In %PRODUCTNAME, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part.For instance: ###.##E+00 +Fraction Representation +To represent a value as a fraction, format consists of two or three parts: integer optional part, numerator and denominator. Integer and numerator are separated by a blank or any quoted text. Numerator and denominator are separated by a slash character. Each part can consist of a combination of #, ? and 0 as placeholders. +Denominator is calculated to get the nearest value of the fraction with repsect to the number of placeholders. For example, PI value is represented as 3 16/113 with format: +# ?/??? +Denominator value can also be forced to the value repla
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eee24c0ee31714ede45d17f6f1f6c1df5aefaeb4 Author: Laurent Balland-Poirier Date: Wed Aug 3 17:13:56 2016 +0200 Updated core Project: help 63f0834e7b6747c46e3e4402ee5acd7fcc596d2b Update Number formats Codes - Insert bookmark links - Add 4th section (text) of a format - Add fraction representation - Correct uppercase for time formats codes, + warning disambiguation minute/month Change-Id: Ib2ba34c9572db340909f7efb4da45fa978b8dad2 Reviewed-on: https://gerrit.libreoffice.org/27831 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5eafdad..63f0834 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5eafdadc8a35ac5340f256c7ce44e1d2802988c8 +Subproject commit 63f0834e7b6747c46e3e4402ee5acd7fcc596d2b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/undo/undo.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit ba8fc726ebae7b1ebaf65ae462d56ee0b4af14a3
Author: Miklos Vajna
Date: Thu Aug 4 12:39:18 2016 +0200
svl: expose redo actions in SfxUndoManager::dumpAsXml()
To see if an undo action is actually deleted or just moved to the redo
stack.
Change-Id: I40632ea29353e50b643b8b1831d5ffdf443ca75a
Reviewed-on: https://gerrit.libreoffice.org/27871
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 1caf382..a198f27 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -1254,6 +1254,8 @@ void SfxUndoManager::RemoveOldestUndoAction()
void SfxUndoManager::dumpAsXml(xmlTextWriterPtr pWriter) const
{
+UndoManagerGuard aGuard(*m_xData);
+
bool bOwns = false;
if (!pWriter)
{
@@ -1264,9 +1266,23 @@ void SfxUndoManager::dumpAsXml(xmlTextWriterPtr pWriter)
const
xmlTextWriterStartElement(pWriter, BAD_CAST("sfxUndoManager"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nUndoActionCount"),
BAD_CAST(OString::number(GetUndoActionCount()).getStr()));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nRedoActionCount"),
BAD_CAST(OString::number(GetRedoActionCount()).getStr()));
+xmlTextWriterStartElement(pWriter, BAD_CAST("undoActions"));
for (size_t i = 0; i < GetUndoActionCount(); ++i)
-GetUndoAction(i)->dumpAsXml(pWriter);
+{
+const SfxUndoArray* pUndoArray = m_xData->pActUndoArray;
+pUndoArray->aUndoActions[pUndoArray->nCurUndoAction - 1 -
i].pAction->dumpAsXml(pWriter);
+}
+xmlTextWriterEndElement(pWriter);
+
+xmlTextWriterStartElement(pWriter, BAD_CAST("redoActions"));
+for (size_t i = 0; i < GetRedoActionCount(); ++i)
+{
+const SfxUndoArray* pUndoArray = m_xData->pActUndoArray;
+pUndoArray->aUndoActions[pUndoArray->nCurUndoAction +
i].pAction->dumpAsXml(pWriter);
+}
+xmlTextWriterEndElement(pWriter);
xmlTextWriterEndElement(pWriter);
if (bOwns)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/tdf78506.rtf| 24
sw/qa/extras/rtfimport/rtfimport.cxx| 17 +
writerfilter/source/rtftok/rtfdispatchvalue.cxx |3 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 20 ++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++
5 files changed, 64 insertions(+), 2 deletions(-)
New commits:
commit 428a1da60b88415e7db21353a42bed85b8b76ed9
Author: Miklos Vajna
Date: Thu Aug 4 12:37:30 2016 +0200
tdf#78506 RTF import: fix handling of invalid \levelnumbers
In case ';' is written in \u form in \levelnumbers, then Word ignores the
whole
\levelnumbers contents, do the same.
Change-Id: I93ce5810af2b5ed703e804199c0b236d2c4c36b5
Reviewed-on: https://gerrit.libreoffice.org/27869
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/rtfimport/data/tdf78506.rtf
b/sw/qa/extras/rtfimport/data/tdf78506.rtf
new file mode 100644
index 000..2978734
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf78506.rtf
@@ -0,0 +1,24 @@
+{\rtf \ansi \ansicpg0 \deff0 \stshfdbch1 \stshfloch0 \stshfhich0 \deflang1033
\deflangfe1033
+{\*\listtable
+{\list \listtemplateid700648999 \listhybrid
+{\listlevel \levelnfc0 \levelnfcn0 \leveljc0 \leveljcn0 \levelstartat1
\levelfollow0 \levelspace0 \levelindent0 \levellegal0 \levelnorestart0
+{\leveltext
+{\uc1 \u2 ?}
+{\uc1 \u0 ?}
+{\uc1 \u46 ?}
+{\uc1 \u59 ?}
+}
+{\levelnumbers \'01
+{\uc1 \u59 ?}
+}
+\li720 \lin720 \fi-360 }
+{\listname ;}
+\listid697112958 }
+}
+{\*\listoverridetable
+{\listoverride \listid697112958 \listoverridecount0 \ls1 }
+}
+\pard \plain \ls1
+Test.
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 19f44e3..048eecd 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2661,6 +2661,23 @@ DECLARE_RTFIMPORT_TEST(testFlip, "flip.rtf")
CPPUNIT_ASSERT(!aMap["MirroredY"].hasValue());
}
+DECLARE_RTFIMPORT_TEST(testTdf78506, "tdf78506.rtf")
+{
+uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1sd level
+
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == "Suffix")
+// This was '0', invalid \levelnumbers wasn't ignored.
+CPPUNIT_ASSERT_EQUAL(CHAR_ZWSP,
rProp.Value.get().toChar());
+}
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index efd71cb..30621f9 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -628,6 +628,9 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
{
if (nParam != ';')
m_aStates.top().aLevelNumbers.push_back(sal_Int32(nParam));
+else
+// ';' in \u form is not considered valid.
+m_aStates.top().bLevelNumbersValid = false;
}
else
m_aUnicodeBuffer.append(static_cast(nParam));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 909dc86..578751e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2007,11 +2007,16 @@ RTFError RTFDocumentImpl::popState()
}
break;
case Destination::LEVELNUMBERS:
-if (aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText))
+{
+bool bNestedLevelNumbers = false;
+if (m_aStates.size() > 1)
+// Current destination is levelnumbers and parent destination is
levelnumbers as well.
+bNestedLevelNumbers = m_aStates[m_aStates.size() - 2].eDestination
== Destination::LEVELNUMBERS;
+if (!bNestedLevelNumbers &&
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText))
{
RTFSprms& rAttributes =
aState.aTableSprms.find(NS_ooxml::LN_CT_Lvl_lvlText)->getAttributes();
RTFValue::Pointer_t pValue =
rAttributes.find(NS_ooxml::LN_CT_LevelText_val);
-if (pValue)
+if (pValue && aState.bLevelNumbersValid)
{
OUString aOrig = pValue->getString();
@@ -2032,8 +2037,12 @@ RTFError RTFDocumentImpl::popState()
pValue->setString(aBuf.makeStringAndClear());
}
+else if (pValue)
+// Have a value, but levelnumbers is not valid -> ignore it.
+pValue->setString(OUString());
}
break;
[Libreoffice-commits] core.git: vcl/opengl
vcl/opengl/gdiimpl.cxx | 93 -
1 file changed, 69 insertions(+), 24 deletions(-)
New commits:
commit 24d19042644f5a49c8ae148a5021a98bee860066
Author: Tomaž Vajngerl
Date: Thu Aug 4 16:21:47 2016 +0900
tdf#101008 fix XOR rendering
Change-Id: Ied73966633e5ffd56faccea7ec1408bd83642b58
Reviewed-on: https://gerrit.libreoffice.org/27862
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 9ab939a..10e2764 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -228,6 +228,10 @@ void
OpenGLSalGraphicsImpl::InitializePreDrawState(XOROption eOpt)
CHECK_GL_ERROR();
glLogicOp(GL_XOR);
+CHECK_GL_ERROR();
+
+glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+CHECK_GL_ERROR();
}
}
@@ -237,6 +241,8 @@ void OpenGLSalGraphicsImpl::PostDraw()
{
glDisable(GL_COLOR_LOGIC_OP);
CHECK_GL_ERROR();
+glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+CHECK_GL_ERROR();
}
if( mpProgram )
@@ -464,17 +470,43 @@ void OpenGLSalGraphicsImpl::SetFillColor( SalColor
nSalColor )
// enable/disable XOR drawing
void OpenGLSalGraphicsImpl::SetXORMode( bool bSet )
{
-mbXORMode = bSet;
+if (mbXORMode != bSet)
+{
+FlushDeferredDrawing();
+mbXORMode = bSet;
+}
}
-// set line color for raster operations
-void OpenGLSalGraphicsImpl::SetROPLineColor( SalROPColor /*nROPColor*/ )
+void OpenGLSalGraphicsImpl::SetROPLineColor(SalROPColor nROPColor)
{
+switch (nROPColor)
+{
+case SalROPColor::N0:
+mnLineColor = MAKE_SALCOLOR(0, 0, 0);
+break;
+case SalROPColor::N1:
+mnLineColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
+break;
+case SalROPColor::Invert:
+mnLineColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
+break;
+}
}
-// set fill color for raster operations
-void OpenGLSalGraphicsImpl::SetROPFillColor( SalROPColor /*nROPColor*/ )
+void OpenGLSalGraphicsImpl::SetROPFillColor(SalROPColor nROPColor)
{
+switch (nROPColor)
+{
+case SalROPColor::N0:
+mnFillColor = MAKE_SALCOLOR(0, 0, 0);
+break;
+case SalROPColor::N1:
+mnFillColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
+break;
+case SalROPColor::Invert:
+mnFillColor = MAKE_SALCOLOR(0xff, 0xff, 0xff);
+break;
+}
}
bool OpenGLSalGraphicsImpl::CheckOffscreenTexture()
@@ -1917,15 +1949,21 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon& rPolyPoly,
{
Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
-VCL_GL_INFO( "::drawGradient" );
+VCL_GL_INFO("::drawGradient " << rPolyPoly.GetBoundRect());
-if( aBoundRect.IsEmpty() )
+if (aBoundRect.IsEmpty())
+{
+VCL_GL_INFO("::drawGradient nothing to draw");
return true;
+}
-if( rGradient.GetStyle() != GradientStyle_LINEAR &&
+if (rGradient.GetStyle() != GradientStyle_LINEAR &&
rGradient.GetStyle() != GradientStyle_AXIAL &&
rGradient.GetStyle() != GradientStyle_RADIAL )
+{
+VCL_GL_INFO("::drawGradient unsupported gradient type");
return false;
+}
aBoundRect.Left()--;
aBoundRect.Top()--;
@@ -1939,14 +1977,14 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon& rPolyPoly,
ImplSetClipBit( vcl::Region( rPolyPoly ), 0x02 );
if( mbUseStencil )
{
-glEnable( GL_STENCIL_TEST );
+mpContext->state()->stencil().enable();
CHECK_GL_ERROR();
glStencilFunc( GL_EQUAL, 3, 0xFF );
CHECK_GL_ERROR();
}
else
{
-glEnable( GL_STENCIL_TEST );
+mpContext->state()->stencil().enable();
CHECK_GL_ERROR();
glStencilFunc( GL_EQUAL, 2, 0xFF );
CHECK_GL_ERROR();
@@ -1954,32 +1992,39 @@ bool OpenGLSalGraphicsImpl::drawGradient(const
tools::PolyPolygon& rPolyPoly,
#endif
// if border >= 100%, draw solid rectangle with start color
-if( rGradient.GetBorder() >= 100.0 )
+if (rGradient.GetBorder() >= 100.0)
{
-Color aCol = rGradient.GetStartColor();
-long nF = rGradient.GetStartIntensity();
-if( UseSolid( MAKE_SALCOLOR( aCol.GetRed() * nF / 100,
- aCol.GetGreen() * nF / 100,
- aCol.GetBlue() * nF / 100 ) ) )
-DrawRect( aBoundRect );
+VCL_GL_INFO("::drawGradient -> DrawRect (no gradient)");
+
+Color aColor = rGradient.GetStartColor();
+long nIntensity = rGradient.GetStartIntensity();
+if (UseSolid(MAKE_SALCOLOR(aColor.GetRed() * nIntensity / 100.0,
+ aColor.GetGreen()* nIntensity / 100.0,
+ aColor.GetBlue() * nIntensity / 100
[Libreoffice-commits] core.git: cui/source dbaccess/source
cui/source/customize/cfg.cxx | 11 ---
cui/source/dialogs/about.cxx | 10 --
cui/source/dialogs/cuigaldlg.cxx | 12 ---
cui/source/dialogs/hlmailtp.cxx|3
cui/source/dialogs/linkdlg.cxx |8 --
cui/source/dialogs/postdlg.cxx | 13 ---
cui/source/dialogs/scriptdlg.cxx | 20 +
cui/source/dialogs/thesdlg.cxx |4 -
cui/source/options/dbregister.cxx |4 -
cui/source/options/fontsubs.cxx|4 -
cui/source/options/optdict.cxx | 12 +--
cui/source/options/personalization.cxx |3
cui/source/tabpages/autocdlg.cxx | 16 +---
cui/source/tabpages/grfpage.cxx|6 -
cui/source/tabpages/macroass.cxx |9 --
cui/source/tabpages/numpages.cxx | 22 ++
cui/source/tabpages/page.cxx |4 -
cui/source/tabpages/tpgradnt.cxx |3
cui/source/tabpages/tphatch.cxx|3
cui/source/tabpages/tplnedef.cxx |4 -
cui/source/tabpages/tplneend.cxx |4 -
cui/source/tabpages/tppattern.cxx |7 --
dbaccess/source/core/api/KeySet.cxx|5 -
dbaccess/source/core/dataaccess/documentcontainer.cxx |3
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx|3
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |3
dbaccess/source/ui/dlg/directsql.cxx |6 -
dbaccess/source/ui/dlg/indexdialog.cxx |3
dbaccess/source/ui/dlg/sqlmessage.cxx | 10 --
dbaccess/source/ui/dlg/tablespage.cxx |9 --
dbaccess/source/ui/misc/WNameMatch.cxx | 12 +--
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 44 +++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |9 --
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx |3
dbaccess/source/ui/tabledesign/TableController.cxx |3
35 files changed, 85 insertions(+), 210 deletions(-)
New commits:
commit bd4c80b856a145563ba38242705e87028b1e0ed6
Author: nadith
Date: Mon Aug 1 14:51:58 2016 +0530
tdf#100726: Improve readability of OUString concatenation
module cui and dbaccess fixed
Change-Id: Ief6fca46622fe4e0da804c9a874f7ec93a0fd7af
Reviewed-on: https://gerrit.libreoffice.org/27770
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ada85af..a97db75 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -337,9 +337,7 @@ generateCustomMenuURL(
SvxEntries* entries,
sal_Int32 suffix = 1 )
{
-OUString url(CUSTOM_MENU_STR );
-url += OUString::number( suffix );
-
+OUString url = CUSTOM_MENU_STR + OUString::number( suffix );
if (!entries)
return url;
@@ -2163,9 +2161,7 @@ void SvxConfigPage::AddSubMenusToUI(
if ( pEntryData->IsPopup() )
{
-OUString subMenuTitle( rBaseTitle );
-subMenuTitle += aMenuSeparatorStr;
-subMenuTitle += stripHotKey( pEntryData->GetName() );
+OUString subMenuTitle = rBaseTitle + aMenuSeparatorStr +
stripHotKey( pEntryData->GetName() );
const sal_Int32 nPos = m_pTopLevelListBox->InsertEntry(
subMenuTitle );
m_pTopLevelListBox->SetEntryData( nPos, pEntryData );
@@ -5429,8 +5425,7 @@ void SvxIconSelectorDialog::ImportGraphics(
fPath = rPaths[0].copy(8) + "/";
for ( sal_Int32 i = 0; i < rejectedCount; ++i )
{
-message += fPath + rejected[i];
-message += newLine;
+message += fPath + rejected[i] + newLine;
}
ScopedVclPtrInstance< SvxIconChangeDialog > aDialog(this, message);
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 22bb659..6826c51 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -287,8 +287,7 @@ OUString AboutDialog::GetVersionString()
sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId);
}
-sVersion += "\n";
-sVersion += Application::GetHWOSConfInfo();
+sVersion += "\n" + Application::GetHWOSConfInfo();
if (EXTRA_BUILDID[0] != '\0')
{
@@ -324,11 +323,8 @@ OUString AboutDialog::GetVersionString()
OUString AboutDialog::GetCopyrightString()
{
-OUString aCopyrightString = m_aVendorTextStr;
-aCopyrightString += "\n";
-
-aCopyrightString += m_a
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 5 commits - include/svx sd/inc sd/qa sd/sdi sd/source svl/source svx/source
include/svx/svdundo.hxx |8 +++--
sd/inc/sdundo.hxx|6 ++--
sd/qa/unit/tiledrendering/tiledrendering.cxx | 38 ++-
sd/sdi/_drvwsh.sdi |5 +++
sd/source/core/drawdoc.cxx |8 +
sd/source/core/undo/undoobjects.cxx | 18
sd/source/ui/view/drviews2.cxx |1
svl/source/undo/undo.cxx | 13 +
svx/source/svdraw/svdundo.cxx| 11 +++
9 files changed, 102 insertions(+), 6 deletions(-)
New commits:
commit ed91412a2f12f59d98575ccd1baa8bbf06d71896
Author: Miklos Vajna
Date: Wed Aug 3 18:35:57 2016 +0200
svl: handle nullptr pWriter in SfxUndoManager::dumpAsXml()
This is useful when it's called from gdb for Calc.
Change-Id: I22b3e5bbfc5627bff27899a288f7c25179f750ec
Reviewed-on: https://gerrit.libreoffice.org/27836
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 9460d24883067160c53b53a018a88298131908da)
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 154e8e9..def0089 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -1285,6 +1285,14 @@ void SfxUndoManager::RemoveOldestUndoActions( size_t
const i_count )
void SfxUndoManager::dumpAsXml(xmlTextWriterPtr pWriter) const
{
+bool bOwns = false;
+if (!pWriter)
+{
+pWriter = xmlNewTextWriterFilename("undo.xml", 0);
+xmlTextWriterStartDocument(pWriter, nullptr, nullptr, nullptr);
+bOwns = true;
+}
+
xmlTextWriterStartElement(pWriter, BAD_CAST("sfxUndoManager"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nUndoActionCount"),
BAD_CAST(OString::number(GetUndoActionCount()).getStr()));
@@ -1292,6 +1300,11 @@ void SfxUndoManager::dumpAsXml(xmlTextWriterPtr pWriter)
const
GetUndoAction(i)->dumpAsXml(pWriter);
xmlTextWriterEndElement(pWriter);
+if (bOwns)
+{
+xmlTextWriterEndDocument(pWriter);
+xmlFreeTextWriter(pWriter);
+}
}
struct SfxListUndoAction::Impl
commit 45e01b368e39069151f235b7d4954da1b76c9ffd
Author: Miklos Vajna
Date: Wed Aug 3 17:01:02 2016 +0200
sd: track view shell id in SdUndoAction
This helps in case of e.g. setting the page size of an Impress slide
from the sidebar.
Change-Id: I6247d6efcc59f2c6311dcd33d0f989a39fd7b3f9
Reviewed-on: https://gerrit.libreoffice.org/27827
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit f6283cf6b4342a0492f1127c2d7a8597255a75c3)
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 84b81a3..661f354 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -28,17 +28,19 @@ class SdDrawDocument;
class SD_DLLPUBLIC SdUndoAction : public SfxUndoAction
{
public:
-SdUndoAction(SdDrawDocument* pSdDrawDocument)
-: mpDoc(pSdDrawDocument) {}
+SdUndoAction(SdDrawDocument* pSdDrawDocument);
virtual ~SdUndoAction() {}
voidSetComment(const OUString& rStr) { maComment =
rStr; }
virtual OUStringGetComment() const override { return maComment; }
virtual SdUndoAction* Clone() const { return nullptr; }
+/// See SfxUndoAction::GetViewShellId().
+sal_Int32 GetViewShellId() const override;
protected:
SdDrawDocument* mpDoc;
OUString maComment;
+sal_Int32 mnViewShellId;
};
#endif // INCLUDED_SD_INC_SDUNDO_HXX
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 4e28834..ba1cb84 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -53,6 +53,7 @@ public:
void testSetTextSelection();
void testGetTextSelection();
void testSetGraphicSelection();
+void testUndoShells();
void testResetSelection();
void testSearch();
void testSearchAll();
@@ -76,6 +77,7 @@ public:
CPPUNIT_TEST(testSetTextSelection);
CPPUNIT_TEST(testGetTextSelection);
CPPUNIT_TEST(testSetGraphicSelection);
+CPPUNIT_TEST(testUndoShells);
CPPUNIT_TEST(testResetSelection);
CPPUNIT_TEST(testSearch);
CPPUNIT_TEST(testSearchAll);
@@ -427,6 +429,27 @@ void SdTiledRenderingTest::testSetGraphicSelection()
CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight());
}
+void SdTiledRenderingTest::testUndoShells()
+{
+// Load a document and set the page size.
+SdXImpressDocument* pXImpressDocument = createDoc("shape.odp");
+uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
+{
+{"AttributePageSize.Width",
uno::makeAny(static_cast(1))},
+{"AttributePageSize.Height",
uno::makeAny(static_cast(1))},
+}));
+comphelper::dispatchCommand(".uno:AttributePageSi
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx | 22 ++
sc/source/ui/inc/undobase.hxx|6 ++
sc/source/ui/inc/undodraw.hxx|3 +++
sc/source/ui/undo/undobase.cxx | 20 ++--
sc/source/ui/undo/undodraw.cxx | 10 +-
5 files changed, 58 insertions(+), 3 deletions(-)
New commits:
commit 7cbb0664b94bb9f4587098c1940de98e4f7aae16
Author: Miklos Vajna
Date: Thu Aug 4 09:13:33 2016 +0200
sc: implement SfxUndoAction::GetViewShellId() interface ...
... in SfxUndoAction subclasses
Change-Id: I1504e2cfb0f58ff97e2de7a641d72e4867238164
Reviewed-on: https://gerrit.libreoffice.org/27861
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 093fa18..d5258c2 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -61,6 +61,7 @@ public:
void testDocumentSizeChanged();
void testViewLock();
void testColRowResize();
+void testUndoShells();
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
CPPUNIT_TEST(testRowColumnSelections);
@@ -73,6 +74,7 @@ public:
CPPUNIT_TEST(testDocumentSizeChanged);
CPPUNIT_TEST(testViewLock);
CPPUNIT_TEST(testColRowResize);
+CPPUNIT_TEST(testUndoShells);
CPPUNIT_TEST_SUITE_END();
private:
@@ -582,6 +584,26 @@ void ScTiledRenderingTest::testColRowResize()
comphelper::LibreOfficeKit::setActive(false);
}
+void ScTiledRenderingTest::testUndoShells()
+{
+comphelper::LibreOfficeKit::setActive();
+ScModelObj* pModelObj = createDoc("small.ods");
+// Clear the currently selected cell.
+comphelper::dispatchCommand(".uno:ClearContents", {});
+
+auto pDocShell = dynamic_cast(pModelObj->GetEmbeddedObject());
+CPPUNIT_ASSERT(pDocShell);
+ScDocument& rDoc = pDocShell->GetDocument();
+SfxUndoManager* pUndoManager = rDoc.GetUndoManager();
+CPPUNIT_ASSERT(pUndoManager);
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
pUndoManager->GetUndoActionCount());
+sal_Int32 nView1 = SfxLokHelper::getView();
+// This was -1: ScSimpleUndo did not remember what view shell created it.
+CPPUNIT_ASSERT_EQUAL(nView1,
pUndoManager->GetUndoAction()->GetViewShellId());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
}
CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 95fed6c..522bf63 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -46,10 +46,13 @@ public:
virtual ~ScSimpleUndo();
virtual boolMerge( SfxUndoAction *pNextAction ) override;
+/// See SfxUndoAction::GetViewShellId().
+sal_Int32 GetViewShellId() const override;
protected:
ScDocShell* pDocShell;
SfxUndoAction* pDetectiveUndo;
+sal_Int32 mnViewShellId;
boolIsPaintLocked() const { return pDocShell->IsPaintLocked();
}
@@ -164,6 +167,7 @@ private:
class ScUndoWrapper: public SfxUndoAction // for manual merging of
actions
{
SfxUndoAction* pWrappedUndo;
+sal_Int32 mnViewShellId;
public:
ScUndoWrapper( SfxUndoAction* pUndo );
@@ -180,6 +184,8 @@ public:
virtual OUStringGetComment() const override;
virtual OUStringGetRepeatComment(SfxRepeatTarget&) const override;
virtual sal_uInt16 GetId() const override;
+/// See SfxUndoAction::GetViewShellId().
+sal_Int32 GetViewShellId() const override;
};
#endif
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 1572abd..4b91271 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -28,6 +28,7 @@ class ScUndoDraw: public SfxUndoAction
{
SfxUndoAction* pDrawUndo;
ScDocShell* pDocShell;
+sal_Int32 mnViewShellId;
voidUpdateSubShell();
@@ -46,6 +47,8 @@ public:
virtual OUStringGetComment() const override;
virtual OUStringGetRepeatComment(SfxRepeatTarget&) const override;
virtual sal_uInt16 GetId() const override;
+/// See SfxUndoAction::GetViewShellId().
+sal_Int32 GetViewShellId() const override;
};
#endif
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index eefce30..6d59c1d 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -38,8 +38,16 @@
ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
pDocShell( pDocSh ),
-pDetectiveUndo( nullptr )
+pDetectiveUndo( nullptr ),
+mnViewShellId(-1)
{
+if (ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell())
+mnViewShellId = pViewShell->GetViewShellId();
+}
+
+sal_Int32 ScSimpleUndo::GetViewShellId() const
+{
+return mnViewShe
[Libreoffice-commits] online.git: 3 commits - loleaflet/dist loleaflet/po
dev/null |binary loleaflet/dist/images/lc_currencyfield.png |binary loleaflet/dist/images/lc_datefield.png |binary loleaflet/dist/images/lc_numberformatdecdecimals.png |binary loleaflet/dist/images/lc_numberformatdecimal.png |binary loleaflet/dist/images/lc_numberformatincdecimals.png |binary loleaflet/dist/images/lc_numberformatpercent.png |binary loleaflet/dist/images/lc_ok.png |binary loleaflet/dist/images/lc_sortascending.png |binary loleaflet/dist/images/lc_sortdescending.png |binary loleaflet/dist/images/lc_togglemergecells.png|binary loleaflet/dist/images/lc_wraptext.png|binary loleaflet/dist/toolbar.css | 14 loleaflet/po/help-ab.po |2 loleaflet/po/help-af.po |2 loleaflet/po/help-am.po | 20 loleaflet/po/help-an.po |2 loleaflet/po/help-ar.po |2 loleaflet/po/help-as.po |2 loleaflet/po/help-ast.po |2 loleaflet/po/help-az.po |2 loleaflet/po/help-be.po |2 loleaflet/po/help-bg.po |4 loleaflet/po/help-bn.po |2 loleaflet/po/help-bn_IN.po |2 loleaflet/po/help-bo.po |2 loleaflet/po/help-br.po |2 loleaflet/po/help-brx.po |2 loleaflet/po/help-bs.po |2 loleaflet/po/help-ca.po |4 loleaflet/po/help-cs.po |2 loleaflet/po/help-cy.po |4 loleaflet/po/help-da.po |7 loleaflet/po/help-de.po |4 loleaflet/po/help-dgo.po |2 loleaflet/po/help-dz.po |2 loleaflet/po/help-el.po |4 loleaflet/po/help-en_GB.po |2 loleaflet/po/help-en_ZA.po |2 loleaflet/po/help-eo.po |2 loleaflet/po/help-es.po |4 loleaflet/po/help-et.po |2 loleaflet/po/help-eu.po |2 loleaflet/po/help-fa.po |2 loleaflet/po/help-fi.po |2 loleaflet/po/help-fr.po |4 loleaflet/po/help-ga.po |2 loleaflet/po/help-gd.po |2 loleaflet/po/help-gl.po |2 loleaflet/po/help-gu.po |2 loleaflet/po/help-gug.po |2 loleaflet/po/help-he.po |2 loleaflet/po/help-hi.po |2 loleaflet/po/help-hr.po | 14 loleaflet/po/help-hu.po |4 loleaflet/po/help-id.po |2 loleaflet/po/help-is.po |4 loleaflet/po/help-it.po | 474 +- loleaflet/po/help-ja.po |2 loleaflet/po/help-jv.po |2 loleaflet/po/help-ka.po |2 loleaflet/po/help-kk.po |2 loleaflet/po/help-kl.po |2 loleaflet/po/help-km.po |2 loleaflet/po/help-kn.po |2 loleaflet/po/help-ko.po |2 loleaflet/po/help-kok.po |2 loleaflet/po/help-ks.po |2 loleaflet/po/help-ky.po |2 loleaflet/po/help-lb.po |2 loleaflet/po/help-lo.po |2 loleaflet/po/help-lt.po | 14 loleaflet/po/help-lv.po |2 loleaflet/po/help-mai.po |2 loleaflet/po/help-mk.po |2 loleaflet/po/help-ml.po |2 loleaflet/po/help-mn.po |2 loleaflet/po/help-mni.po |2 loleaflet/po/help-mr.po |2 loleaflet/po/help-my.po |2 loleaflet/po/help-nb.po
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/po
loleaflet/po/help-ab.po|2 loleaflet/po/help-af.po|2 loleaflet/po/help-am.po| 20 - loleaflet/po/help-an.po|2 loleaflet/po/help-ar.po|2 loleaflet/po/help-as.po|2 loleaflet/po/help-ast.po |2 loleaflet/po/help-az.po|2 loleaflet/po/help-be.po|2 loleaflet/po/help-bg.po|4 loleaflet/po/help-bn.po|2 loleaflet/po/help-bn_IN.po |2 loleaflet/po/help-bo.po|2 loleaflet/po/help-br.po|2 loleaflet/po/help-brx.po |2 loleaflet/po/help-bs.po|2 loleaflet/po/help-ca.po|4 loleaflet/po/help-cs.po|2 loleaflet/po/help-cy.po|4 loleaflet/po/help-da.po|7 loleaflet/po/help-de.po|4 loleaflet/po/help-dgo.po |2 loleaflet/po/help-dz.po|2 loleaflet/po/help-el.po|4 loleaflet/po/help-en_GB.po |2 loleaflet/po/help-en_ZA.po |2 loleaflet/po/help-eo.po|2 loleaflet/po/help-es.po|4 loleaflet/po/help-et.po|2 loleaflet/po/help-eu.po|2 loleaflet/po/help-fa.po|2 loleaflet/po/help-fi.po|2 loleaflet/po/help-fr.po|4 loleaflet/po/help-ga.po|2 loleaflet/po/help-gd.po|2 loleaflet/po/help-gl.po|2 loleaflet/po/help-gu.po|2 loleaflet/po/help-gug.po |2 loleaflet/po/help-he.po|2 loleaflet/po/help-hi.po|2 loleaflet/po/help-hr.po| 14 loleaflet/po/help-hu.po|4 loleaflet/po/help-id.po|2 loleaflet/po/help-is.po|4 loleaflet/po/help-it.po| 474 + loleaflet/po/help-ja.po|2 loleaflet/po/help-jv.po|2 loleaflet/po/help-ka.po|2 loleaflet/po/help-kk.po|2 loleaflet/po/help-kl.po|2 loleaflet/po/help-km.po|2 loleaflet/po/help-kn.po|2 loleaflet/po/help-ko.po|2 loleaflet/po/help-kok.po |2 loleaflet/po/help-ks.po|2 loleaflet/po/help-ky.po|2 loleaflet/po/help-lb.po|2 loleaflet/po/help-lo.po|2 loleaflet/po/help-lt.po| 14 loleaflet/po/help-lv.po|2 loleaflet/po/help-mai.po |2 loleaflet/po/help-mk.po|2 loleaflet/po/help-ml.po|2 loleaflet/po/help-mn.po|2 loleaflet/po/help-mni.po |2 loleaflet/po/help-mr.po|2 loleaflet/po/help-my.po|2 loleaflet/po/help-nb.po|4 loleaflet/po/help-ne.po|2 loleaflet/po/help-nl.po|2 loleaflet/po/help-nn.po|4 loleaflet/po/help-nr.po|2 loleaflet/po/help-nso.po |2 loleaflet/po/help-oc.po|2 loleaflet/po/help-om.po|2 loleaflet/po/help-or.po|2 loleaflet/po/help-pa_IN.po |2 loleaflet/po/help-pl.po|2 loleaflet/po/help-pt.po|4 loleaflet/po/help-pt_BR.po |4 loleaflet/po/help-ro.po| 167 loleaflet/po/help-ru.po|2 loleaflet/po/help-rw.po|2 loleaflet/po/help-sa_IN.po |2 loleaflet/po/help-sah.po |2 loleaflet/po/help-sat.po |2 loleaflet/po/help-sd.po|2 loleaflet/po/help-si.po|2 loleaflet/po/help-sid.po |2 loleaflet/po/help-sk.po|2 loleaflet/po/help-sq.po|2 loleaflet/po/help-ss.po|2 loleaflet/po/help-st.po|2 loleaflet/po/help-sv.po|4 loleaflet/po/help-sw_TZ.po |2 loleaflet/po/help-ta.po| 92 ++-- loleaflet/po/help-te.po|2 loleaflet/po/help-tg.po|2 loleaflet/po/help-th.po|2 loleaflet/po/help-ti.po|2 loleaflet/po/help-tn.po|2 loleaflet/po/help-tr.po| 448 +++ loleaflet/po/help-ts.po|2 loleaflet/po/help-tt.po|2 loleaflet/po/help-ug.po|2 loleaflet/po/help-uk.po|2 loleaflet/po/help-ur.po|2 loleaflet/po/help-uz.po| 60 +-- loleaflet/po/help-ve.po|2 loleaflet/po/help-vi.po|2 loleaflet/po/help-xh.po|2 loleaflet/po/help-zh_CN.po |2 loleaflet/po/help-zh_TW.po | 88 ++-- loleaflet/po/help-zu.po|2 loleaflet/po/ui-ab.po | 501 -- loleaflet/po/ui-af.po | 501 -- loleaflet/po/ui-am.po | 514 --- loleaflet/po/ui-an.po | 501 -- loleaflet/po/ui-ar.po | 501 -- loleaflet/po/ui-as.po | 501 -- loleaflet/po/ui-ast.po | 501 -- loleaflet/po/ui-az.po | 501 -- loleaflet/po/ui-be.po | 501 -- loleaflet/po/ui-bg.po | 501 -- loleaflet/po/ui-bn.po | 501 -- loleaflet/po/ui-bn_IN.po | 501 -- loleaflet/po/ui-bo.po | 501 -- loleaflet/po/ui-br.
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4fcb04ba5a127cd960ec65fc7788a51b13d3e036
Author: Markus Mohrhard
Date: Wed Aug 3 20:10:05 2016 +0200
add more nullptr checks, related tdf#100820
See
http://crashreport.libreoffice.org/stats/crash_details/8569250c-b04a-43b0-b4b8-4b3a94daffe1
Change-Id: I9070be3db57e77befe70c0a32ef6aa54c6c1cf85
Reviewed-on: https://gerrit.libreoffice.org/27842
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit 626a1aa960ed36f5c3370e2aab1e72d41df875cf)
Reviewed-on: https://gerrit.libreoffice.org/27859
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 3a23913..3c4e2cc 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -205,7 +205,7 @@ uno::Reference
MMCurrentEntryController::createItemWindow(const un
IMPL_LINK_TYPED(MMCurrentEntryController, CurrentEditUpdatedHdl, Edit&, rEdit,
void)
{
SwView* pView = ::GetActiveView();
-SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+SwMailMergeConfigItem* pConfigItem = pView ?
pView->GetMailMergeConfigItem() : nullptr;
if (!pConfigItem)
return;
@@ -226,7 +226,7 @@ void MMCurrentEntryController::statusChanged(const
frame::FeatureStateEvent& rEv
return;
SwView* pView = ::GetActiveView();
-SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+SwMailMergeConfigItem* pConfigItem = pView ?
pView->GetMailMergeConfigItem() : nullptr;
if (!pConfigItem || !rEvent.IsEnabled)
{
@@ -277,7 +277,7 @@ uno::Reference
MMExcludeEntryController::createItemWindow(const un
IMPL_STATIC_LINK_TYPED(MMExcludeEntryController, ExcludeHdl, CheckBox&,
rCheckbox, void)
{
SwView* pView = ::GetActiveView();
-SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+SwMailMergeConfigItem* pConfigItem = pView ?
pView->GetMailMergeConfigItem() : nullptr;
if (pConfigItem)
pConfigItem->ExcludeRecord(pConfigItem->GetResultSetPosition(),
rCheckbox.IsChecked());
@@ -289,7 +289,7 @@ void MMExcludeEntryController::statusChanged(const
frame::FeatureStateEvent& rEv
return;
SwView* pView = ::GetActiveView();
-SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem();
+SwMailMergeConfigItem* pConfigItem = pView ?
pView->GetMailMergeConfigItem() : nullptr;
if (!pConfigItem || !rEvent.IsEnabled)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sw/source
sw/source/core/text/itrcrsr.cxx |1 +
sw/source/core/text/porfly.cxx |5 +
sw/source/core/text/porfly.hxx |1 +
3 files changed, 7 insertions(+)
New commits:
commit 2b3112b30a8dea8a009c11ddb209e12697f72e32
Author: Caolán McNamara
Date: Thu Aug 4 09:15:15 2016 +0100
the sole caller is ok with rPoint being modified, so change to non-const arg
Change-Id: I40a24502e2e8ad312e13e0c47ee1fde3118d2251
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 633c7b5..e38e99d 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -414,14 +414,9 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame,
const Point &rBase,
}
}
-void SwFlyCntPortion::GetFlyCursorOfst(const Point &rPoint, SwPosition &rPos,
SwCursorMoveState* pCMS) const
+void SwFlyCntPortion::GetFlyCursorOfst(Point &rPoint, SwPosition &rPos,
SwCursorMoveState* pCMS) const
{
-// As the FlyCnt are not attached to the side, their GetCursorOfst() will
-// not be called.
-// In order to reduce management overhead for the layout page, the
paragraph
-// calls the FlyFrame's GetCursorOfst() only when needed
-Point aPoint(rPoint);
-GetFlyFrame()->GetCursorOfst(&rPos, aPoint, pCMS);
+GetFlyFrame()->GetCursorOfst(&rPos, rPoint, pCMS);
}
sal_Int32 SwFlyCntPortion::GetCursorOfst( const sal_uInt16 nOfst ) const
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 9204edb..129bf39 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -79,7 +79,7 @@ public:
long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent,
AsCharFlags nFlags );
-void GetFlyCursorOfst(const Point &rPoint, SwPosition& rPos,
SwCursorMoveState* pCMS) const;
+void GetFlyCursorOfst(Point &rPoint, SwPosition& rPos, SwCursorMoveState*
pCMS) const;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
commit cc7a55450658696009fe01e94632e80bb3785d5b
Author: Caolán McNamara
Date: Thu Aug 4 09:07:03 2016 +0100
only called if !bDraw
Change-Id: I7310b5f8cbbc4176e76d92ce2bcd49168470843c
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 40663a2..633c7b5 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -420,8 +420,6 @@ void SwFlyCntPortion::GetFlyCursorOfst(const Point &rPoint,
SwPosition &rPos, Sw
// not be called.
// In order to reduce management overhead for the layout page, the
paragraph
// calls the FlyFrame's GetCursorOfst() only when needed
-if (bDraw)
-return;
Point aPoint(rPoint);
GetFlyFrame()->GetCursorOfst(&rPos, aPoint, pCMS);
}
commit 35f4248206e844cabd83757ec57ddde1c2ef66b4
Author: Caolán McNamara
Date: Thu Aug 4 08:58:59 2016 +0100
SwLinePortion::GetCursorOfst is const and its ret is ignored here
so nOfst is unnecessary
Change-Id: I27f73057b55ebdf30eb69a19ee1b0647ba25583e
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index e087d77..3e871f1 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1713,8 +1713,7 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos,
const Point &rPoint,
if( bChgNodeInner && pTmp->Frame().IsInside( aTmpPoint ) &&
!( pTmp->IsProtected() ) )
{
-static_cast(pPor)->
-GetFlyCursorOfst( nX, aTmpPoint, *pPos, pCMS );
+
static_cast(pPor)->GetFlyCursorOfst(aTmpPoint, *pPos, pCMS);
// After a change of the frame, our font must be still
// available for/in the OutputDevice.
// For comparison: Paint and new SwFlyCntPortion !
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 079d9af..40663a2 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -414,16 +414,16 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame,
const Point &rBase,
}
}
-void SwFlyCntPortion::GetFlyCursorOfst( const sal_uInt16 nOfst,
-const Point &rPoint, SwPosition &rPos, SwCursorMoveState* pCMS ) const
+void SwFlyCntPortion::GetFlyCursorOfst(const Point &rPoint, SwPosition &rPos,
SwCursorMoveState* pCMS) const
{
// As the FlyCnt are not attached to the side, their GetCursorOfst() will
// not be called.
// In order to reduce management overhead for the layout page, the
paragraph
// calls the FlyFrame's GetCursorOfst() only when needed
-Point aPoint( rPoint );
-if( bDraw || !( GetFlyFrame()->GetCursorOfst(&rPos, aPoint, pCMS) ) )
-SwLinePortion::GetCursorOfst(nOfst);
+if (bDraw)
+return;
+Point aPoi
Re: Rosen Silva license statement
WELCOME Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Julian Mehne license statement
WELCOME Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Johannes Berg license statement
WELCOME Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen.WELCOME Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen.WELCOME Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers If you want help to get started or have any questions, then please contact me. I am here to help you (and others) in getting their first patch submitted. LibreOffice is a very big program and getting it built, setting up gerrit, and getting the first patch right can be a bit challenging, therefore do not hesitate to email me if you want help. We have made a step by step guide to help you get started: https://wiki.documentfoundation.org/Development/GetInvolved rgds Jan Iversen. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loleaflet/dist
dev/null |binary loleaflet/dist/images/lc_currencyfield.png |binary loleaflet/dist/images/lc_datefield.png |binary loleaflet/dist/images/lc_numberformatdecdecimals.png |binary loleaflet/dist/images/lc_numberformatdecimal.png |binary loleaflet/dist/images/lc_numberformatincdecimals.png |binary loleaflet/dist/images/lc_numberformatpercent.png |binary loleaflet/dist/images/lc_ok.png |binary loleaflet/dist/images/lc_sortascending.png |binary loleaflet/dist/images/lc_sortdescending.png |binary loleaflet/dist/images/lc_togglemergecells.png|binary loleaflet/dist/images/lc_wraptext.png|binary loleaflet/dist/toolbar.css | 14 +++--- 13 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 474f784d3e42b9d6a37a0e7fcfbb32d377ab66fc Author: Jan Holesovsky Date: Wed Aug 3 18:29:30 2016 +0200 We are using large icons from the Breeze theme, update the Calc toolbar. diff --git a/loleaflet/dist/images/lc_currencyfield.png b/loleaflet/dist/images/lc_currencyfield.png new file mode 100644 index 000..9562e2b Binary files /dev/null and b/loleaflet/dist/images/lc_currencyfield.png differ diff --git a/loleaflet/dist/images/lc_datefield.png b/loleaflet/dist/images/lc_datefield.png index 0f9271b..8f0b3cb 100644 Binary files a/loleaflet/dist/images/lc_datefield.png and b/loleaflet/dist/images/lc_datefield.png differ diff --git a/loleaflet/dist/images/lc_numberformatdecdecimals.png b/loleaflet/dist/images/lc_numberformatdecdecimals.png index 0dabc85..8343ca2 100644 Binary files a/loleaflet/dist/images/lc_numberformatdecdecimals.png and b/loleaflet/dist/images/lc_numberformatdecdecimals.png differ diff --git a/loleaflet/dist/images/lc_numberformatdecimal.png b/loleaflet/dist/images/lc_numberformatdecimal.png new file mode 100644 index 000..504622b Binary files /dev/null and b/loleaflet/dist/images/lc_numberformatdecimal.png differ diff --git a/loleaflet/dist/images/lc_numberformatincdecimals.png b/loleaflet/dist/images/lc_numberformatincdecimals.png index e9f38df..93f246d 100644 Binary files a/loleaflet/dist/images/lc_numberformatincdecimals.png and b/loleaflet/dist/images/lc_numberformatincdecimals.png differ diff --git a/loleaflet/dist/images/lc_numberformatpercent.png b/loleaflet/dist/images/lc_numberformatpercent.png new file mode 100644 index 000..740aa41 Binary files /dev/null and b/loleaflet/dist/images/lc_numberformatpercent.png differ diff --git a/loleaflet/dist/images/lc_ok.png b/loleaflet/dist/images/lc_ok.png index c169240..e41d301 100644 Binary files a/loleaflet/dist/images/lc_ok.png and b/loleaflet/dist/images/lc_ok.png differ diff --git a/loleaflet/dist/images/lc_sortascending.png b/loleaflet/dist/images/lc_sortascending.png new file mode 100644 index 000..52346f3 Binary files /dev/null and b/loleaflet/dist/images/lc_sortascending.png differ diff --git a/loleaflet/dist/images/lc_sortdescending.png b/loleaflet/dist/images/lc_sortdescending.png new file mode 100644 index 000..4669781 Binary files /dev/null and b/loleaflet/dist/images/lc_sortdescending.png differ diff --git a/loleaflet/dist/images/lc_togglemergecells.png b/loleaflet/dist/images/lc_togglemergecells.png new file mode 100644 index 000..56fc884 Binary files /dev/null and b/loleaflet/dist/images/lc_togglemergecells.png differ diff --git a/loleaflet/dist/images/lc_wraptext.png b/loleaflet/dist/images/lc_wraptext.png new file mode 100644 index 000..6f45904 Binary files /dev/null and b/loleaflet/dist/images/lc_wraptext.png differ diff --git a/loleaflet/dist/images/sc_currencyfield.png b/loleaflet/dist/images/sc_currencyfield.png deleted file mode 100644 index e403abc..000 Binary files a/loleaflet/dist/images/sc_currencyfield.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_numberformatdecimal.png b/loleaflet/dist/images/sc_numberformatdecimal.png deleted file mode 100644 index e40dbd4..000 Binary files a/loleaflet/dist/images/sc_numberformatdecimal.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_numberformatpercent.png b/loleaflet/dist/images/sc_numberformatpercent.png deleted file mode 100644 index 820b519..000 Binary files a/loleaflet/dist/images/sc_numberformatpercent.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_sortascending.png b/loleaflet/dist/images/sc_sortascending.png deleted file mode 100644 index 9039006..000 Binary files a/loleaflet/dist/images/sc_sortascending.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_sortdescending.png b/loleaflet/dist/images/sc_sortdescending.png deleted file mode 100644 index a928731..000 Binary files a/loleaflet/dist/images/sc_sortdescending.png and /dev/null differ diff --git a/loleaflet/dist/images/sc_togglemergecells.png b/loleaflet/dist/images/sc_togglemergecells.png deleted file
[Libreoffice-commits] online.git: loolwsd/Png.hpp
loolwsd/Png.hpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c48dfdcf8e153847b6a0a2498357f0b55499473 Author: Miklos Vajna Date: Thu Aug 4 09:48:23 2016 +0200 Png: avoid performing multiplication at int precision When the result will be stored at size_t precision anyway. Change-Id: Ic52904d853eb27972d545fea6e742bc9e0d48c3d diff --git a/loolwsd/Png.hpp b/loolwsd/Png.hpp index 19bda55..7533c4e 100644 --- a/loolwsd/Png.hpp +++ b/loolwsd/Png.hpp @@ -103,7 +103,7 @@ unpremultiply_data (png_structp /*png*/, png_row_infop row_info, png_bytep data) // Sadly, older libpng headers don't use const for the pixmap pointer parameter to // png_write_row(), so can't use const here for pixmap. inline -bool encodeSubBufferToPNG(unsigned char* pixmap, int startX, int startY, +bool encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size_t startY, int width, int height, int bufferWidth, int bufferHeight, std::vector& output, LibreOfficeKitTileMode mode) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
