[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
New commits:
commit e5c80bb69a30dfb0a3daf6061ab127d92f8142d6
Author: BaiXiaochun
AuthorDate: Wed Jun 30 19:01:16 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri Jul 2 08:41:25 2021 +0200
Purge out setNan from math.cxx
Change-Id: I95f9b37b564bb733f44899a8c6c1ea3c36e35694
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118196
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 88354763b2b4..75981d970d74 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -865,7 +865,7 @@ double stringToDouble(CharT const * pBegin, CharT const *
pEnd,
&& (CharT('N') == p[2]))
{
p += 3;
-rtl::math::setNan( &fVal );
+fVal = std::numeric_limits::quiet_NaN();
bDone = true;
}
else if ((CharT('I') == p[0]) && (CharT('N') == p[1])
@@ -1012,19 +1012,8 @@ double stringToDouble(CharT const * pBegin, CharT const
* pEnd,
{
// "1.#NAN", "+1.#NAN", "-1.#NAN"
p += 4;
-rtl::math::setNan( &fVal );
-if (bSign)
-{
-union {
-double sd;
-sal_math_Double md;
-} m;
-
-m.sd = fVal;
-m.md.w32_parts.msw |= 0x8000; // create negative NaN
-fVal = m.sd;
-bSign = false; // don't negate again
-}
+fVal = std::numeric_limits::quiet_NaN();
+// bSign will cause negation of fVal in the end, producing a
negative NAN.
// Eat any further digits:
while (p != pEnd && rtl::isAsciiDigit(*p))
@@ -1443,11 +1432,7 @@ double SAL_CALL rtl_math_acosh(double fX)
SAL_THROW_EXTERN_C()
{
volatile double fZ = fX - 1.0;
if (fX < 1.0)
-{
-double fResult;
-::rtl::math::setNan( &fResult );
-return fResult;
-}
+return std::numeric_limits::quiet_NaN();
if ( fX == 1.0 )
return 0.0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentSettingManager.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d9bff6e3c7bd9361bd1516c4ff266bab07c069f Author: Miklos Vajna AuthorDate: Thu Jul 1 20:34:55 2021 +0200 Commit: Miklos Vajna CommitDate: Fri Jul 2 08:27:46 2021 +0200 sw: handle FloattableNomargins when replacing compat options This was added in commit 50a1df360c907d8419ce49f098b6bc87a37a9956 (n#775899 sw: add FloattableNomargins compat flag, 2012-08-23), it's off by default and is on for Word documents. Change-Id: Idc80737b63081bf366e2b4222d9383e7615961aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118242 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index a4251c4a110e..7752b97705fd 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -642,7 +642,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos; // No mbMathBaselineAlignment // No mbStylesNoDefault -// No mbFloattableNomargins +mbFloattableNomargins = rSource.mbFloattableNomargins; mbOldNumbering = rSource.mbOldNumbering; mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering; mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source sc/source
sc/source/core/tool/interpr2.cxx|4 ++--
sc/source/core/tool/interpr3.cxx|6 +++---
sc/source/core/tool/interpr7.cxx| 10 ++
scaddins/source/analysis/analysishelper.cxx |6 ++
scaddins/source/pricing/black_scholes.cxx |3 +--
5 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit 557d7a8bdad148501c491a060da74a6214284ca4
Author: BaiXiaochun
AuthorDate: Tue Jun 29 21:06:12 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri Jul 2 07:53:02 2021 +0200
Purge rtl::math:: ( erf / erfc / expm1 )
Change-Id: Id0e0dce5f9a3bf0bb9ddc73e3aeaa8faf683ad2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118134
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 632b04643a28..f4d906a7d8c1 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1896,10 +1896,10 @@ double ScInterpreter::ScGetPMT(double fRate, double
fNper, double fPv,
{
if (bPayInAdvance) // payment in advance
fPayment = (fFv + fPv * exp( fNper * ::rtl::math::log1p(fRate) ) )
* fRate /
-(::rtl::math::expm1( (fNper + 1) * ::rtl::math::log1p(fRate) )
- fRate);
+(std::expm1( (fNper + 1) * ::rtl::math::log1p(fRate) ) -
fRate);
else // payment in arrear
fPayment = (fFv + fPv * exp(fNper * ::rtl::math::log1p(fRate) ) )
* fRate /
-::rtl::math::expm1( fNper * ::rtl::math::log1p(fRate) );
+std::expm1( fNper * ::rtl::math::log1p(fRate) );
}
return -fPayment;
}
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 9f5812a787a1..c2c91f621bfd 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -200,7 +200,7 @@ double ScInterpreter::phi(double x)
double ScInterpreter::integralPhi(double x)
{ // Using gauss(x)+0.5 has severe cancellation errors for x<-4
-return 0.5 * ::rtl::math::erfc(-x * 0.7071067811865475); // * 1/sqrt(2)
+return 0.5 * std::erfc(-x * 0.7071067811865475); // * 1/sqrt(2)
}
double ScInterpreter::taylor(const double* pPolynom, sal_uInt16 nMax, double x)
@@ -875,7 +875,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA,
double fB)
return HUGE_VAL;
}
if (fX <= 0.01)
-return fB + fB * ::rtl::math::expm1((fB-1.0) *
::rtl::math::log1p(-fX));
+return fB + fB * std::expm1((fB-1.0) * ::rtl::math::log1p(-fX));
else
return fB * pow(0.5-fX+0.5,fB-1.0);
}
@@ -994,7 +994,7 @@ double ScInterpreter::GetBetaDist(double fXin, double
fAlpha, double fBeta)
return pow(fXin, fAlpha);
if (fAlpha == 1.0)
//1.0 - pow(1.0-fX,fBeta) is not accurate enough
-return -::rtl::math::expm1(fBeta * ::rtl::math::log1p(-fXin));
+return -std::expm1(fBeta * ::rtl::math::log1p(-fXin));
//FIXME: need special algorithm for fX near fP for large fA,fB
double fResult;
// I use always continued fraction, power series are neither
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index d50a084acb75..7b2a7a7a563a 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -497,20 +497,14 @@ void ScInterpreter::ScErf()
{
sal_uInt8 nParamCount = GetByte();
if (MustHaveParamCount( nParamCount, 1 ) )
-{
-double x = GetDouble();
-PushDouble( ::rtl::math::erf( x ) );
-}
+PushDouble( std::erf( GetDouble() ) );
}
void ScInterpreter::ScErfc()
{
sal_uInt8 nParamCount = GetByte();
if (MustHaveParamCount( nParamCount, 1 ) )
-{
-double x = GetDouble();
-PushDouble( ::rtl::math::erfc( x ) );
-}
+PushDouble( std::erfc( GetDouble() ) );
}
void ScInterpreter::ScColor()
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index fd4de83c3ce2..405fdae9e5e6 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -732,16 +732,14 @@ OUString ConvertFromDec( double fNum, double fMin, double
fMax, sal_uInt16 nBase
return aRet;
}
-// implementation moved to module sal, see #i97091#
double Erf( double x )
{
-return ::rtl::math::erf(x);
+return std::erf(x);
}
-// implementation moved to module sal, see #i97091#
double Erfc( double x )
{
-return ::rtl::math::erfc(x);
+return std::erfc(x);
}
static bool IsNum( sal_Unicode c )
diff --git a/scaddins/source/pricing/black_scholes.cxx
b/scaddins/source/pricing/black_scholes.cxx
index 57344d85cbec..88bdfc999b35 100644
--- a/scaddins/source/pricing/black_scholes.cxx
+++ b/scaddins/source/pricing/black_scholes.cxx
@@ -93,8 +93,7 @@ static double dnorm(double x) {
}
// cumulative normal distribution
[Libreoffice-commits] core.git: drawinglayer/source solenv/clang-format
drawinglayer/source/tools/primitive2dxmldump.cxx | 193 +--
solenv/clang-format/excludelist |1
2 files changed, 117 insertions(+), 77 deletions(-)
New commits:
commit 09218e0d4a0727bbf385f80c538da9e76e89dbc4
Author: Bartosz Kosiorek
AuthorDate: Fri Jul 2 00:33:01 2021 +0200
Commit: Bartosz Kosiorek
CommitDate: Fri Jul 2 04:08:15 2021 +0200
Fix code style for primitive2dxmldump.cxx
Because the primitive2dxmldump.cxx file has already code style
similar to desired (76 lines out of 631 need mofication),
with this commit I enabled clang-format on
drawinglayer/source/tools/primitive2dxmldump.cxx
It will allow to keep the same code style in all LO components.
Change-Id: I76fbd704ab51fd685bf400d71d24a7abe48049d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118247
Tested-by: Bartosz Kosiorek
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 4b0c47f41da0..d48115baafa6 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -46,10 +46,8 @@ using namespace drawinglayer::primitive2d;
namespace drawinglayer
{
-
namespace
{
-
const size_t constMaxActionType = 513;
OUString convertColorToString(const basegfx::BColor& rColor)
@@ -60,15 +58,15 @@ OUString convertColorToString(const basegfx::BColor& rColor)
void writeMatrix(::tools::XmlWriter& rWriter, const basegfx::B2DHomMatrix&
rMatrix)
{
-rWriter.attribute("xy11", rMatrix.get(0,0));
-rWriter.attribute("xy12", rMatrix.get(0,1));
-rWriter.attribute("xy13", rMatrix.get(0,2));
-rWriter.attribute("xy21", rMatrix.get(1,0));
-rWriter.attribute("xy22", rMatrix.get(1,1));
-rWriter.attribute("xy23", rMatrix.get(1,2));
-rWriter.attribute("xy31", rMatrix.get(2,0));
-rWriter.attribute("xy32", rMatrix.get(2,1));
-rWriter.attribute("xy33", rMatrix.get(2,2));
+rWriter.attribute("xy11", rMatrix.get(0, 0));
+rWriter.attribute("xy12", rMatrix.get(0, 1));
+rWriter.attribute("xy13", rMatrix.get(0, 2));
+rWriter.attribute("xy21", rMatrix.get(1, 0));
+rWriter.attribute("xy22", rMatrix.get(1, 1));
+rWriter.attribute("xy23", rMatrix.get(1, 2));
+rWriter.attribute("xy31", rMatrix.get(2, 0));
+rWriter.attribute("xy32", rMatrix.get(2, 1));
+rWriter.attribute("xy33", rMatrix.get(2, 2));
}
void writePolyPolygon(::tools::XmlWriter& rWriter, const
basegfx::B2DPolyPolygon& rB2DPolyPolygon)
@@ -83,12 +81,12 @@ void writePolyPolygon(::tools::XmlWriter& rWriter, const
basegfx::B2DPolyPolygon
rWriter.attributeDouble("maxy", aB2DRange.getMaxY());
rWriter.attribute("path", basegfx::utils::exportToSvgD(rB2DPolyPolygon,
true, true, false));
-for (basegfx::B2DPolygon const & rPolygon : rB2DPolyPolygon)
+for (basegfx::B2DPolygon const& rPolygon : rB2DPolyPolygon)
{
rWriter.startElement("polygon");
-for (sal_uInt32 i = 0; i (xPrimitive2DReference.get());
+drawinglayer::primitive2d::Primitive2DReference xPrimitive2DReference
+= rPrimitive2DSequence[i];
+const BasePrimitive2D* pBasePrimitive
+= dynamic_cast(xPrimitive2DReference.get());
if (!pBasePrimitive)
continue;
sal_uInt32 nId = pBasePrimitive->getPrimitive2DID();
@@ -224,7 +226,8 @@ void Primitive2dXmlDump::decomposeAndWrite(
{
case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D:
{
-const BitmapPrimitive2D& rBitmapPrimitive2D =
dynamic_cast(*pBasePrimitive);
+const BitmapPrimitive2D& rBitmapPrimitive2D
+= dynamic_cast(*pBasePrimitive);
rWriter.startElement("bitmap");
writeMatrix(rWriter, rBitmapPrimitive2D.getTransform());
@@ -233,16 +236,15 @@ void Primitive2dXmlDump::decomposeAndWrite(
rWriter.attribute("height", rSizePixel.getHeight());
rWriter.attribute("width", rSizePixel.getWidth());
-rWriter.attribute("checksum", OString(std::to_string(
aBitmapEx.GetChecksum() )));
+rWriter.attribute("checksum",
OString(std::to_string(aBitmapEx.GetChecksum(;
-for (tools::Long y=0; y(*pBasePrimitive);
+const HiddenGeometryPrimitive2D& rHiddenGeometryPrimitive2D
+= dynamic_cast(*pBasePrimitive);
rWriter.startElement("hiddengeometry");
decomposeAndWrite(rHiddenGeometryPrimitive2D.getChildren(),
rWriter);
rWriter.endElement();
@@ -263,7 +266,8 @@ void Primitive2dXmlDump::decomposeAndWrite(
case PRIMITIVE2D_ID_TRANSFORMPRIMITIVE2D:
{
-const TransformPrimitive2D& rTransformPrimitive2D =
dynamic_cast(*pBasePrimitive);
+const TransformPrimitive2D& r
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/uibase/utlui/glbltree.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fe4e891a0ab34aabe3e1cdc425502feba6dffdd8
Author: Andreas Heinisch
AuthorDate: Wed Jun 30 19:07:38 2021 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Jul 2 00:28:02 2021 +0200
tdf#127978 - Don't URL encode filename for navigator's tooltip
Change-Id: I70ea7fb739f14c5c60915acc6c66ea241f67524c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118197
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
(cherry picked from commit 5398a6e36489bd68ba31e834833d39fa7de1cbad)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118182
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sw/source/uibase/utlui/glbltree.cxx
b/sw/source/uibase/utlui/glbltree.cxx
index 4225633077a4..59d193807d04 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1076,7 +1076,9 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl,
sfx2::FileDialogHelper*, _pFileDlg, vo
sal_Int32 nPos = 0;
for (const std::unique_ptr& pMed : aMedList)
{
-OUString sFileName = pMed->GetURLObject().GetMainURL(
INetURLObject::DecodeMechanism::NONE )
+// tdf#127978 - don't URL encode filename for navigator's tooltip
+OUString sFileName
+=
pMed->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)
+ OUStringChar(sfx2::cTokenSeparator)
+ pMed->GetFilter()->GetFilterName()
+ OUStringChar(sfx2::cTokenSeparator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source emfio/qa
drawinglayer/source/tools/emfphelperdata.cxx | 44 ++
drawinglayer/source/tools/emfpstringformat.cxx|8 -
emfio/qa/cppunit/emf/EmfImportTest.cxx| 92 ++
emfio/qa/cppunit/emf/data/TestDrawStringAlign.emf |binary
4 files changed, 122 insertions(+), 22 deletions(-)
New commits:
commit 574dc1e8ff6ea4214fefd91216fca5146a4ff13e
Author: Bartosz Kosiorek
AuthorDate: Thu Jun 24 18:58:39 2021 +0200
Commit: Bartosz Kosiorek
CommitDate: Thu Jul 1 23:50:31 2021 +0200
EMF+ tdf#142995 tdf#142997 tdf#143076 Add alignment support for DrawString
With this commit, real size of the text is used to make
proper horizontal alignment. Additionally vertical alignment
is added and fix for Center alignment was applied
Change-Id: I17d9fd7de7f00f5e69f99c5b09061eb6059be67e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117794
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index b052c1551d69..dff19563002d 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1566,25 +1567,35 @@ namespace emfplushelper
css::lang::Locale locale;
double stringAlignmentHorizontalOffset = 0.0;
+double stringAlignmentVerticalOffset = font->emSize;
if (stringFormat)
{
-SAL_WARN_IF(stringFormat->DirectionRightToLeft(),
"drawinglayer.emf", "EMF+\t DrawString Alignment TODO For a right-to-left
layout rectangle, the origin should be at the upper right.");
+LanguageTag
aLanguageTag(static_cast(stringFormat->language));
+locale = aLanguageTag.getLocale();
+drawinglayer::primitive2d::TextLayouterDevice
aTextLayouter;
+
+aTextLayouter.setFontAttribute(fontAttribute,
font->emSize,
+font->emSize, locale);
+
+double fTextWidth =
aTextLayouter.getTextWidth(text, 0, stringLength);
+SAL_WARN_IF(stringFormat->DirectionRightToLeft(),
"drawinglayer.emf",
+"EMF+\t DrawString Alignment TODO For
a right-to-left layout rectangle, the origin should be at the upper right.");
if (stringFormat->stringAlignment ==
StringAlignmentNear)
-// Alignment is to the left side of the layout
rectangle (lx, ly, lw, lh)
-{
+// Alignment is to the left side of the layout
rectangle (lx, ly, lw, lh)
stringAlignmentHorizontalOffset =
stringFormat->leadingMargin * font->emSize;
-} else if (stringFormat->stringAlignment ==
StringAlignmentCenter)
-// Alignment is centered between the origin and
extent of the layout rectangle
-{
-stringAlignmentHorizontalOffset = 0.5 * lw +
stringFormat->leadingMargin * font->emSize - 0.3 * font->emSize * stringLength;
-} else if (stringFormat->stringAlignment ==
StringAlignmentFar)
-// Alignment is to the right side of the layout
rectangle
-{
-stringAlignmentHorizontalOffset = lw -
stringFormat->trailingMargin * font->emSize - 0.6 * font->emSize * stringLength;
-}
-
-LanguageTag aLanguageTag(static_cast< LanguageType
>(stringFormat->language));
-locale = aLanguageTag.getLocale();
+else if (stringFormat->stringAlignment ==
StringAlignmentCenter)
+// Alignment is centered between the origin
and extent of the layout rectangle
+stringAlignmentHorizontalOffset = 0.5 * lw +
(stringFormat->leadingMargin - stringFormat->trailingMargin) * font->emSize -
0.5 * fTextWidth;
+else if (stringFormat->stringAlignment ==
StringAlignmentFar)
+// Alignment is to the right side of the
layout rectangle
+stringAlignmentHorizontalOffset = lw -
stringFormat->trailingMargin * font->emSize - fTextWidth;
+
+if (stringFormat->lineAlign == StringAlignmentNear)
+stringAlignmentVerticalOffset = font->emSize;
+else if (stringFormat->lineAlign ==
StringAlignmentCenter)
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6149bef816ec03fffb92fd81a3427bacb085ede5 Author: Stanislav Horacek AuthorDate: Thu Jul 1 22:51:49 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 22:51:49 2021 +0200 Update git submodules * Update dictionaries from branch 'libreoffice-7-2' to acc95a3635fff23f6b2cfaec260460de3f9c9d9c - Czech Hunspell: fix declination of some nouns ending with "-ec" changes in all three recent commits made by Miroslav Pošta Change-Id: I29ff4b6147cf8ae000c95fd1072e472bb89edec5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118246 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index 793416f25b07..acc95a3635ff 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 793416f25b07ba453d16679e7db6ad81a33ab4bf +Subproject commit acc95a3635fff23f6b2cfaec260460de3f9c9d9c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-2' - cs_CZ/cs_CZ.dic cs_CZ/description.xml
cs_CZ/cs_CZ.dic | 1324 +- cs_CZ/description.xml |2 2 files changed, 663 insertions(+), 663 deletions(-) New commits: commit acc95a3635fff23f6b2cfaec260460de3f9c9d9c Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:35:13 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 22:51:49 2021 +0200 Czech Hunspell: fix declination of some nouns ending with "-ec" changes in all three recent commits made by Miroslav Pošta Change-Id: I29ff4b6147cf8ae000c95fd1072e472bb89edec5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118246 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/cs_CZ.dic b/cs_CZ/cs_CZ.dic index 2e17ced..00c4f22 100644 --- a/cs_CZ/cs_CZ.dic +++ b/cs_CZ/cs_CZ.dic @@ -128,7 +128,7 @@ abgébovat/ATN abhomotopický/YR abhomotopie/Z Abcházčin/Y -Abcházec/UV +Abcházec/U Abcházie/Z Abcházka/ZQ Abchazsko/MQ @@ -208,7 +208,7 @@ Abram/PV Abramcov/PV Abramcová/Y Abramcovová/Y -Abramec/UV +Abramec/U Abramov/PV Abramová/Y Abramovová/Y @@ -488,7 +488,7 @@ Adamčiaková/Y Adamčík/PV Adamčíková/Y Adame/PV -Adamec/UV +Adamec/U Adameček/PV Adamečková/Y Adamek/PV @@ -504,7 +504,7 @@ Adamička/PV Adamičko/PV Adamičková/Y Adamíčková/Y -Adamiec/UV +Adamiec/U Adamiecová/Y Adamiecův/Y Adamik/PV @@ -2723,7 +2723,7 @@ Ančím Ančími Ančin/Y Ančincová/Y -Ančinec/UV +Ančinec/U ančovička/ZQ And/PV Andalusanka/ZQ @@ -5967,7 +5967,7 @@ Babčice Babčický/Y babčický/YR babčin/Y -Babec/UV +Babec/U Babej/UV Babejová/Y Bábek/PV @@ -6031,7 +6031,7 @@ Babincová/Y Babinčák/PV Babinčáková/Y bábinčin/Y -Babinec/UV +Babinec/U Babínek/PV bábinka/ZQ Babínková/Y @@ -6250,7 +6250,7 @@ Badajová/Y Badal/PV Bádal/PV Badalcová/Y -Badalec/UV +Badalec/U Badalík/PV Badalíková/Y Badalona/ZQ @@ -6446,7 +6446,7 @@ bachor/H Bachor/PV Báchor/PV Bachorcová/Y -Bachorec/UV +Bachorec/U Bachorek/PV Bachorík/PV Bachoríková/Y @@ -7375,7 +7375,7 @@ Báňová/Y Bánovcová/Y Banovčan/PV Banovčanová/Y -Bánovec/UV +Bánovec/U Báňovice báňovický/YR Banovský/Y @@ -7457,7 +7457,7 @@ Barančic/UV Barančicová/Y Barančík/PV Barančíková/Y -Baranec/UV +Baranec/U Baranek/PV Baránek/PV Baraník/PV @@ -7890,7 +7890,7 @@ Bartoň/UV Bartoncová/Y Bartončík/PV Bartončíková/Y -Bartonec/UV +Bartonec/U Bartoněk/PV Bartoníček/PV Bartonička/PV @@ -7930,7 +7930,7 @@ bartoušovský/YR Bartová/Y Bártová/Y Bartovancová/Y -Bartovanec/UV +Bartovanec/U Bartovice/C bartovický/Y Bartovič/UV @@ -7945,7 +7945,7 @@ Bartschová/Y Bartů Bártů Bartulcová/Y -Bartulec/UV +Bartulec/U Bartulík/PV Bartulíková/Y Bartulovice/C @@ -8244,7 +8244,7 @@ baštěný/YKRN Bášti/PV baštící/YN Baštincová/Y -Baštinec/UV +Baštinec/U Baštinka/ZQ Baštinský/Y Báštiová/Y @@ -8353,7 +8353,7 @@ Batová/Y Baťová/Y Báťová/Y Batovcová/Y -Batovec/UV +Batovec/U Bátovič/UV Bátovičová/Y Bátovský/Y @@ -8914,7 +8914,7 @@ Běhalová/Y Behan/PV Běhan/PV Behancová/Y -Behanec/UV +Behanec/U běhánecký/YR běhání/SN Běhánky/ZQ @@ -9045,7 +9045,7 @@ bejkárna/ZQ Bejlek/PV Bejlková/Y Bejlovcová/Y -Bejlovec/UV +Bejlovec/U Bejna/PV Bejnová/Y Bejoch/PV @@ -9060,7 +9060,7 @@ Bejstová/Y Bejšák/PV Bejšáková/Y Bejšovcová/Y -Bejšovec/UV +Bejšovec/U Bejtkovský/Y Bejvančický/Y Bejvl/PV @@ -9128,7 +9128,7 @@ Beláň/UV Belancová/Y Belančík/PV Belančíková/Y -Belanec/UV +Belanec/U Bělánek/PV bělání/SN Belaník/PV @@ -9183,8 +9183,8 @@ Beldík/PV Beldíková/Y Beldová/Y Běle/PV -Belec/UV -Bělec/UV +Belec/U +Bělec/U Bělecký/Y Belecová/Y Belecův/Y @@ -9344,7 +9344,7 @@ bělohlavý/YRN Belohlazov/PV Belohlazovová/Y Bělohorcová/Y -Bělohorec/UV +Bělohorec/U belohorizontský/Y bělohorský/Y Bělohorský/Y @@ -9852,7 +9852,7 @@ Berdníková/Y Berdych/PV Berdychová/Y bérec/S -Berec/UV +Berec/U Berecka/PV Berecková/Y Berecová/Y @@ -9909,7 +9909,7 @@ Bergler/PV Berglerová/Y Berglová/Y Berglowicová/Y -Berglowiec/UV +Berglowiec/U Bergman/PV Bergmann/PV Bergmannová/Y @@ -9942,7 +9942,7 @@ Berkmanová/Y Berko/PV Berková/Y Berkovcová/Y -Berkovec/UV +Berkovec/U Berkovič/UV Berkovičová/Y Berkovský/Y @@ -10201,7 +10201,7 @@ Besuch/PV Besuchová/Y Besův/Y bešamelový/YR -Beščec/UV +Beščec/U Beščecová/Y Beščecův/Y Beše/PV @@ -10266,7 +10266,7 @@ Betíková/Y Bětíková/Y Bětin/Y Betincová/Y -Betinec/UV +Betinec/U Betka/PV Bětka/ZQ Betková/Y @@ -10665,7 +10665,7 @@ Bezová/Y Bézová/Y bezový/YKR Bezpalcová/Y -Bezpalec/UV +Bezpalec/U bezpapírový/Y bezparametrický/YCR bezparametrový/YKR @@ -11396,7 +11396,7 @@ Bild/PV Bilder/PV Bilderová/Y Bildová/Y -Bilec/UV +Bilec/U Bilecová/Y Bilecův/Y Bilej/UV @@ -11597,9 +11597,9 @@ Bínová/Y Binovcová/Y Biňovcová/Y Bíňovcová/Y -Binovec/UV -Biňovec/UV -Bíňovec/UV +Binovec/U +Biňovec/U +Bíňovec/U Biňovský/Y Binter/PV Binterová/Y @@ -12197,9 +12197,9 @@ Blahová/Y Bláhová/Y Blahovcová/Y Bláhovcová/Y +Blahovec/U bláhovec/U -Blahovec/UV -Bláhovec/UV +Bláhovec/U
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1e03b970f49efbfacb7888d31ecd944750a5956 Author: Stanislav Horacek AuthorDate: Thu Jul 1 22:48:15 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 22:48:15 2021 +0200 Update git submodules * Update dictionaries from branch 'master' to 01bb1d2c47c2c132adf6c6bef77cf7ec39d84535 - Czech Hunspell: fix declination of some nouns ending with "-ec" changes in all three recent commits made by Miroslav Pošta Change-Id: I29ff4b6147cf8ae000c95fd1072e472bb89edec5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118245 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index c608cc40ecc8..01bb1d2c47c2 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit c608cc40ecc81cdd6ac9000dc890e3f788f2c094 +Subproject commit 01bb1d2c47c2c132adf6c6bef77cf7ec39d84535 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: cs_CZ/cs_CZ.dic cs_CZ/description.xml
cs_CZ/cs_CZ.dic | 1324 +- cs_CZ/description.xml |2 2 files changed, 663 insertions(+), 663 deletions(-) New commits: commit 01bb1d2c47c2c132adf6c6bef77cf7ec39d84535 Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:35:13 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 22:48:15 2021 +0200 Czech Hunspell: fix declination of some nouns ending with "-ec" changes in all three recent commits made by Miroslav Pošta Change-Id: I29ff4b6147cf8ae000c95fd1072e472bb89edec5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118245 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/cs_CZ.dic b/cs_CZ/cs_CZ.dic index 2e17ced..00c4f22 100644 --- a/cs_CZ/cs_CZ.dic +++ b/cs_CZ/cs_CZ.dic @@ -128,7 +128,7 @@ abgébovat/ATN abhomotopický/YR abhomotopie/Z Abcházčin/Y -Abcházec/UV +Abcházec/U Abcházie/Z Abcházka/ZQ Abchazsko/MQ @@ -208,7 +208,7 @@ Abram/PV Abramcov/PV Abramcová/Y Abramcovová/Y -Abramec/UV +Abramec/U Abramov/PV Abramová/Y Abramovová/Y @@ -488,7 +488,7 @@ Adamčiaková/Y Adamčík/PV Adamčíková/Y Adame/PV -Adamec/UV +Adamec/U Adameček/PV Adamečková/Y Adamek/PV @@ -504,7 +504,7 @@ Adamička/PV Adamičko/PV Adamičková/Y Adamíčková/Y -Adamiec/UV +Adamiec/U Adamiecová/Y Adamiecův/Y Adamik/PV @@ -2723,7 +2723,7 @@ Ančím Ančími Ančin/Y Ančincová/Y -Ančinec/UV +Ančinec/U ančovička/ZQ And/PV Andalusanka/ZQ @@ -5967,7 +5967,7 @@ Babčice Babčický/Y babčický/YR babčin/Y -Babec/UV +Babec/U Babej/UV Babejová/Y Bábek/PV @@ -6031,7 +6031,7 @@ Babincová/Y Babinčák/PV Babinčáková/Y bábinčin/Y -Babinec/UV +Babinec/U Babínek/PV bábinka/ZQ Babínková/Y @@ -6250,7 +6250,7 @@ Badajová/Y Badal/PV Bádal/PV Badalcová/Y -Badalec/UV +Badalec/U Badalík/PV Badalíková/Y Badalona/ZQ @@ -6446,7 +6446,7 @@ bachor/H Bachor/PV Báchor/PV Bachorcová/Y -Bachorec/UV +Bachorec/U Bachorek/PV Bachorík/PV Bachoríková/Y @@ -7375,7 +7375,7 @@ Báňová/Y Bánovcová/Y Banovčan/PV Banovčanová/Y -Bánovec/UV +Bánovec/U Báňovice báňovický/YR Banovský/Y @@ -7457,7 +7457,7 @@ Barančic/UV Barančicová/Y Barančík/PV Barančíková/Y -Baranec/UV +Baranec/U Baranek/PV Baránek/PV Baraník/PV @@ -7890,7 +7890,7 @@ Bartoň/UV Bartoncová/Y Bartončík/PV Bartončíková/Y -Bartonec/UV +Bartonec/U Bartoněk/PV Bartoníček/PV Bartonička/PV @@ -7930,7 +7930,7 @@ bartoušovský/YR Bartová/Y Bártová/Y Bartovancová/Y -Bartovanec/UV +Bartovanec/U Bartovice/C bartovický/Y Bartovič/UV @@ -7945,7 +7945,7 @@ Bartschová/Y Bartů Bártů Bartulcová/Y -Bartulec/UV +Bartulec/U Bartulík/PV Bartulíková/Y Bartulovice/C @@ -8244,7 +8244,7 @@ baštěný/YKRN Bášti/PV baštící/YN Baštincová/Y -Baštinec/UV +Baštinec/U Baštinka/ZQ Baštinský/Y Báštiová/Y @@ -8353,7 +8353,7 @@ Batová/Y Baťová/Y Báťová/Y Batovcová/Y -Batovec/UV +Batovec/U Bátovič/UV Bátovičová/Y Bátovský/Y @@ -8914,7 +8914,7 @@ Běhalová/Y Behan/PV Běhan/PV Behancová/Y -Behanec/UV +Behanec/U běhánecký/YR běhání/SN Běhánky/ZQ @@ -9045,7 +9045,7 @@ bejkárna/ZQ Bejlek/PV Bejlková/Y Bejlovcová/Y -Bejlovec/UV +Bejlovec/U Bejna/PV Bejnová/Y Bejoch/PV @@ -9060,7 +9060,7 @@ Bejstová/Y Bejšák/PV Bejšáková/Y Bejšovcová/Y -Bejšovec/UV +Bejšovec/U Bejtkovský/Y Bejvančický/Y Bejvl/PV @@ -9128,7 +9128,7 @@ Beláň/UV Belancová/Y Belančík/PV Belančíková/Y -Belanec/UV +Belanec/U Bělánek/PV bělání/SN Belaník/PV @@ -9183,8 +9183,8 @@ Beldík/PV Beldíková/Y Beldová/Y Běle/PV -Belec/UV -Bělec/UV +Belec/U +Bělec/U Bělecký/Y Belecová/Y Belecův/Y @@ -9344,7 +9344,7 @@ bělohlavý/YRN Belohlazov/PV Belohlazovová/Y Bělohorcová/Y -Bělohorec/UV +Bělohorec/U belohorizontský/Y bělohorský/Y Bělohorský/Y @@ -9852,7 +9852,7 @@ Berdníková/Y Berdych/PV Berdychová/Y bérec/S -Berec/UV +Berec/U Berecka/PV Berecková/Y Berecová/Y @@ -9909,7 +9909,7 @@ Bergler/PV Berglerová/Y Berglová/Y Berglowicová/Y -Berglowiec/UV +Berglowiec/U Bergman/PV Bergmann/PV Bergmannová/Y @@ -9942,7 +9942,7 @@ Berkmanová/Y Berko/PV Berková/Y Berkovcová/Y -Berkovec/UV +Berkovec/U Berkovič/UV Berkovičová/Y Berkovský/Y @@ -10201,7 +10201,7 @@ Besuch/PV Besuchová/Y Besův/Y bešamelový/YR -Beščec/UV +Beščec/U Beščecová/Y Beščecův/Y Beše/PV @@ -10266,7 +10266,7 @@ Betíková/Y Bětíková/Y Bětin/Y Betincová/Y -Betinec/UV +Betinec/U Betka/PV Bětka/ZQ Betková/Y @@ -10665,7 +10665,7 @@ Bezová/Y Bézová/Y bezový/YKR Bezpalcová/Y -Bezpalec/UV +Bezpalec/U bezpapírový/Y bezparametrický/YCR bezparametrový/YKR @@ -11396,7 +11396,7 @@ Bild/PV Bilder/PV Bilderová/Y Bildová/Y -Bilec/UV +Bilec/U Bilecová/Y Bilecův/Y Bilej/UV @@ -11597,9 +11597,9 @@ Bínová/Y Binovcová/Y Biňovcová/Y Bíňovcová/Y -Binovec/UV -Biňovec/UV -Bíňovec/UV +Binovec/U +Biňovec/U +Bíňovec/U Biňovský/Y Binter/PV Binterová/Y @@ -12197,9 +12197,9 @@ Blahová/Y Bláhová/Y Blahovcová/Y Bláhovcová/Y +Blahovec/U bláhovec/U -Blahovec/UV -Bláhovec/UV +Bláhovec/U
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/qa sw/source
sw/qa/core/data/ww8/pass/ofz34749-1.doc |binary
sw/source/filter/ww8/ww8par.hxx |8
sw/source/filter/ww8/ww8par6.cxx|3 +++
3 files changed, 11 insertions(+)
New commits:
commit 237a3a04f1617a05c157733ca4b57f6f8c21429b
Author: Caolán McNamara
AuthorDate: Thu Jul 1 14:56:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 22:06:02 2021 +0200
ofz#34749 don't remove trailing paragraph if something got anchored to it
Change-Id: Ic6eec2f9829c415abd4f2628bc51efbf98f918fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118189
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/qa/core/data/ww8/pass/ofz34749-1.doc
b/sw/qa/core/data/ww8/pass/ofz34749-1.doc
new file mode 100644
index ..d657a71b5245
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/ofz34749-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d2ad5f67b6c7..e59d82581d31 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -930,6 +930,14 @@ public:
explicit wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {}
~wwExtraneousParas() { delete_all_from_doc(); }
void insert(SwTextNode *pTextNode) { m_aTextNodes.insert(pTextNode); }
+void check_anchor_destination(SwTextNode *pTextNode)
+{
+auto it = m_aTextNodes.find(pTextNode);
+if (it == m_aTextNodes.end())
+return;
+SAL_WARN("sw.ww8", "It is unexpected to anchor something in a para
scheduled for removal");
+m_aTextNodes.erase(it);
+}
void delete_all_from_doc();
};
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index b5a5623fd22a..bbb8a7fa3834 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2470,6 +2470,9 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults
&rApo, const WW8_TablePos *p
}
else
{
+// ofz#34749 we shouldn't anchor anything into an 'extra'
paragraph scheduled for
+// removal at end of import, but check if that scenario is
happening
+
m_aExtraneousParas.check_anchor_destination(m_pPaM->GetNode().GetTextNode());
m_xSFlyPara->pFlyFormat =
m_rDoc.MakeFlySection(WW8SwFlyPara::eAnchor,
m_pPaM->GetPoint(), &aFlySet);
OSL_ENSURE(m_xSFlyPara->pFlyFormat->GetAnchor().GetAnchorId() ==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/core/data/ww8/pass/ofz34749-1.doc |binary
sw/source/filter/ww8/ww8par.hxx |8
sw/source/filter/ww8/ww8par6.cxx|3 +++
3 files changed, 11 insertions(+)
New commits:
commit e803875fbb86b24b39fcd9adcf7df40ed255ea8f
Author: Caolán McNamara
AuthorDate: Thu Jul 1 14:56:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 22:05:33 2021 +0200
ofz#34749 don't remove trailing paragraph if something got anchored to it
Change-Id: Ic6eec2f9829c415abd4f2628bc51efbf98f918fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118228
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/qa/core/data/ww8/pass/ofz34749-1.doc
b/sw/qa/core/data/ww8/pass/ofz34749-1.doc
new file mode 100644
index ..d657a71b5245
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/ofz34749-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 1e86ed8ba991..f1a9c4fde3cb 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -924,6 +924,14 @@ public:
explicit wwExtraneousParas(SwDoc &rDoc) : m_rDoc(rDoc) {}
~wwExtraneousParas() { delete_all_from_doc(); }
void insert(SwTextNode *pTextNode) { m_aTextNodes.insert(pTextNode); }
+void check_anchor_destination(SwTextNode *pTextNode)
+{
+auto it = m_aTextNodes.find(pTextNode);
+if (it == m_aTextNodes.end())
+return;
+SAL_WARN("sw.ww8", "It is unexpected to anchor something in a para
scheduled for removal");
+m_aTextNodes.erase(it);
+}
void delete_all_from_doc();
};
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 6dc0a5e5df5b..b391f6ca1cc4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2470,6 +2470,9 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults
&rApo, const WW8_TablePos *p
}
else
{
+// ofz#34749 we shouldn't anchor anything into an 'extra'
paragraph scheduled for
+// removal at end of import, but check if that scenario is
happening
+
m_aExtraneousParas.check_anchor_destination(m_pPaM->GetNode().GetTextNode());
m_xSFlyPara->pFlyFormat =
m_rDoc.MakeFlySection(WW8SwFlyPara::eAnchor,
m_pPaM->GetPoint(), &aFlySet);
OSL_ENSURE(m_xSFlyPara->pFlyFormat->GetAnchor().GetAnchorId() ==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.1.5.1'
Tag 'libreoffice-7.1.5.1' created by Christian Lohmaier at 2021-07-01 19:28 + Tag libreoffice-7.1.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDeF28ACgkQ9DSh76/u rqPBUg//am5MslKiJiDD6nolDFliyAStsWNSdN6hB9ANJOzVLJ2Ff4tQLEcRyWVl TG/7NM9DqSUL4/3Yg5PkbK9X5sNb8nmT/8vGR4Bqtiv3YBw8xg0PltCtxhGqRnGe vZPqSyoA6P66rR6jeHLuFt4c+TiIw7XU/vuKsrSSI2N8DRwPXpDcpxnrwXpz1DjF z1k5+GJ/M9+MhC4taCS2Ob5AwFfSygUgjpCjWvtyNonX/p9NWqdTzmTETGBHvRKq ylsr0ihD9W/5BZ4XdT2RUKpzxiG+KgFzuG6zwmASdqIHobknX2JDQ9BGJBVR0lHL 2wKyvwf+kZkZkY4s4ENapB1SsRK6t+oO2ijGBh+/vNlqA7Q6Xb//zk9SpHu2UsO3 C/PI2JzUVymNGcbFC2MoCc/OaAMeX0AM87Gl1xo88Yc1BgTPkjm86YU8L//6zlFe U5r70vUs2orYj6r/5joE3HtvTey2ijL/gcOFoNY3Z9zP5SGfOLPs9d8VRRNJb5Ht UnZ2KqCdenphZ2nc81W1e+nZXWxUFsiwgZhOEBfdTkrEJ2+iZTCo7v2/PNH77Csd O3frndJePB1dwb6+VqGmBzril0TsIYBr3zRmo2PHg56uEvc8G3/aEkvtZSb/aa1r 2/ZDkgDgnXpOsGyTe7Lf70rLuelL8aF3Pfnj7vSR2yKny6LIEaU= =YE+n -END PGP SIGNATURE- Changes since co-2021-branch-point-288: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.1.5.1'
Tag 'libreoffice-7.1.5.1' created by Christian Lohmaier at 2021-07-01 19:28 + Tag libreoffice-7.1.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDeF28ACgkQ9DSh76/u rqOatxAAvjIO7110u0kLwOLHcvx6zeFEBBZtv+PY5DZu/4hJePpLdb9Qh+X8Fwhh jLnpYxcEjl0m2wSrddX+NldZwGl9DLQvd7oKwaR3vaOISmA962rvANVAJFBAZmh2 ufHB7NWukIhFAFKdD+F+SKR0o64cM1oGzjqo9+f/DjaIXdESPOiT6yLXQKHy55QX qr9L21uSK49oxaNF3q8HBuzoabUOXCkj+CnWTh4UsGdPObfrU3bPqmDsMAU487mX X6vOwxyZ52QATJUIEtTRyit8KZwbMeX4llp4xk64AdWBUKjf/3O4m3MWzrxEjbuh ntmOn9Qgxyk0t+faafPzpf9Jzkaxr3YBG6hRcmk2U3+gZcu2wU5oEs4dTx0l/znj sKCzQhK0O3EhqAlayiUcFTlXQxnkYA+TC7VzoB/t+Yv0PxCPfzDctDtF10yJ893V 2/zbEAO9btyYpLrlndfktBxBUAAnR0P7wRcU7jUeiu9NmQAQGrJQb1IltWxu/JEs WMBk8iduzy72BkN8UdUjNMFlq2Jm+lNgYiEJCFMnzBjZwz/joaoDHzBJgWF7Avsi UShkpYnZcLrcV3RqIvtF6cs9bJ33w1bBJp+l2zzfuuVocMuestHKlWuOH6BP3IgY LT1AsyiN/koi2e8VzLPPof2TQ8nnuRpgWYNI7hS1MFIiAIgfdhA= =4R3l -END PGP SIGNATURE- Changes since co-21.06.3-1-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.1.5.1'
Tag 'libreoffice-7.1.5.1' created by Christian Lohmaier at 2021-07-01 19:28 + Tag libreoffice-7.1.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDeF28ACgkQ9DSh76/u rqPnGhAAx0T1qlwSMp4kbCh1KN/wyUTU4WQ9Ku7OKPP86aTZ6/amuYSdJ8LE6soS DdmKylLUkh8D7JTCoo00zO4epuuQvooMEcSoziRLGUvL+1rWj9DpNNAjp1YZLDEd sbycA1GExKoTb/nF1G8OQYYAo5uuhrZVvhoxlY8sRzWvIyTSLtWLwB0rZ6zH0ieI OPkt2rDsFRHl5zv2HtN/Al9KnMU6h3hTbous29Jn2WHPlcGhYgDefVt/T4/UJTHj cs4L2NhF/TQorr7bh4QjWsqnkJ9Rb2SN391W8PNif7BHEtyxYBB540WfjKTxuMmR B13vMfTtMQKPVF0kbXIN4VkYII9cVHGfAJgPWcnZ0K+Shbnc1TagWNi3cdhqaQhE lWy8285KvcOGGqWj9nv4Lgc3yV1p7awNVrFkF/ISI4Mhg7nNaFQYctigl+CXQZWA +kt8isaWTnJDuY2nutfOabIFIG+22BoyEV4qmQgwR9gP+yCRzsGzb//mJ4SKz9Fj vE6Izo46VQLuo6EJi2AbLxEeD+pCvnDI8oz50nRdU8LFXmq4V9atV7KzgsVUEuvV qTBHyjWVf8Mh8L6TBW3vH2oLM8cll5ChjlBwemksXj+rzlydJazGHKPH6j1W3mcR +NAchD7a7NpKl6nwShNgPa0/17rOw3fSTim4Wx+FbYsqzlRSDso= =XCuE -END PGP SIGNATURE- Changes since co-2021-branch-point-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.1.5.1'
Tag 'libreoffice-7.1.5.1' created by Christian Lohmaier at 2021-07-01 19:28 + Tag libreoffice-7.1.5.1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmDeF2wACgkQ9DSh76/u rqMesBAAn1eD2lvsQ8dToBFqfNsYq8BbOYwBk/GjxxdYBFEzZ6DwJN1Afdg6Je4T bakUQw1i4NplHMuscq8bOCKkb38Tb+PI8xj/esYhLiQWgU+V9R+A6MmusDraB6BW Wn3T89WWKpnwZ+D3D1NAQ2yxQvQkjHIkRkO79VIy5DjIwxM/qDAZS0B3OjfPjLQQ gwU+TpcD3AJf370Q40H++tDeIp3tycJZBww0kc+hw5tfxyM0vRmXMe69ZoESnRGT om1Zj4uzLM6Sh2GXYXu6m+txTxFGy7u2D7vmTUEf34Z/ONe9l4mDMtz7uRQgIGjH 92t5KufdClhcZjhlX+geB8PU8/g1NQDZjNUV9VkRcsEWtAIuhyuJXVJiJqtpVHi5 CcZh+vKVB5L3/iohzd2AzP+OK9QsT8yvhoKQao2WVhG4qIg7aK/AK8UAUjE5hoaX SN5ZDLqaDTWDyX9ftpvACcWwXoyaeZXtYtcXIF7iKuhWGksOU4zJU/zXms3+P06z 2YID17SNMfUxjfI/LdJMGV60rQf6xQLrnGZBj0+r5fyljwki0uzXOSmFgKxfo+Yy Dl2C48SwRQvQMmk9pI4Gj1pj8XsXtOUQtjKevwbzgUZKUyuCVXA6Cm6DLE5CS1SB Pq+gvA0fN1e5EnRQFw3WylbGjIoAhAUR7TmrAFuIpiFuUJuZ068= =hZWW -END PGP SIGNATURE- Changes since co-21.06.3-1-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f875b13fb7aac25910e6c54b83650bfd96b637e6 Author: Christian Lohmaier AuthorDate: Thu Jul 1 21:29:10 2021 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 1 21:29:10 2021 +0200 bump product version to 7.1.5.1.0+ Change-Id: I673c72f5d309ecc5c30cbd82d13dedf9ca4ed9b5 diff --git a/configure.ac b/configure.ac index da6038d5a952..fe0851959501 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.1.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.1.5.1.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d891f5e6ccd4dc801b2ad7f79cd681c1b48e3a61 Author: Christian Lohmaier AuthorDate: Thu Jul 1 21:25:11 2021 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 1 21:25:11 2021 +0200 bump product version to 7.1.6.0.0+ Change-Id: I4524648b1c4bf934299d5702b45722afad37b848 diff --git a/configure.ac b/configure.ac index da6038d5a952..b3aa9d6cb566 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.1.5.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.1.6.0.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-7-1-5'
New branch 'libreoffice-7-1-5' available with the following commits: commit 930991f966c09f1fbec59b40dcf8d086ce24b157 Author: Christian Lohmaier Date: Thu Jul 1 21:21:05 2021 +0200 Branch libreoffice-7-1-5 This is 'libreoffice-7-1-5' - the stable branch for the 7.1.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.1.x release, please use the 'libreoffice-7-1' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-1-5'
New branch 'libreoffice-7-1-5' available with the following commits: commit d512d32385c428c30473b05b8ba492ff7f987b1c Author: Christian Lohmaier Date: Thu Jul 1 21:20:31 2021 +0200 Branch libreoffice-7-1-5 This is 'libreoffice-7-1-5' - the stable branch for the 7.1.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.1.x release, please use the 'libreoffice-7-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I175bdecd6edfdaf2713da345e4b382ab9159bf5f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-7-1-5'
New branch 'libreoffice-7-1-5' available with the following commits: commit 62306b0c3e152de0bcddc9ab19e36558299d0698 Author: Christian Lohmaier Date: Thu Jul 1 21:20:31 2021 +0200 Branch libreoffice-7-1-5 This is 'libreoffice-7-1-5' - the stable branch for the 7.1.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.1.x release, please use the 'libreoffice-7-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I5e46c666a8c5d0c49cbd4b6e921f83a34558a428 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-1-5'
New branch 'libreoffice-7-1-5' available with the following commits: commit 6590ff1604fc30c628eabada2c7229004e8750b3 Author: Christian Lohmaier Date: Thu Jul 1 21:20:31 2021 +0200 Branch libreoffice-7-1-5 This is 'libreoffice-7-1-5' - the stable branch for the 7.1.5 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.1.x release, please use the 'libreoffice-7-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ib35123391bf505dd4ff8b7300c5f704355d0cf2d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC meeting minutes: 2021-07-01
On Thu, 1 Jul 2021 at 16:46, Miklos Vajna wrote: > * Crash Reporting (Xisco) > >+ Top 5 > - > https://crashreport.libreoffice.org/stats/signature/weld::CustomWidgetController::SetPointer(PointerStyle) The following will probably fix this one: commit 2176084192dc46a1ef5d6dd79effa5cd5d1dcca2 Author: Noel Grandin Date: Thu Jun 17 13:38:07 2021 +0200 fix potential write-after-free in RecentDocsView > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 89fe970da615cee7b984bb905928a5cc9e739a13 Author: Christian Lohmaier AuthorDate: Thu Jul 1 20:45:46 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 20:45:46 2021 +0200 Update git submodules * Update translations from branch 'libreoffice-7-1' to ef50348279adbec84e7e6f800330901efebaeb31 - update translations for 7.1.5 rc1 and force-fix errors using pocheck Change-Id: I4232763382b588d86e2118fea9906f586e5eb19a diff --git a/translations b/translations index ee29ff1930cf..ef50348279ad 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ee29ff1930cf1907812365209b69326a17400969 +Subproject commit ef50348279adbec84e7e6f800330901efebaeb31 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gdb
solenv/gdb/libreoffice/vcl.py | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 66fc670dd3d06f58286532be2de0189ec955f476
Author: Jan-Marek Glogowski
AuthorDate: Thu Jul 1 19:04:25 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Jul 1 19:47:12 2021 +0200
GDB vcl.py: actually return a string in to_string
... and hopefully make it python2.7 compatible... definitly a
"brown paperbag" fix... well it did work locally ;-)
I just noticed, because Jenkins spilled some errors from GDB on
hang with:
Traceback (most recent call last):
File "/.../instdir/program/libvcllo.so-gdb.py", line 23, in
module = importlib.import_module('libreoffice.' + mod)
File "/.../python2.7/importlib/__init__.py", line 37, in import_module
__import__(name)
File "/.../solenv/gdb/libreoffice/vcl.py", line 101
print('STACK', end =", ")
Change-Id: I500e8fea07e9865235e37673dee6374108fefbf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118237
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/solenv/gdb/libreoffice/vcl.py b/solenv/gdb/libreoffice/vcl.py
index ee9634fd5efc..ce595747587a 100644
--- a/solenv/gdb/libreoffice/vcl.py
+++ b/solenv/gdb/libreoffice/vcl.py
@@ -94,19 +94,17 @@ class ImplSchedulerContextPrinter(object):
self.prio = gdb.lookup_type('TaskPriority')
def to_string(self):
-print('{')
+res = "{\n"
if self.value['mnTimerPeriod']:
-print('mnTimerPeriod =', self.value['mnTimerPeriod'])
+res = res + "mnTimerPeriod = " + str(self.value['mnTimerPeriod'])
+ "\n"
if self.value['mpSchedulerStack']:
-print('STACK', end =", ")
-print(self.value['mpSchedulerStack'].dereference())
+res = res + "STACK, " +
str(self.value['mpSchedulerStack'].dereference())
if self.value['mpFirstSchedulerData']:
for key, value in self.prio.items():
first = self.value['mpFirstSchedulerData'][value.enumval]
if first:
-print(key.replace('TaskPriority::', ''), end =", ")
-print(first.dereference())
-print('}')
+res = res + key.replace('TaskPriority::', '') + ", " +
str(first.dereference())
+return res + "}"
printer = None
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 56b4527152c307906df9cf1e6889224ce69b3388 Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:26:56 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 19:26:56 2021 +0200 Update git submodules * Update dictionaries from branch 'libreoffice-7-2' to 793416f25b07ba453d16679e7db6ad81a33ab4bf - Czech Hunspell: fix several verbs of pattern "tisknout" Change-Id: I6d31f9658e2797ff678e36b887f1e2f03689f1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118241 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index a62958b93ff0..793416f25b07 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a62958b93ff057072d51958f515cd3c62c57c784 +Subproject commit 793416f25b07ba453d16679e7db6ad81a33ab4bf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-2' - cs_CZ/cs_CZ.aff cs_CZ/README_cs.txt
cs_CZ/README_cs.txt |2 +- cs_CZ/cs_CZ.aff |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit 793416f25b07ba453d16679e7db6ad81a33ab4bf Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:15:02 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 19:26:56 2021 +0200 Czech Hunspell: fix several verbs of pattern "tisknout" Change-Id: I6d31f9658e2797ff678e36b887f1e2f03689f1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118241 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/README_cs.txt b/cs_CZ/README_cs.txt index d21512e..cb1dcb2 100644 --- a/cs_CZ/README_cs.txt +++ b/cs_CZ/README_cs.txt @@ -615,7 +615,7 @@ Bylo upraveno skloňování substantiv mužského rodu životného zakončených Byla přidána varianta "jedena-" pro tvorbu číslovek (vedle "jedna-" - např. jedenadvacet/jednadvacet). -Byly povoleny chybějící tvary minulého času pro femininum, neutrum a tvary plurálu, např. umlknula, umlknulo, umlknuli, umlknuly - týká se 17 sloves. +U 22 sloves (doschnout, nadchnout aj.) bylo v mužském rodu povoleno příčestí minulé bez -nu-, tzn. doschl, nadchl atd. Přivlastňovací přídavná jména na -ův byla původně uvedena ve slovníku (netvořila se tedy prostřednictvím pravidel v seznamu afixů). To bylo neefektivní: takových položek bylo ve slovníku 48220. Nově se všechny tvary přivlastňovacího přídavného jména v mužském rodu tvoří příznakem u mužských životných vzorů. (Všechny položky, které se vytvoří novými pravidly, byla ze slovníku odstraněna, čímž ubylo 46326 řádků.) Pokryta nejsou jen slova zakončená na -e, -c (Šebrle, Goethe; Balzac), protože v prvním případě se někdy uplatňuje spíše koncovka -ho a v druhém případě se c často - ne však vždy - mění na k. Pravidla pro tvorbu přivlastňovacích adjektiv od substantiv rodu ženského přidána nebyla, protože se tvoří výrazně méně často. Naopak byla ze slovníku odstraněna většina tvarů vytvořených od substantiv typu -ice/ině/yně, která se tvoří jen výjimečně (např. tchynin). diff --git a/cs_CZ/cs_CZ.aff b/cs_CZ/cs_CZ.aff index 3df9b9e..9ebd2c4 100644 --- a/cs_CZ/cs_CZ.aff +++ b/cs_CZ/cs_CZ.aff @@ -1459,7 +1459,7 @@ SFX J íst edlas [^dnt]íst SFX J íst edlos [^dnt]íst -SFX A Y 761 +SFX A Y 757 SFX A íst tu číst SFX A íst teščíst SFX A íst te číst @@ -2132,10 +2132,6 @@ SFX A noutlo [aeiouyáéíóúýůě]rnout SFX A noutli [aeiouyáéíóúýůě]rnout SFX A noutly [aeiouyáéíóúýůě]rnout SFX A out ul [^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out ula[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out ulo[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out uli[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out uly[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout SFX A noutl [^aeiouyáéíóúýůěrl]nout SFX A noutla [^aeiouyáéíóúýůěrl]nout SFX A noutlo [^aeiouyáéíóúýůěrl]nout ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7914a001b750e1b8114f98c8358ca95c3c638c7 Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:25:44 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 19:25:44 2021 +0200 Update git submodules * Update dictionaries from branch 'master' to c608cc40ecc81cdd6ac9000dc890e3f788f2c094 - Czech Hunspell: fix several verbs of pattern "tisknout" Change-Id: I6d31f9658e2797ff678e36b887f1e2f03689f1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118239 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index bcf9aa0b95ca..c608cc40ecc8 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit bcf9aa0b95ca7770c5bb74801289477214213fb4 +Subproject commit c608cc40ecc81cdd6ac9000dc890e3f788f2c094 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: cs_CZ/cs_CZ.aff cs_CZ/README_cs.txt
cs_CZ/README_cs.txt |2 +- cs_CZ/cs_CZ.aff |6 +- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit c608cc40ecc81cdd6ac9000dc890e3f788f2c094 Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:15:02 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 19:25:44 2021 +0200 Czech Hunspell: fix several verbs of pattern "tisknout" Change-Id: I6d31f9658e2797ff678e36b887f1e2f03689f1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118239 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/README_cs.txt b/cs_CZ/README_cs.txt index d21512e..cb1dcb2 100644 --- a/cs_CZ/README_cs.txt +++ b/cs_CZ/README_cs.txt @@ -615,7 +615,7 @@ Bylo upraveno skloňování substantiv mužského rodu životného zakončených Byla přidána varianta "jedena-" pro tvorbu číslovek (vedle "jedna-" - např. jedenadvacet/jednadvacet). -Byly povoleny chybějící tvary minulého času pro femininum, neutrum a tvary plurálu, např. umlknula, umlknulo, umlknuli, umlknuly - týká se 17 sloves. +U 22 sloves (doschnout, nadchnout aj.) bylo v mužském rodu povoleno příčestí minulé bez -nu-, tzn. doschl, nadchl atd. Přivlastňovací přídavná jména na -ův byla původně uvedena ve slovníku (netvořila se tedy prostřednictvím pravidel v seznamu afixů). To bylo neefektivní: takových položek bylo ve slovníku 48220. Nově se všechny tvary přivlastňovacího přídavného jména v mužském rodu tvoří příznakem u mužských životných vzorů. (Všechny položky, které se vytvoří novými pravidly, byla ze slovníku odstraněna, čímž ubylo 46326 řádků.) Pokryta nejsou jen slova zakončená na -e, -c (Šebrle, Goethe; Balzac), protože v prvním případě se někdy uplatňuje spíše koncovka -ho a v druhém případě se c často - ne však vždy - mění na k. Pravidla pro tvorbu přivlastňovacích adjektiv od substantiv rodu ženského přidána nebyla, protože se tvoří výrazně méně často. Naopak byla ze slovníku odstraněna většina tvarů vytvořených od substantiv typu -ice/ině/yně, která se tvoří jen výjimečně (např. tchynin). diff --git a/cs_CZ/cs_CZ.aff b/cs_CZ/cs_CZ.aff index 3df9b9e..9ebd2c4 100644 --- a/cs_CZ/cs_CZ.aff +++ b/cs_CZ/cs_CZ.aff @@ -1459,7 +1459,7 @@ SFX J íst edlas [^dnt]íst SFX J íst edlos [^dnt]íst -SFX A Y 761 +SFX A Y 757 SFX A íst tu číst SFX A íst teščíst SFX A íst te číst @@ -2132,10 +2132,6 @@ SFX A noutlo [aeiouyáéíóúýůě]rnout SFX A noutli [aeiouyáéíóúýůě]rnout SFX A noutly [aeiouyáéíóúýůě]rnout SFX A out ul [^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out ula[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out ulo[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out uli[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout -SFX A out uly[^aeiouyáéíóúýůě]l[^aeiouyáéíóúýůěrl]nout SFX A noutl [^aeiouyáéíóúýůěrl]nout SFX A noutla [^aeiouyáéíóúýůěrl]nout SFX A noutlo [^aeiouyáéíóúýůěrl]nout ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbcd210f49e96b6b2a4ffe594cdb348e907034ca Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:13:17 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 19:13:17 2021 +0200 Update git submodules * Update dictionaries from branch 'libreoffice-7-2' to a62958b93ff057072d51958f515cd3c62c57c784 - Czech Hunspell: fix several nouns and adjectives Change-Id: Ifda579bcc6aec9786355837b42a74ea9b2edc1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118236 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index 862c0fae6769..a62958b93ff0 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 862c0fae6769f230196f2fb2edad5db60994af88 +Subproject commit a62958b93ff057072d51958f515cd3c62c57c784 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-2' - cs_CZ/cs_CZ.dic
cs_CZ/cs_CZ.dic | 28 1 file changed, 12 insertions(+), 16 deletions(-) New commits: commit a62958b93ff057072d51958f515cd3c62c57c784 Author: Stanislav Horacek AuthorDate: Thu Jul 1 18:58:06 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 19:13:17 2021 +0200 Czech Hunspell: fix several nouns and adjectives Change-Id: Ifda579bcc6aec9786355837b42a74ea9b2edc1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118236 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/cs_CZ.dic b/cs_CZ/cs_CZ.dic index 1b444e0..2e17ced 100644 --- a/cs_CZ/cs_CZ.dic +++ b/cs_CZ/cs_CZ.dic @@ -1,4 +1,4 @@ -261168 +261164 a AACR áách @@ -35019,7 +35019,7 @@ Dovole/PV dovolenější/YRW dovolení/SN dovolenka/ZQ -dovolenkář/PI +dovolenkář/U dovolenkový/YR dovolený/YKRN Dovolil/PV @@ -57040,7 +57040,6 @@ Hládková/Y hládkovský/Y Hladký/Y hladký/YKRN -hladnější/YRW Hladníček/PV Hladníčková/Y Hladník/PV @@ -69575,7 +69574,7 @@ Janiczek/PV Janiczková/Y Janič/UV janičár/PI -janičář/PI +janičář/U Janičata/PV Janičatová/Y Janiččin/Y @@ -81917,7 +81916,7 @@ Kolarovičová/Y Kolarovský/Y Kolarz/PV Kolarzová/Y -kolař/PI +kolař/U kolář/U Kolař/UV Kolář/UV @@ -95379,8 +95378,8 @@ Lasáková/Y Lascelles/UV Lascellesová/Y lascivnější/YRW -lascivný/YKRN -lascívný/YKRN +lascivní/YKRN +lascívní/YKRN Lasek/PV Lásenice/S lásenický/YR @@ -114526,7 +114525,6 @@ Myšulková/Y mýt/BTN mytější/YRW mytí/SN -mýtický/YCRN mytický/YR mýtič/S mytičtější/YRW @@ -116487,7 +116485,6 @@ nájezdnictví/S nájezdník/PI nájezdný/YKRN nájezdový/YRN -najezenější/YRW naježenější/YRW naježení/SN naježený/YKRN @@ -137913,7 +137910,7 @@ pamatovat/ATN pamatovávat/JTN pamatující/YN pámbíček/PIV -pámbíčkář/PI +pámbíčkář/U pámbíčkářka/ZQ Pamela/ZQ pámelník/H @@ -138007,7 +138004,7 @@ Panaš/UV Panašová/Y panašování/SN pánbíček/PIV -pánbíčkář/PI +pánbíčkář/U pánbíčkářka/ZQ pánbůh Pánbůh @@ -140942,7 +140939,7 @@ Pejsarová/Y pejsek/PIV Pejskar/PV Pejskarová/Y -pejskař/PI +pejskař/U Pejsová/Y Pejša/PV Pejšek/PV @@ -148627,7 +148624,7 @@ pohnutlivější/YRW pohnutlivý/YR pohnutý/YKRN pohoda/ZQ -pohodář/PI +pohodář/U pohodářský/YRN pohodička/ZQ pohodit/ACN @@ -170258,7 +170255,7 @@ půlit/ATN Pulitzer/PV Pulitzerová/Y půlka/ZQ -půlkař/PI +půlkař/U půlkařčin/Y půlkařka/ZQ Pulkava/ZQ @@ -196711,7 +196708,7 @@ srbský/YRN srbštější/YRW srbština/ZQ Srda/PV -srdcař/PI +srdcař/U srdce/M srdcelomný/YKRN srdcervoucí/Y @@ -222716,7 +222713,6 @@ unesenější/YRW unesení/SN unesený/YKRN unést/ATN -unešenější/YRW Úněšov/L úněšovský/YR Únětice/C ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6d7112d0f90adf5a5f951537d49b02a6fc548bc Author: Stanislav Horacek AuthorDate: Thu Jul 1 19:12:48 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 1 19:12:48 2021 +0200 Update git submodules * Update dictionaries from branch 'master' to bcf9aa0b95ca7770c5bb74801289477214213fb4 - Czech Hunspell: fix several nouns and adjectives Change-Id: Ifda579bcc6aec9786355837b42a74ea9b2edc1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118235 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/dictionaries b/dictionaries index bba36281a0d7..bcf9aa0b95ca 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit bba36281a0d7af91fe65eda9140f811e28d09012 +Subproject commit bcf9aa0b95ca7770c5bb74801289477214213fb4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: cs_CZ/cs_CZ.dic
cs_CZ/cs_CZ.dic | 28 1 file changed, 12 insertions(+), 16 deletions(-) New commits: commit bcf9aa0b95ca7770c5bb74801289477214213fb4 Author: Stanislav Horacek AuthorDate: Thu Jul 1 18:58:06 2021 +0200 Commit: Stanislav Horáček CommitDate: Thu Jul 1 19:12:48 2021 +0200 Czech Hunspell: fix several nouns and adjectives Change-Id: Ifda579bcc6aec9786355837b42a74ea9b2edc1c4 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118235 Tested-by: Stanislav Horáček Reviewed-by: Stanislav Horáček diff --git a/cs_CZ/cs_CZ.dic b/cs_CZ/cs_CZ.dic index 1b444e0..2e17ced 100644 --- a/cs_CZ/cs_CZ.dic +++ b/cs_CZ/cs_CZ.dic @@ -1,4 +1,4 @@ -261168 +261164 a AACR áách @@ -35019,7 +35019,7 @@ Dovole/PV dovolenější/YRW dovolení/SN dovolenka/ZQ -dovolenkář/PI +dovolenkář/U dovolenkový/YR dovolený/YKRN Dovolil/PV @@ -57040,7 +57040,6 @@ Hládková/Y hládkovský/Y Hladký/Y hladký/YKRN -hladnější/YRW Hladníček/PV Hladníčková/Y Hladník/PV @@ -69575,7 +69574,7 @@ Janiczek/PV Janiczková/Y Janič/UV janičár/PI -janičář/PI +janičář/U Janičata/PV Janičatová/Y Janiččin/Y @@ -81917,7 +81916,7 @@ Kolarovičová/Y Kolarovský/Y Kolarz/PV Kolarzová/Y -kolař/PI +kolař/U kolář/U Kolař/UV Kolář/UV @@ -95379,8 +95378,8 @@ Lasáková/Y Lascelles/UV Lascellesová/Y lascivnější/YRW -lascivný/YKRN -lascívný/YKRN +lascivní/YKRN +lascívní/YKRN Lasek/PV Lásenice/S lásenický/YR @@ -114526,7 +114525,6 @@ Myšulková/Y mýt/BTN mytější/YRW mytí/SN -mýtický/YCRN mytický/YR mýtič/S mytičtější/YRW @@ -116487,7 +116485,6 @@ nájezdnictví/S nájezdník/PI nájezdný/YKRN nájezdový/YRN -najezenější/YRW naježenější/YRW naježení/SN naježený/YKRN @@ -137913,7 +137910,7 @@ pamatovat/ATN pamatovávat/JTN pamatující/YN pámbíček/PIV -pámbíčkář/PI +pámbíčkář/U pámbíčkářka/ZQ Pamela/ZQ pámelník/H @@ -138007,7 +138004,7 @@ Panaš/UV Panašová/Y panašování/SN pánbíček/PIV -pánbíčkář/PI +pánbíčkář/U pánbíčkářka/ZQ pánbůh Pánbůh @@ -140942,7 +140939,7 @@ Pejsarová/Y pejsek/PIV Pejskar/PV Pejskarová/Y -pejskař/PI +pejskař/U Pejsová/Y Pejša/PV Pejšek/PV @@ -148627,7 +148624,7 @@ pohnutlivější/YRW pohnutlivý/YR pohnutý/YKRN pohoda/ZQ -pohodář/PI +pohodář/U pohodářský/YRN pohodička/ZQ pohodit/ACN @@ -170258,7 +170255,7 @@ půlit/ATN Pulitzer/PV Pulitzerová/Y půlka/ZQ -půlkař/PI +půlkař/U půlkařčin/Y půlkařka/ZQ Pulkava/ZQ @@ -196711,7 +196708,7 @@ srbský/YRN srbštější/YRW srbština/ZQ Srda/PV -srdcař/PI +srdcař/U srdce/M srdcelomný/YKRN srdcervoucí/Y @@ -222716,7 +222713,6 @@ unesenější/YRW unesení/SN unesený/YKRN unést/ATN -unešenější/YRW Úněšov/L úněšovský/YR Únětice/C ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source test/source
sw/qa/extras/htmlexport/htmlexport.cxx | 28
sw/source/filter/html/htmlflywriter.cxx |4 ++--
test/source/htmltesttools.cxx |5 -
3 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 2d9580e6a65a2699ff61fc1b0e07f62b4946de84
Author: Miklos Vajna
AuthorDate: Thu Jul 1 17:33:42 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 1 18:25:01 2021 +0200
tdf#142871 sw HTML export: avoid unwanted inner PNG for images
Regression from commit e76471c5ce725dae9abb6f78b7674c6f77df34f4 (sw
XHTML / reqif export: export non-PNG graphic shapes directly,
2021-06-02), reqif wants to have a PNG fallback for non-PNG pixel
formats, but this is not needed for plain HTML, make this reqif-only.
Change-Id: I0fc1bc13ad4bf808afbe68407e7db802f910c7a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118233
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 180a2599..b4f307131e8f 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1755,6 +1755,34 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifEmbedShapeAsPNG)
OUString::number(aPixelSize.getWidth()));
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testShapeAsImageHtml)
+{
+// Given a document with a shape:
+loadURL("private:factory/swriter", nullptr);
+uno::Reference xFactory(mxComponent,
uno::UNO_QUERY);
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.RectangleShape"),
uno::UNO_QUERY);
+xShape->setSize(awt::Size(5080, 2540));
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+xDrawPageSupplier->getDrawPage()->add(xShape);
+
+// When exporting to plain HTML:
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+mxComponent->dispose();
+
+// Then make sure importing it back results in a clean doc model:
+mxComponent = loadFromDesktop(maTempFile.GetURL());
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected:
+// - Actual : />
+// i.e. the output was not well-formed.
+CPPUNIT_ASSERT_EQUAL(OUString(" "), getParagraph(1)->getString());
+}
+
CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifEmbedShapeAsPNGCustomDPI)
{
// Given a document with a shape:
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index bc065a7d64c0..e02d73b07016 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1798,7 +1798,7 @@ static void OutHTML_ImageOLEEnd(SwHTMLWriter& rHTMLWrt)
static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat&
rFrameFormat, bool bPNGFallback)
{
SwHTMLWriter& rHTMLWrt = static_cast(rWrt);
-bool bWritePNGFallback = !rHTMLWrt.m_bExportImagesAsOLE && bPNGFallback;
+bool bWritePNGFallback = rHTMLWrt.mbReqIF &&
!rHTMLWrt.m_bExportImagesAsOLE && bPNGFallback;
if (rHTMLWrt.mbSkipImages)
return rWrt;
@@ -1893,7 +1893,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt,
const SwFrameFormat& rF
bool bInCntnr, bool bPNGFallback )
{
SwHTMLWriter& rHTMLWrt = static_cast(rWrt);
-bool bWritePNGFallback = !rHTMLWrt.m_bExportImagesAsOLE && bPNGFallback;
+bool bWritePNGFallback = rHTMLWrt.mbReqIF &&
!rHTMLWrt.m_bExportImagesAsOLE && bPNGFallback;
if (rHTMLWrt.mbSkipImages)
return rWrt;
diff --git a/test/source/htmltesttools.cxx b/test/source/htmltesttools.cxx
index 9f9a1bbddfc6..d61f07bd3d1b 100644
--- a/test/source/htmltesttools.cxx
+++ b/test/source/htmltesttools.cxx
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
@@ -30,7 +31,9 @@ htmlDocUniquePtr HtmlTestTools::parseHtmlStream(SvStream*
pStream)
std::unique_ptr pBuffer(new sal_uInt8[nSize + 1]);
pStream->ReadBytes(pBuffer.get(), nSize);
pBuffer[nSize] = 0;
-return
htmlDocUniquePtr(htmlParseDoc(reinterpret_cast(pBuffer.get()),
nullptr));
+auto pCharBuffer = reinterpret_cast(pBuffer.get());
+SAL_INFO("test", "HtmlTestTools::parseXmlStream: pBuffer is '" <<
pCharBuffer << "'");
+return htmlDocUniquePtr(htmlParseDoc(pCharBuffer, nullptr));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source
sc/source/core/tool/compiler.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit c28ef94db9e4ba0a89ae66b0a38b27fbbb84e74e
Author: Eike Rathke
AuthorDate: Thu Jul 1 15:46:01 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 1 18:24:20 2021 +0200
Resolves: tdf#138432 Use locale's CharClass to parse numeric i18n context
Change-Id: I1828f1b6f93228cd517a6a7bd9ae36584bd801a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118226
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit d703131d063c41b8baca01830c4c9806f99ab7d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118185
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 76a60156fd16..0d1dc9d52aa6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2746,6 +2746,10 @@ Label_MaskStateMachine:
cGroupSep != cArrayColSep && cGroupSep != cArrayRowSep &&
cGroupSep != cDecSep && cGroupSep != cDecSepAlt &&
cGroupSep != cSheetPrefix && cGroupSep != cSheetSep);
+// If a numeric context triggered bi18n then use the default locale's
+// CharClass, this may accept group separator as well.
+const CharClass* pMyCharClass = (ScGlobal::getCharClassPtr()->isDigit(
OUString(pStart[nSrcPos]), 0) ?
+ScGlobal::getCharClassPtr() : pCharClass);
OUStringBuffer aSymbol;
mnRangeOpPosInSymbol = -1;
FormulaError nErr = FormulaError::NONE;
@@ -2756,7 +2760,7 @@ Label_MaskStateMachine:
if ( pStart[nSrcPos] == cSheetPrefix && pStart[nSrcPos+1] == '\'' )
aSymbol.append(pStart[nSrcPos++]);
-ParseResult aRes = pConv->parseAnyToken( aFormula, nSrcPos,
pCharClass, bGroupSeparator);
+ParseResult aRes = pConv->parseAnyToken( aFormula, nSrcPos,
pMyCharClass, bGroupSeparator);
if ( !aRes.TokenType )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - sc/qa sc/source
sc/qa/unit/data/xlsx/autofilternamedrange.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 22 ++
sc/source/filter/inc/workbookhelper.hxx|4 ++--
sc/source/filter/oox/defnamesbuffer.cxx| 11 ++-
sc/source/filter/oox/workbookhelper.cxx| 25 ++---
5 files changed, 44 insertions(+), 18 deletions(-)
New commits:
commit c1c3aa7a57c47078cd431741bd6f9de79a5069f9
Author: Balazs Varga
AuthorDate: Thu May 6 18:47:30 2021 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jul 1 18:00:04 2021 +0200
tdf#127301 XLSX import: hide hidden named range of autofilter
Create but not insert/add hidden FILTER_CRITERIA (_xlnm._FilterDatabase)
to ScRangeName, because no need for them, so avoid of creating
extra named ranges by autofilter re-range (shown in Sheet ->
Named Ranges and Expressions -> Manage...).
See also commit 3a2263a20629b0a3e9b4935dd43dc59817d0241c
"mib17: #163146# XLS import: do not skip hidden names[...]".
Change-Id: Ibfd86942a99b251a59394955bc890e6dbe0390f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115189
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 3cd6402c5443c8069c07d9e420d5ef5b43af6bef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118188
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/qa/unit/data/xlsx/autofilternamedrange.xlsx
b/sc/qa/unit/data/xlsx/autofilternamedrange.xlsx
new file mode 100644
index ..51490d9229ea
Binary files /dev/null and b/sc/qa/unit/data/xlsx/autofilternamedrange.xlsx
differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index dd4c722145ca..de39d062e804 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -300,6 +300,7 @@ public:
void testDeleteCirclesInRowAndCol();
void testTdf129940();
void testTdf139763ShapeAnchor();
+void testAutofilterNamedRangesXLSX();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testCondFormatOperatorsSameRangeXLSX);
@@ -485,6 +486,7 @@ public:
CPPUNIT_TEST(testDeleteCirclesInRowAndCol);
CPPUNIT_TEST(testTdf129940);
CPPUNIT_TEST(testTdf139763ShapeAnchor);
+CPPUNIT_TEST(testAutofilterNamedRangesXLSX);
CPPUNIT_TEST_SUITE_END();
@@ -5456,6 +5458,26 @@ void ScFiltersTest::testTdf139763ShapeAnchor()
xDocSh->DoClose();
}
+void ScFiltersTest::testAutofilterNamedRangesXLSX()
+{
+ScDocShellRef xDocSh = loadDoc(u"autofilternamedrange.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load autofilternamedrange.xlsx",
xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+const ScDBData* pDBData = rDoc.GetDBCollection()->GetDBNearCursor(0, 0, 0);
+CPPUNIT_ASSERT(pDBData);
+ScRange aRange;
+pDBData->GetArea(aRange);
+CPPUNIT_ASSERT_EQUAL(ScRange(0, 0, 0, 0, 3, 0), aRange);
+OUString aPosStr;
+// test there is no '_xlnm._FilterDatabase' named range on the filter area
+const ScRangeData* pRData = rDoc.GetRangeAtBlock(aRange, &aPosStr);
+CPPUNIT_ASSERT(!pRData);
+CPPUNIT_ASSERT_EQUAL(OUString(), aPosStr);
+
+xDocSh->DoClose();
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "sc/qa/unit/data" )
{
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index 0fd9ca5ebc64..7110e5ba47ff 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -168,7 +168,7 @@ public:
OUString& orName,
const css::uno::Sequence<
css::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
-sal_Int32 nNameFlags ) const;
+sal_Int32 nNameFlags, bool bHidden ) const;
/** Creates and returns a defined name on-the-fly in the sheet.
The name will not be buffered in the global defined names buffer.
@@ -177,7 +177,7 @@ public:
OUString& orName,
const css::uno::Sequence<
css::sheet::FormulaToken>& rTokens,
sal_Int32 nIndex,
-sal_Int32 nNameFlags, sal_Int32 nTab ) const;
+sal_Int32 nNameFlags, sal_Int32 nTab, bool bHidden
) const;
/** Creates and returns a database range on-the-fly in the Calc document.
The range will not be buffered in the global table buffer.
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index 733d4790f8ff..5f1bc1c01bf4 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -225,16 +225,17 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
using namespace ::com::sun::star::sheet::NamedRan
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - basic/source
basic/source/runtime/methods.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit bf3c4e49a48178849f75e6449ec47ab3ff456878
Author: Julien Nabet
AuthorDate: Wed Jun 30 22:55:46 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Jul 1 17:34:24 2021 +0200
tdf#143081: fix Basic Replace() function crashes LO
0x7f19c0aa6e57 in rtl::OUStringBuffer::append(char16_t const*, int)
(this=0x7fff100d0748, str=0x6f6f46a u"晦饖香©", len=-1) at
include/rtl/ustrbuf.hxx:659
0x7f19c0c3c8a8 in SbRtl_Replace(StarBASIC*, SbxArray&, bool) (rPar=...)
at basic/source/runtime/methods.cxx:1321
see bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=173298
Calling xCharClass->toUpper may change words, eg: "Straße" becomes "Strasse"
so the length of the word increases.
In brief, we want to use the length of aSrcStr not aExpStr
Change-Id: Ia291d47a2021efc7dd9162ca5cc72b7940fdd71e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118202
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 4a0b40f1be9f6773c8ebc5331c257911a76a5cee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118178
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118229
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 1a598490d68a..ebd48c9cc473 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1276,8 +1276,6 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
const OUString aExpStr = rPar.Get32(1)->GetOUString();
OUString aFindStr = rPar.Get32(2)->GetOUString();
const OUString aReplaceStr = rPar.Get32(3)->GetOUString();
-const sal_Int32 nExpStrLen = aExpStr.getLength();
-const sal_Int32 nFindStrLen = aFindStr.getLength();
OUString aSrcStr(aExpStr);
if (bCaseInsensitive)
@@ -1288,10 +1286,12 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(),
rLocale);
aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(),
rLocale);
}
+const sal_Int32 nSrcStrLen = aSrcStr.getLength();
+const sal_Int32 nFindStrLen = aFindStr.getLength();
// Note: the result starts from lStartPos, removing everything to the
left. See i#94895.
-sal_Int32 nPrevPos = std::min(lStartPos - 1, nExpStrLen);
-OUStringBuffer sResult(nExpStrLen - nPrevPos);
+sal_Int32 nPrevPos = std::min(lStartPos - 1, nSrcStrLen);
+OUStringBuffer sResult(nSrcStrLen - nPrevPos);
sal_Int32 nCounts = 0;
while (lCount == -1 || lCount > nCounts)
{
@@ -1308,7 +1308,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
break;
}
}
-sResult.append(aExpStr.getStr() + nPrevPos, nExpStrLen - nPrevPos);
+sResult.append(aExpStr.getStr() + nPrevPos, nSrcStrLen - nPrevPos);
rPar.Get32(0)->PutString(sResult.makeStringAndClear());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - sc/qa sc/source
sc/qa/uitest/autofilter/tdf141946.py | 75 +++
sc/source/core/tool/dbdata.cxx | 10 ++--
2 files changed, 80 insertions(+), 5 deletions(-)
New commits:
commit c950cce0ce669063f9a30ab4decf9f1efc757633
Author: Tünde Tóth
AuthorDate: Thu Apr 29 14:46:25 2021 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jul 1 17:32:12 2021 +0200
tdf#141946 sc: fix broken filter criteria when inserting column
The autofilter criteria weren't remain with the filtered column
when we inserted a column left of the filtered column.
Change-Id: If366d9de9518da3d13ec2ba6b1b36e4f98c76019
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114881
Tested-by: Jenkins
Reviewed-by: Balazs Varga
(cherry picked from commit 4b8459e86c7a411d8f02fc5480033cb031a941f2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118187
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/qa/uitest/autofilter/tdf141946.py
b/sc/qa/uitest/autofilter/tdf141946.py
new file mode 100644
index ..4e45ecfb7d5a
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf141946.py
@@ -0,0 +1,75 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+#Bug 141946 - EDITING Inserting column before autofiltered column empties
autofilter
+
+class tdf141946(UITestCase):
+def test_tdf141946_inserted_column(self):
+self.ui_test.create_doc_in_start_center("calc")
+document = self.ui_test.get_component()
+calcDoc = self.xUITest.getTopFocusWindow()
+gridwin = calcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+enter_text_to_cell(gridwin, "A1", "A")
+enter_text_to_cell(gridwin, "A2", "1")
+enter_text_to_cell(gridwin, "A3", "2")
+enter_text_to_cell(gridwin, "A4", "3")
+
+enter_text_to_cell(gridwin, "B1", "B")
+enter_text_to_cell(gridwin, "B2", "4")
+enter_text_to_cell(gridwin, "B3", "5")
+enter_text_to_cell(gridwin, "B4", "6")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B4"}))
+
+self.xUITest.executeCommand(".uno:DataFilterAutoFilter")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+xEntry = xList.getChild("1")
+xEntry.executeAction("CLICK", tuple())
+
+xOkButton = xFloatWindow.getChild("ok")
+xOkButton.executeAction("CLICK", tuple())
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
+
+self.xUITest.executeCommand(".uno:InsertColumnsBefore")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "0", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(2, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(1, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "2", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(3, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index d0d7f87339ba..458058a5251e 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -367,8 +367,8 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW n
ScQueryEntry& rEntry = mpQueryParam->GetEntry(i);
rEntry.nField += nDifX;
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - sc/inc sc/qa sc/source
sc/inc/dbdata.hxx |3 +
sc/qa/uitest/autofilter/tdf48025.py | 72
sc/source/core/tool/dbdata.cxx | 24 +++-
3 files changed, 96 insertions(+), 3 deletions(-)
New commits:
commit a703f2d7b0647e264220efc4a042086396e27238
Author: Tünde Tóth
AuthorDate: Thu Apr 22 14:19:41 2021 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jul 1 17:22:18 2021 +0200
tdf#48025 sc: fix broken filter criteria when deleting columns
The autofilter criteria weren't remain with the filtered column
when we deleted a column left of the filtered column or
the filtered column itself.
Change-Id: I0eb103ea5569d82eac4d81bce1b31b0c3bbcbf41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114483
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit edb64cc363e782470870089041c48993d7c34de5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118186
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c39d8676ffb6..a406e3fb4c5b 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -125,7 +125,8 @@ public:
voidGetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2,
SCROW& rRow2) const;
SC_DLLPUBLIC void GetArea(ScRange& rRange) const;
voidSetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
-voidMoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
+voidMoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
+ SCCOL nUpdateCol = -1);
voidSetByRow(bool bByR) { bByRow = bByR; }
boolHasHeader() const { return bHasHeader; }
voidSetHeader(bool bHasH) { bHasHeader = bHasH; }
diff --git a/sc/qa/uitest/autofilter/tdf48025.py
b/sc/qa/uitest/autofilter/tdf48025.py
new file mode 100644
index ..c5d5c711da5f
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf48025.py
@@ -0,0 +1,72 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+#Bug 48025 - EDITING AUTOFILTER: Autofilter settings stay with the column
number when deleting columns
+
+class tdf48025(UITestCase):
+def test_tdf48025_deleted_columns(self):
+self.ui_test.create_doc_in_start_center("calc")
+document = self.ui_test.get_component()
+calcDoc = self.xUITest.getTopFocusWindow()
+gridwin = calcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+enter_text_to_cell(gridwin, "A1", "A")
+enter_text_to_cell(gridwin, "A2", "1")
+enter_text_to_cell(gridwin, "A3", "2")
+enter_text_to_cell(gridwin, "A4", "3")
+
+enter_text_to_cell(gridwin, "B1", "B")
+enter_text_to_cell(gridwin, "B2", "4")
+enter_text_to_cell(gridwin, "B3", "5")
+enter_text_to_cell(gridwin, "B4", "6")
+
+enter_text_to_cell(gridwin, "C1", "C")
+enter_text_to_cell(gridwin, "C2", "7")
+enter_text_to_cell(gridwin, "C3", "8")
+enter_text_to_cell(gridwin, "C4", "9")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C4"}))
+
+self.xUITest.executeCommand(".uno:DataFilterAutoFilter")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+xEntry = xList.getChild("1")
+xEntry.executeAction("CLICK", tuple())
+
+xOkButton = xFloatWindow.getChild("ok")
+xOkButton.executeAction("CLICK", tuple())
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+
+self.xUITest.executeCommand(".uno:DeleteColumns")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "0", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(3, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_
[Libreoffice-commits] core.git: oox/source sc/qa sc/source
oox/source/token/tokens.txt |5 ++
sc/qa/unit/data/xlsx/button-form-control.xlsx |binary
sc/qa/unit/subsequent_export-test2.cxx| 25 ++
sc/source/filter/excel/xeescher.cxx | 63 +-
sc/source/filter/xcl97/xcl97rec.cxx |1
5 files changed, 93 insertions(+), 1 deletion(-)
New commits:
commit 1e3263a677b61c718d0fd1be15c066b933f7de18
Author: Miklos Vajna
AuthorDate: Thu Jul 1 12:34:52 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 1 17:15:30 2021 +0200
XLSX export: handle button form controls
This builds on top of commit 94678a7b9c6b7e577c15adacc885e03551bcf17b
(XLSX export: improve handling of checkbox (form controls), 2021-06-30),
so now both checkboxes and buttons are handled during export.
Change-Id: I278b4925414d29399401cc15ab3d944db88ee0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118219
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 4d2fb881f0bc..997b3e8b3b25 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -713,6 +713,7 @@ autoLoad
autoNoTable
autoPage
autoPageBreaks
+autoPict
autoRecover
autoRedefine
autoRepublish
@@ -1403,6 +1404,7 @@ contributors
control
control1
control2
+controlPr
controls
convMailMergeEsc
convex
@@ -2372,6 +2374,7 @@ forcedash
foredepth
forestGreen
forgetLastTabAlignment
+formControlPr
formFld
formLetters
formProt
@@ -3179,6 +3182,7 @@ location
lock
lockRevision
lockStructure
+lockText
lockWindows
locked
lockedCanvas
@@ -3661,6 +3665,7 @@ objOverTx
objTx
object
objectDefaults
+objectType
objects
obliqueBottom
obliqueBottomLeft
diff --git a/sc/qa/unit/data/xlsx/button-form-control.xlsx
b/sc/qa/unit/data/xlsx/button-form-control.xlsx
new file mode 100644
index ..c5e9fe65a245
Binary files /dev/null and b/sc/qa/unit/data/xlsx/button-form-control.xlsx
differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx
b/sc/qa/unit/subsequent_export-test2.cxx
index 6036bddd8369..d23145c67cf2 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -188,6 +188,7 @@ public:
void testTdf126541_SheetVisibilityImportXlsx();
void testTdf140431();
void testCheckboxFormControlXlsxExport();
+void testButtonFormControlXlsxExport();
CPPUNIT_TEST_SUITE(ScExportTest2);
@@ -284,6 +285,7 @@ public:
CPPUNIT_TEST(testTdf126541_SheetVisibilityImportXlsx);
CPPUNIT_TEST(testTdf140431);
CPPUNIT_TEST(testCheckboxFormControlXlsxExport);
+CPPUNIT_TEST(testButtonFormControlXlsxExport);
CPPUNIT_TEST_SUITE_END();
@@ -2323,6 +2325,29 @@ void ScExportTest2::testCheckboxFormControlXlsxExport()
assertXPathContent(pDoc, "/xml/v:shape/xx:ClientData/xx:Anchor", "1, 22,
3, 3, 3, 30, 6, 1");
}
+void ScExportTest2::testButtonFormControlXlsxExport()
+{
+// Given a document that has a checkbox form control:
+ScDocShellRef xShell = loadDoc(u"button-form-control.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+
+// When exporting to XLSX:
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+// Then make sure its control markup is written and it has a correct
position + size:
+xmlDocUniquePtr pDoc
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pDoc);
+// Without the fix in place, this test would have failed with:
+// - XPath '//x:anchor/x:from/xdr:col' not found
+// i.e. the control markup was missing, the button was lost on export.
+assertXPathContent(pDoc, "//x:anchor/x:from/xdr:col", "1");
+assertXPathContent(pDoc, "//x:anchor/x:from/xdr:row", "3");
+assertXPathContent(pDoc, "//x:anchor/x:to/xdr:col", "3");
+assertXPathContent(pDoc, "//x:anchor/x:to/xdr:row", "7");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 2f1253c0a16e..fcffbd7534b2 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1144,6 +1144,9 @@ void VmlFormControlExporter::EndShape(sal_Int32
nShapeElement)
case EXC_OBJTYPE_CHECKBOX:
aObjectType = "Checkbox";
break;
+case EXC_OBJTYPE_BUTTON:
+aObjectType = "Button";
+break;
}
pVmlDrawing->startElement(FSNS(XML_x, XML_ClientData), XML_ObjectType,
aObjectType);
OString aAnchor = OString::number(m_aAreaFrom.Left());
@@ -1156,7 +1159,11 @@ void VmlFormControlExporter::EndShape(sal_Int32
nShapeElement)
aAnchor += ", " + OString::number(m_aAreaTo.Bottom());
XclXmlUtils::WriteElement(pVmlDrawing, FSNS(XML_x, XML_Anchor), aAnchor);
-// XclExpOcxControlObj::WriteSubRecs() has the same f
[Libreoffice-commits] core.git: oox/source
oox/source/export/DMLPresetShapeExport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e190196f255b7d0147d61fd967a2b2a61a932185 Author: Attila Bakos (NISZ) AuthorDate: Thu Jul 1 14:30:05 2021 +0200 Commit: László Németh CommitDate: Thu Jul 1 17:12:32 2021 +0200 tdf#143028 DOCX export: fix RangeY regression of preset shapes Use property name "RangeYMaximum" instead of "RangeXMaximum" in GetAdjustmentPointYValue(). Regression from commit 99a459dfdfd9f82ed3506708e131dd52a1a62384 (tdf#143028 DOCX: fix corrupt export of shape "bracePair" etc.) Thanks to Regina Henschel for reporting the problem. Change-Id: I2bdc4be9338d0fe4973a209ee97a4d5880aaac6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118223 Tested-by: László Németh Reviewed-by: László Németh diff --git a/oox/source/export/DMLPresetShapeExport.cxx b/oox/source/export/DMLPresetShapeExport.cxx index e8d2f26e2e5b..9da095bf2dc3 100644 --- a/oox/source/export/DMLPresetShapeExport.cxx +++ b/oox/source/export/DMLPresetShapeExport.cxx @@ -203,7 +203,7 @@ DMLPresetShapeExporter::GetAdjustmentPointYValue(sal_Int32 nPoint) aRet.nMinVal = GetHandleValueOfModificationPoint(nPoint, u"RangeYMinimum") .get() .Value.get(); -aRet.nMaxVal = GetHandleValueOfModificationPoint(nPoint, u"RangeXMaximum") +aRet.nMaxVal = GetHandleValueOfModificationPoint(nPoint, u"RangeYMaximum") .get() .Value.get(); aRet.nCurrVal = GetAdjustmentValues()[aValPos.Second.Value.get()].Value.get(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - sc/qa sc/source
sc/qa/unit/data/ods/tdf140098.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 20
sc/source/filter/excel/excrecds.cxx | 21 +
sc/source/filter/inc/excrecds.hxx |1 +
4 files changed, 38 insertions(+), 4 deletions(-)
New commits:
commit d942d7e47505f57fbdfd756fd47c79724b48db3f
Author: Balazs Varga
AuthorDate: Thu Feb 11 13:22:25 2021 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jul 1 17:12:10 2021 +0200
tdf#140098 sc ooxml: fix export of blank filter in non empty filters
Export blank filter value in non empty filters, as the OOXML standard
required.
Change-Id: I4e1e3d8e1e2e784d1b4adc5e385f200af86d18ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110762
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 66da7cd0a52532d6e73eb2cde78ca369917ab01a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118183
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/qa/unit/data/ods/tdf140098.ods
b/sc/qa/unit/data/ods/tdf140098.ods
new file mode 100644
index ..ea7f753edfa0
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf140098.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 9b54d779c917..9b0aa643b1b4 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -269,6 +269,7 @@ public:
void testHeaderFontStyleXLSX();
void testTdf135828_Shape_Rect();
void testTdf123353();
+void testTdf140098();
void testTdf133688_precedents();
void testTdf91251_missingOverflowRoundtrip();
void testTdf137000_handle_upright();
@@ -449,6 +450,7 @@ public:
CPPUNIT_TEST(testHeaderFontStyleXLSX);
CPPUNIT_TEST(testTdf135828_Shape_Rect);
CPPUNIT_TEST(testTdf123353);
+CPPUNIT_TEST(testTdf140098);
CPPUNIT_TEST(testTdf133688_precedents);
CPPUNIT_TEST(testTdf91251_missingOverflowRoundtrip);
CPPUNIT_TEST(testTdf137000_handle_upright);
@@ -5567,6 +5569,24 @@ void ScExportTest::testTdf123353()
xShell->DoClose();
}
+void ScExportTest::testTdf140098()
+{
+ScDocShellRef xShell = loadDoc(u"tdf140098.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+
+xmlDocUniquePtr pDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/x:worksheet/x:autoFilter/x:filterColumn/x:filters",
"blank", "1");
+
+xShell->DoClose();
+}
+
void ScExportTest::testTdf133688_precedents()
{
// tdf#133688 Check that we do not export detective shapes.
diff --git a/sc/source/filter/excel/excrecds.cxx
b/sc/source/filter/excel/excrecds.cxx
index c31c81dba4db..2ceede68 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -620,7 +620,8 @@ XclExpAutofilter::XclExpAutofilter( const XclExpRoot&
rRoot, sal_uInt16 nC ) :
XclExpRoot( rRoot ),
meType(FilterCondition),
nCol( nC ),
-nFlags( 0 )
+nFlags( 0 ),
+bHasBlankValue( false )
{
}
@@ -704,7 +705,10 @@ bool XclExpAutofilter::AddEntry( const ScQueryEntry&
rEntry )
// empty/nonempty fields
if (rEntry.IsQueryByEmpty())
-bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_EMPTY,
EXC_AFOPER_NONE, 0.0, nullptr, true );
+{
+bConflict = !AddCondition(rEntry.eConnect, EXC_AFTYPE_EMPTY,
EXC_AFOPER_NONE, 0.0, nullptr, true);
+bHasBlankValue = true;
+}
else if(rEntry.IsQueryByNonEmpty())
bConflict = !AddCondition( rEntry.eConnect, EXC_AFTYPE_NOTEMPTY,
EXC_AFOPER_NONE, 0.0, nullptr, true );
// other conditions
@@ -782,7 +786,12 @@ void XclExpAutofilter::AddMultiValueEntry( const
ScQueryEntry& rEntry )
meType = MultiValue;
const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
for (const auto& rItem : rItems)
-maMultiValues.push_back( std::make_pair(rItem.maString.getString(),
rItem.meType == ScQueryEntry::ByDate) );
+{
+if( rItem.maString.isEmpty() )
+bHasBlankValue = true;
+else
+maMultiValues.push_back(std::make_pair(rItem.maString.getString(),
rItem.meType == ScQueryEntry::ByDate));
+}
}
void XclExpAutofilter::WriteBody( XclExpStream& rStrm )
@@ -837,7 +846,11 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
break;
case MultiValue:
{
-rWorksheet->startElement(XML_filters);
+if( bHasBlankValue )
+rWorksheet->startElement(XML_filters, XML_blank, "1");
+else
+rWorksheet->startElement(XML_filters);
+
for (const auto& rMultiValue : maMultiValues)
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d703131d063c41b8baca01830c4c9806f99ab7d2
Author: Eike Rathke
AuthorDate: Thu Jul 1 15:46:01 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 1 17:10:07 2021 +0200
Resolves: tdf#138432 Use locale's CharClass to parse numeric i18n context
Change-Id: I1828f1b6f93228cd517a6a7bd9ae36584bd801a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118226
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 76a60156fd16..0d1dc9d52aa6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2746,6 +2746,10 @@ Label_MaskStateMachine:
cGroupSep != cArrayColSep && cGroupSep != cArrayRowSep &&
cGroupSep != cDecSep && cGroupSep != cDecSepAlt &&
cGroupSep != cSheetPrefix && cGroupSep != cSheetSep);
+// If a numeric context triggered bi18n then use the default locale's
+// CharClass, this may accept group separator as well.
+const CharClass* pMyCharClass = (ScGlobal::getCharClassPtr()->isDigit(
OUString(pStart[nSrcPos]), 0) ?
+ScGlobal::getCharClassPtr() : pCharClass);
OUStringBuffer aSymbol;
mnRangeOpPosInSymbol = -1;
FormulaError nErr = FormulaError::NONE;
@@ -2756,7 +2760,7 @@ Label_MaskStateMachine:
if ( pStart[nSrcPos] == cSheetPrefix && pStart[nSrcPos+1] == '\'' )
aSymbol.append(pStart[nSrcPos++]);
-ParseResult aRes = pConv->parseAnyToken( aFormula, nSrcPos,
pCharClass, bGroupSeparator);
+ParseResult aRes = pConv->parseAnyToken( aFormula, nSrcPos,
pMyCharClass, bGroupSeparator);
if ( !aRes.TokenType )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/salbmp.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit aa7b1f2ec7da5b94459f808e151085f4d301afd1
Author: Attila Szűcs
AuthorDate: Thu Jul 1 02:58:09 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 17:05:29 2021 +0200
tdf#143059 sw export: fix assert crash
Incomplete reset in SkiaSalBitmap::ResetAllData() was
followed by a broken scaling of a dummy image without
buffer/image data.
SvxLineStyleToolBoxControl::statusChanged() creates
a dummy image via GetBitmapForUISolidLine... deleted its
image/buffer data immediately ("no line style" dummy
image preview for the line style popup list).
But the dummy image wasn't ready, it still needed
postponed scaling processed by the GPU. This information
wasn't reset by Erase, and without pixel data it couldn't
be scaled, so this dummy image became a forever "not ready"/
"waiting to be scaled" image. There are parts in the code
that require that the image is already scaled... These parts
check if scalings are ended with the assert(mPixelsSize == mSize).
Note: Use the following method to start LO with Skia in Linux
SAL_USE_VCLPLUGIN=gen SAL_ENABLESKIA=1 ./soffice
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: I5099eb8671a1c5d16668743f26feb47fe99cd70e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118204
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index fa2cf67ed5d9..3c0c9d32ed99 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -1289,6 +1289,8 @@ void SkiaSalBitmap::ResetAllData()
mImage.reset();
mAlphaImage.reset();
mEraseColorSet = false;
+mPixelsSize = mSize;
+ComputeScanlineSize();
}
void SkiaSalBitmap::ResetPendingScaling()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting minutes: 2021-07-01
* Present: + Olivier, Eike, Cloph, Florian, Thorsten, Michael W, Heiko, Caolan, Miklos, Xisco, Hossein, Michael S * Completed Action Items: + change.mergeabilityComputationBehavior=NEVER for gerrit.libreoffice.org (Guilhem) * Pending Action Items: + None * Release Engineering update (Cloph) + 7.2 status: 7.2 rc1 next week: string & UI freeze + late features → both editeng multi-column + list label changes are in + 7.1 status: 7.1.5 rc1 tag later today + Remotes: Android, iOS + Android viewer * Documentation (Olivier) + New Help (No news) + Helpcontent2 + Refactors (Johnny_M, ohallot, fitoshido) + Updates (S. Fanning, ohallot) + New pages on ScriptForge (R. lima) + Open 246, closed 4, new 1, partial:22 + Question: Do we need to add MPLV2 licenses to Basic libraries bundled in LibreOffice? + most of them in “LO Macros” (Tools, Euro, Gimmnick…) (yes/no) + Also for Access2Base (yes/no) + and ScriptForge (yes/no) + will ask the board + Guides + community working on Guides * UX Update (Heiko) + Bugzilla (topicUI) statistics 256(256) (topicUI) bugs open, 143(143) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 3(1) 8(3) 23(3) 71(1) commented 47(10) 230(-22) 828(-18) 3636(-42) removed 1(1) 5(0) 15(1) 34(-1) resolved 7(-1)50(-9)147(6) 513(2) + top 10 contributors: Heiko Tietze made 189 changes in 1 month, and 2373 changes in 1 year Foote, V Stuart made 75 changes in 1 month, and 640 changes in 1 year Dieter made 35 changes in 1 month, and 403 changes in 1 year Eyal Rozenberg made 28 changes in 1 month, and 111 changes in 1 year Max L. made 16 changes in 1 month, and 16 changes in 1 year Telesto made 14 changes in 1 month, and 797 changes in 1 year BogdanB made 13 changes in 1 month, and 159 changes in 1 year Stéphane Guillou made 11 changes in 1 month, and 12 changes in 1 year Ilmari Lauhakangas made 10 changes in 1 month, and 331 changes in 1 year Kaganski, Mike made 10 changes in 1 month, and 185 changes in 1 year + 7 new tickets with needsUXEval Jun/25-Jul/01 [Bug 143144] (wishlist) "Input list" field: Add confirmation dialog in order to prevent lost of data [Bug 143138] Can't paste unformatted text as table cells in Writer [Bug 143103] Support Color Filter in "Standard Filter" dialog [Bug 143098] The 'Styles Preview' section in the Tabbed NB doesn't follow the system theme ->[Bug 142720] UI: Sidebar Styles follow active document across all windows + navigator can stick to the current document [Bug 143079] UI: a way to save the content of the style inspector. Making manual comparison of formatting changes of DOCX/ODT easier [Bug 143055] Snap-to-grid button should be on more toolbars, optionally or by default -> + Calc Survey + draft for discussion at https://www.mail-archive.com/design@global.libreoffice.org/msg09476.html + deadline: next Wed → + Removing the replacement of dashes into EN/EM from replacement table + https://gerrit.libreoffice.org/c/core/+/117585 + proposal: remove this from the replacement table of all languages + duplicates code vs configuration + what is the shortcut to get the EM dash? Where is the doc for this? (Olivier) + probably the config was not used at all by default * Crash Testing (Caolan) + 16(-2) import failure, 8(-1) export failures + 0 coverity issues + 12 ossfuzz issues + a substantial improvement * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/7.0.6.2 + (-16) 963 979 1143 1052 824 234 0 + https://crashreport.libreoffice.org/stats/version/7.1.3.2 + (-1134) 3553 4687 6349 7105 6534 5427 3679 1730 0 + https://crashreport.libreoffice.org/stats/version/7.1.4.2 + (+1136) 3104 1968 1590 0 + Top 5 - https://crashreport.libreoffice.org/stats/signature/weld::CustomWidgetController::SetPointer(PointerStyle) - https://crashreport.libreoffice.org/stats/signature/SfxApplication::GetSidebarTheme() - https://crashreport.libreoffice.org/stats/signature/vcl::Window::GetParentWithLOKNotifier() - https://crashreport.libreoffice.org/stats/signature/vcl::Window::SetPointer(PointerStyle) this is the same crash as #1 - https://crashreport.libreoffice.org/stats/signature/SalInstanceTreeView::get_drag_source() + Cloph fixed the symbols, every crashreport is resolved + no steps to reproduce for these yet * Mentoring/easyhack update (Hossein) + 3 mins presentation with charts of the below → slides on nextcloud
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source
sc/source/ui/pagedlg/tphf.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 43b7bde9d798e901de387b1ebefbd952f6f87834
Author: László Németh
AuthorDate: Thu Jul 1 13:15:35 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 16:36:20 2021 +0200
sc: VclPtr, missing dispose (Page Style->Edit...->Header)
Test under Linux:
1) Open Format->Page Style;
2) disable checkbox "Same content on left and right pages";
3) click on the button "Edit..." to open the Header dialog;
4) click on "Ok".
Change-Id: I2ce403a7a37d71f8f6510b6ad00028bc9f7fc5a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118221
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 5976b54198d24dcf1d8d1684da4da2cf334abe5d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118181
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 2a8af81e01ec..406e23ed24bc 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -165,6 +165,8 @@ IMPL_LINK_NOARG(ScHFPage, BtnHdl, weld::Button&, void)
{
aDataSet.Put( *pDlg->GetOutputItemSet() );
}
+
+pDlg->disposeOnce();
});
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - xmloff/source
xmloff/source/transform/TransformerBase.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f63286d937fd0cad130dd6065d15b2c80c09e510
Author: Jan-Marek Glogowski
AuthorDate: Wed Jun 30 11:01:06 2021 +
Commit: Jan-Marek Glogowski
CommitDate: Thu Jul 1 16:29:12 2021 +0200
Fix potential (but unlikely) overflow
warning: assuming signed overflow does not occur when assuming
that (X + c) >= X is always true [-Wstrict-overflow]
while( nPos < nLen )
~^~
Change-Id: I95e3bb4a131eaf4e82fbc74cc0bea92930b6afe9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118159
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit a876055b6f56e838114cce041d4c49aed43693f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118111
diff --git a/xmloff/source/transform/TransformerBase.cxx
b/xmloff/source/transform/TransformerBase.cxx
index c937e00ca2c4..8814d19f26af 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1315,12 +1315,12 @@ bool XMLTransformerBase::ConvertURIToOOo( OUString&
rURI,
{
case '/':
// a relative path segment within the package
-nPos = nLen;// leave loop
+nPos = nLen - 1;// leave loop
break;
case ':':
// a schema
bPackage = false;
-nPos = nLen;// leave loop
+nPos = nLen - 1;// leave loop
break;
default:
// we don't care about any other characters
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - configure.ac
configure.ac |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 722b5d168685e2f60189b529ba96cf39ae7bd41e
Author: Jan-Marek Glogowski
AuthorDate: Fri Jun 11 11:57:40 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Jul 1 16:28:44 2021 +0200
configure: make OpenLDAP test independent from X11
I missed that PostgreSQL can be build on MacOSX with OpenLDAP
support. Stephan had an incremental build failure because of it.
But instead of opting-in using test_openldap=yes on MacOSX, like
on Haiku, this drops the using_x11 dependency and defaults to
"yes", like it was before. This was more of a convenience then
reality anyway, and it makes really not much sense to disable
OpenLDAP in case of --without-x.
Change-Id: I959a3b30f1c369264174302f18267a4eb40a3a52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117046
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit e09bd4a994e9d4e471da540d9c85ec3afe5d0ca5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117634
diff --git a/configure.ac b/configure.ac
index a8e153ab5c6d..1bd3fb28e22c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -821,6 +821,7 @@ build_crypto=yes
test_cmis=yes
test_curl=yes
test_gdb_index=no
+test_openldap=yes
test_split_debug=no
test_webdav=yes
@@ -910,6 +911,7 @@ cygwin*|wsl*)
using_freetype_fontconfig=no
using_x11=no
+test_openldap=no
build_skia=yes
_os=WINNT
@@ -965,6 +967,7 @@ ios*) # iOS
using_x11=no
build_crypto=no
test_cmis=no
+test_openldap=no
test_webdav=no
if test -n "$LODE_HOME" ; then
mac_sanitize_path
@@ -1066,6 +1069,7 @@ linux-android*)
using_headless_plugin=no
using_x11=no
build_crypto=no
+test_openldap=no
test_system_freetype=no
test_webdav=no
disable_database_connectivity_dependencies
@@ -1086,7 +1090,6 @@ haiku*)
using_x11=no
test_gtk3_kde5=no
test_kf5=yes
-test_openldap=yes
enable_odk=no
enable_coinmp=no
enable_pdfium=no
@@ -1099,6 +1102,7 @@ haiku*)
emscripten)
using_freetype_fontconfig=yes
using_x11=no
+test_openldap=no
enable_compiler_plugins=no
test_cmis=no
test_webdav=no
@@ -1127,7 +1131,6 @@ test "${test_gstreamer_1_0+set}" = set ||
test_gstreamer_1_0="$using_x11"
test "${test_gtk3+set}" = set || test_gtk3="$using_x11"
test "${test_gtk4+set}" = set || test_gtk4="$using_x11"
test "${test_kf5+set}" = set || test_kf5="$using_x11"
-test "${test_openldap+set}" = set || test_openldap="$using_x11"
# don't handle test_qt5, so it can disable test_kf5 later
test "${test_randr+set}" = set || test_randr="$using_x11"
test "${test_xrender+set}" = set || test_xrender="$using_x11"
@@ -1155,7 +1158,6 @@ disable_x11_tests()
test_gtk3=no
test_gtk4=no
test_kf5=no
-test_openldap=no
test_qt5=no
test_randr=no
test_xrender=no
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source svl/source svx/source sw/source
sfx2/source/view/viewfrm.cxx | 14 +++---
svl/source/items/stylepool.cxx |5 +++--
svx/source/sdr/properties/textproperties.cxx |4 ++--
sw/source/core/access/accpara.cxx| 26 --
sw/source/core/attr/swatrset.cxx |8
sw/source/core/docnode/node.cxx |8
sw/source/core/text/txtfld.cxx | 14 ++
sw/source/core/unocore/unoframe.cxx |6 +++---
sw/source/filter/ww8/ww8par4.cxx | 14 +++---
sw/source/ui/misc/pgfnote.cxx|6 +++---
sw/source/uibase/shells/basesh.cxx |6 +++---
sw/source/uibase/uiview/viewsrch.cxx | 17 -
12 files changed, 62 insertions(+), 66 deletions(-)
New commits:
commit 608f273e9da412e7a2d884f2603756cb4ff4c8af
Author: Noel Grandin
AuthorDate: Thu Jul 1 10:10:35 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 16:11:06 2021 +0200
can allocate these SfxItemSet on the stack
Change-Id: Ib2b89613ad3e8f2bcdd51bee10bab3559a64fce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118208
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b7fa742cabe8..844851c53d3f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -673,11 +673,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
xOldObj->Get_Impl()->pReloadTimer.reset();
-std::unique_ptr pNewSet;
+std::optional pNewSet;
std::shared_ptr pFilter =
pMedium->GetFilter();
if( pURLItem )
{
-pNewSet.reset(new SfxAllItemSet( pApp->GetPool() ));
+pNewSet.emplace( pApp->GetPool() );
pNewSet->Put( *pURLItem );
// Filter Detection
@@ -694,7 +694,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
else
{
-pNewSet.reset(new SfxAllItemSet( *pMedium->GetItemSet() ));
+pNewSet.emplace( *pMedium->GetItemSet() );
pNewSet->ClearItem( SID_VIEW_ID );
pNewSet->ClearItem( SID_STREAM );
pNewSet->ClearItem( SID_INPUTSTREAM );
@@ -714,7 +714,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
// If a salvaged file is present, do not enclose the OrigURL
// again, since the Template is invalid after reload.
-const SfxStringItem* pSalvageItem =
SfxItemSet::GetItem(pNewSet.get(), SID_DOC_SALVAGE, false);
+const SfxStringItem* pSalvageItem =
SfxItemSet::GetItem(&*pNewSet, SID_DOC_SALVAGE, false);
if( pSalvageItem )
{
pNewSet->ClearItem( SID_DOC_SALVAGE );
@@ -737,9 +737,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if ( pSilentItem && pSilentItem->GetValue() )
pNewSet->Put( SfxBoolItem( SID_SILENT, true ) );
-const SfxUnoAnyItem* pInteractionItem =
SfxItemSet::GetItem(pNewSet.get(), SID_INTERACTIONHANDLER,
false);
-const SfxUInt16Item* pMacroExecItem =
SfxItemSet::GetItem(pNewSet.get(), SID_MACROEXECMODE, false);
-const SfxUInt16Item* pDocTemplateItem =
SfxItemSet::GetItem(pNewSet.get(), SID_UPDATEDOCMODE, false);
+const SfxUnoAnyItem* pInteractionItem =
SfxItemSet::GetItem(&*pNewSet, SID_INTERACTIONHANDLER, false);
+const SfxUInt16Item* pMacroExecItem =
SfxItemSet::GetItem(&*pNewSet, SID_MACROEXECMODE, false);
+const SfxUInt16Item* pDocTemplateItem =
SfxItemSet::GetItem(&*pNewSet, SID_UPDATEDOCMODE, false);
if (!pInteractionItem)
{
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index ea3efeaeb5f0..c241e61e85a1 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
namespace {
@@ -385,10 +386,10 @@ std::shared_ptr StylePoolImpl::insertItemSet(
const SfxItemSet& rSet
// Every SfxPoolItem in the SfxItemSet causes a step deeper into the tree,
// a complete empty SfxItemSet would stay at the root node.
// #i86923# insert ignorable items to the tree leaves.
-std::unique_ptr xFoundIgnorableItems;
+std::optional xFoundIgnorableItems;
if ( mpIgnorableItems )
{
-xFoundIgnorableItems.reset( new SfxItemSet( *mpIgnorableItems ) );
+xFoundIgnorableItems.emplace( *mpIgnorableItems );
}
while( pItem )
{
diff --git a/svx/source/sdr/properties/textproperties.cxx
b/svx/source/sdr/properties/textproperties.cxx
index de5c6765de75..9161
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/qa sw/source
sw/qa/extras/layout/data/Tdf121509.odt |binary
sw/qa/extras/layout/layout2.cxx | 58 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 68 ++-
sw/source/filter/ww8/docxattributeoutput.hxx |9 +++
4 files changed, 134 insertions(+), 1 deletion(-)
New commits:
commit 68688b4ca2288ac815d1dff137177e632bbb5f9f
Author: Attila Bakos (NISZ)
AuthorDate: Mon Jun 14 15:24:06 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 16:06:34 2021 +0200
tdf#121509 DOCX export: fix corrupt shape anchoring in textbox
MSO doesn't support shapes anchored to character in a textbox.
Convert these shapes by re-anchoring them to the anchor
point of the textbox (also recalculating their positions in
simple cases), so Word can now open the exported document.
Change-Id: I28b244975981d69c50e5d4a46249918af089bae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117163
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 35732c84b05e4f6e50349796636beb01f2a09907)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118179
Tested-by: Jenkins
diff --git a/sw/qa/extras/layout/data/Tdf121509.odt
b/sw/qa/extras/layout/data/Tdf121509.odt
new file mode 100644
index ..856f60c88764
Binary files /dev/null and b/sw/qa/extras/layout/data/Tdf121509.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 72cdc908b6ca..1db5f1e69214 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -49,6 +49,9 @@
#include
#include
#include
+#include
+#include
+#include
constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/layout/data/";
@@ -1442,6 +1445,61 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf127118)
assertXPath(pXmlDoc, "/root/page[2]/body/tab/row[1]/cell[1]/txt[1]",
"WritingMode", "VertBTLR");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
+{
+auto pDoc = createSwDoc(DATA_DIRECTORY, "Tdf121509.odt");
+CPPUNIT_ASSERT(pDoc);
+
+// Get all shape/frame formats
+auto vFrameFormats = pDoc->GetSpzFrameFormats();
+// Get the textbox
+auto xTextFrame = SwTextBoxHelper::getUnoTextFrame(getShape(1));
+// Get The triangle
+auto pTriangleShapeFormat = vFrameFormats->GetFormat(2);
+CPPUNIT_ASSERT(xTextFrame);
+CPPUNIT_ASSERT(pTriangleShapeFormat);
+
+// Get the position inside the textbox
+auto xTextContentStart = xTextFrame->getText()->getStart();
+SwUnoInternalPaM aCursor(*pDoc);
+CPPUNIT_ASSERT(sw::XTextRangeToSwPaM(aCursor, xTextContentStart));
+
+// Put the triangle into the textbox
+SwFormatAnchor aNewAnch(pTriangleShapeFormat->GetAnchor());
+aNewAnch.SetAnchor(aCursor.Start());
+CPPUNIT_ASSERT(pTriangleShapeFormat->SetFormatAttr(aNewAnch));
+
+// Reload (docx)
+auto aTemp = utl::TempFile();
+save("Office Open XML Text", aTemp);
+
+// The second part: check if the reloaded doc has flys inside a fly
+uno::Reference xComponent
+= loadFromDesktop(aTemp.GetURL(), "com.sun.star.text.TextDocument");
+uno::Reference xTextDoc(xComponent, uno::UNO_QUERY);
+auto pTextDoc = dynamic_cast(xTextDoc.get());
+CPPUNIT_ASSERT(pTextDoc);
+auto pSecondDoc = pTextDoc->GetDocShell()->GetDoc();
+auto pSecondFormats = pSecondDoc->GetSpzFrameFormats();
+
+bool bFlyInFlyFound = false;
+for (auto secondformat : *pSecondFormats)
+{
+auto& pNd =
secondformat->GetAnchor().GetContentAnchor()->nNode.GetNode();
+if (pNd.FindFlyStartNode())
+{
+// So there is a fly inside another -> problem.
+bFlyInFlyFound = true;
+break;
+}
+}
+// Drop the tempfile
+aTemp.CloseStream();
+
+// With the fix this cannot be true, if it is, that means Word unable to
read the file..
+CPPUNIT_ASSERT_MESSAGE("Corrupt exported docx file!", !bFlyInFlyFound);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf134685)
{
createSwDoc(DATA_DIRECTORY, "tdf134685.docx");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7cbf2a8a0df0..02da5d32096f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6082,7 +6082,7 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
m_pPostponedOLEs = std::move(pPostponedOLEs);
}
-void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const
Point& /*rNdTopLeft*/ )
+void DocxAttributeOutput::WriteFlyFrame(const ww8::Frame& rFrame)
{
m_pSerializer->mark(Tag_OutputFlyFrame);
@@ -6254,6 +6254,71 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const
ww8::Frame &rFrame, const P
m_pSerializer->mergeTopMarks(Tag_OutputFlyFrame);
}
+void DocxAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const
Point&
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - basic/source
basic/source/runtime/methods.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 89e19634a775d53ea855db8767113f3ab08a3479
Author: Julien Nabet
AuthorDate: Wed Jun 30 22:55:46 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Jul 1 16:06:12 2021 +0200
tdf#143081: fix Basic Replace() function crashes LO
0x7f19c0aa6e57 in rtl::OUStringBuffer::append(char16_t const*, int)
(this=0x7fff100d0748, str=0x6f6f46a u"晦饖香©", len=-1) at
include/rtl/ustrbuf.hxx:659
0x7f19c0c3c8a8 in SbRtl_Replace(StarBASIC*, SbxArray&, bool) (rPar=...)
at basic/source/runtime/methods.cxx:1321
see bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=173298
Calling xCharClass->toUpper may change words, eg: "Straße" becomes "Strasse"
so the length of the word increases.
In brief, we want to use the length of aSrcStr not aExpStr
Change-Id: Ia291d47a2021efc7dd9162ca5cc72b7940fdd71e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118202
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 4a0b40f1be9f6773c8ebc5331c257911a76a5cee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118178
Reviewed-by: Xisco Fauli
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index fce05bf3e4d1..7cd9b4716141 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1285,8 +1285,6 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
const OUString aExpStr = rPar.Get(1)->GetOUString();
OUString aFindStr = rPar.Get(2)->GetOUString();
const OUString aReplaceStr = rPar.Get(3)->GetOUString();
-const sal_Int32 nExpStrLen = aExpStr.getLength();
-const sal_Int32 nFindStrLen = aFindStr.getLength();
OUString aSrcStr(aExpStr);
if (bCaseInsensitive)
@@ -1298,10 +1296,12 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
aSrcStr = xCharClass->toUpper(aSrcStr, 0, aSrcStr.getLength(),
rLocale);
aFindStr = xCharClass->toUpper(aFindStr, 0, aFindStr.getLength(),
rLocale);
}
+const sal_Int32 nSrcStrLen = aSrcStr.getLength();
+const sal_Int32 nFindStrLen = aFindStr.getLength();
// Note: the result starts from lStartPos, removing everything to the
left. See i#94895.
-sal_Int32 nPrevPos = std::min(lStartPos - 1, nExpStrLen);
-OUStringBuffer sResult(nExpStrLen - nPrevPos);
+sal_Int32 nPrevPos = std::min(lStartPos - 1, nSrcStrLen);
+OUStringBuffer sResult(nSrcStrLen - nPrevPos);
sal_Int32 nCounts = 0;
while (lCount == -1 || lCount > nCounts)
{
@@ -1318,7 +1318,7 @@ void SbRtl_Replace(StarBASIC *, SbxArray & rPar, bool)
break;
}
}
-sResult.append(aExpStr.getStr() + nPrevPos, nExpStrLen - nPrevPos);
+sResult.append(aExpStr.getStr() + nPrevPos, nSrcStrLen - nPrevPos);
rPar.Get(0)->PutString(sResult.makeStringAndClear());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa vcl/qa
sc/qa/unit/subsequent_export-test2.cxx |2 ++
vcl/qa/cppunit/svm/svmtest.cxx |2 ++
2 files changed, 4 insertions(+)
New commits:
commit cc948b84b8550ba728b3dfbc40a9785b928910e9
Author: Noel Grandin
AuthorDate: Thu Jul 1 13:42:31 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 15:46:49 2021 +0200
exclude some tests for non-default DPI
Change-Id: I579a25040f42fd930a59079f430423806544752b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118222
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/subsequent_export-test2.cxx
b/sc/qa/unit/subsequent_export-test2.cxx
index eb6db21167d3..6036bddd8369 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -2305,6 +2305,8 @@ void ScExportTest2::testTdf140431()
void ScExportTest2::testCheckboxFormControlXlsxExport()
{
+if (!IsDefaultDPI())
+return;
// Given a document that has a checkbox form control:
ScDocShellRef xShell = loadDoc(u"checkbox-form-control.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.is());
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 953f97d0b8b6..0f2523ea3c46 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -1870,6 +1870,8 @@ void SvmTest::checkMapMode(const GDIMetaFile& rMetafile)
void SvmTest::testMapMode()
{
+if (!IsDefaultDPI())
+return;
GDIMetaFile aGDIMetafile;
ScopedVclPtrInstance pVirtualDev;
setupBaseVirtualDevice(*pVirtualDev, aGDIMetafile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes from the UX/design meeting 2021-Jul-01
Present: Sascha, Heiko Comments: Stuart, Sophie Tickets/Topics * UI: Sidebar Styles follow active document across all windows + https://bugs.documentfoundation.org/show_bug.cgi?id=142720 + Navigator has document1..n or active in the dropdown, so it is possible to keep the view at the current document (Sascha) + possible use case: one, detached Stylist applies to many open document; but this doesn't work since the undocked frame becomes hidden when switching the app and replaced on next activation => needs to be changed * Snap-to-grid button should be on more toolbars, optionally or by default + https://bugs.documentfoundation.org/show_bug.cgi?id=143055 + makes sense (Stuart) + Writer has Snap below Show Grid in the menu (on the toolbar without a button to show the grid this command makes not much sense) + Draw/Impress: no .uno:UseGrid in main menu > View > Grid + weird to not see it + have Snap together with Show on Draw/Impress but not the other modules, where the menu is sufficient (Sascha) => do it * UI: optional filter for 'Language' dropdown in 'Character' dialog to show only most sensible language choices + https://bugs.documentfoundation.org/show_bug.cgi?id=85449 + show the top five languages and have a "more" button (Heiko) + all language are important (Sophie) + show only the languages that are installed by application option, however user may paste content in alien languages (Sascha) + unclear what "installed language" means, and it could be the unexpected when for example the locale language is not contained + Sorting could help; could be done depending on region/locale (Sascha) + or just WF because you can search for the language by typing (Heiko) => comment, keep * Add an Accessibility sidebar + https://bugs.documentfoundation.org/show_bug.cgi?id=142978 + realize per extension (Stuart, Sascha, Heiko) => resolve wf/moved * Page numbers not removed from ToC when saved to HTML + https://bugs.documentfoundation.org/show_bug.cgi?id=14272 + HTML shows no page number when using Export but does with Save, epub removes the ToC completely (Heiko) => drop the page number OpenPGP_signature Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpframe.cxx | 31 ++-
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit d9648d1cf6c4ec7407ff30cf814be98d089345d1
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 29 18:30:01 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Jul 1 15:26:31 2021 +0200
svp: a bit more correct focus handling
Took me a while to realize, that the focus handling after closing
a dialog was somehow broken. This isn't a really good solution,
because we can still focus invisble frames, but that is at least
needed for CppunitTest_sd_tiledrendering and the reason that
crashes for non-headless VCL plugins.
Change-Id: I272837bd965439c5c0cd9c8bcbc9d51e3018fdf3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118130
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index c7a1d8f50845..5f40377f5b86 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -118,8 +118,12 @@ SvpSalFrame::~SvpSalFrame()
void SvpSalFrame::GetFocus()
{
+if (m_nStyle == SalFrameStyleFlags::NONE)
+return;
if( s_pFocusFrame == this )
return;
+// FIXME: return if !m_bVisible
+// That's IMHO why CppunitTest_sd_tiledrendering crashes non-headless
if( (m_nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION |
SalFrameStyleFlags::FLOAT)) == SalFrameStyleFlags::NONE )
{
@@ -210,7 +214,16 @@ void SvpSalFrame::SetExtendedFrameStyle( SalExtStyle )
void SvpSalFrame::Show( bool bVisible, bool bNoActivate )
{
-if( bVisible && ! m_bVisible )
+if (m_nStyle == SalFrameStyleFlags::NONE)
+return;
+if (bVisible == m_bVisible)
+{
+if (m_bVisible && !bNoActivate)
+GetFocus();
+return;
+}
+
+if (bVisible)
{
// SAL_DEBUG("SvpSalFrame::Show: showing: " << this);
m_bVisible = true;
@@ -218,17 +231,12 @@ void SvpSalFrame::Show( bool bVisible, bool bNoActivate )
if( ! bNoActivate )
GetFocus();
}
-else if( ! bVisible && m_bVisible )
+else
{
// SAL_DEBUG("SvpSalFrame::Show: hiding: " << this);
m_bVisible = false;
-m_pInstance->PostEvent( this, nullptr, SalEvent::Resize );
LoseFocus();
}
-else
-{
-// SAL_DEBUG("SvpSalFrame::Show: nothing: " << this);
-}
}
void SvpSalFrame::SetMinClientSize( tools::Long nWidth, tools::Long nHeight )
@@ -364,9 +372,14 @@ void SvpSalFrame::SetAlwaysOnTop( bool )
{
}
-void SvpSalFrame::ToTop( SalFrameToTop )
+void SvpSalFrame::ToTop(SalFrameToTop nFlags)
{
-GetFocus();
+if (m_nStyle == SalFrameStyleFlags::NONE)
+return;
+if (nFlags & SalFrameToTop::RestoreWhenMin)
+Show(true, false);
+else
+GetFocus();
}
void SvpSalFrame::SetPointer( PointerStyle )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/pagedlg/tphf.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 5976b54198d24dcf1d8d1684da4da2cf334abe5d
Author: László Németh
AuthorDate: Thu Jul 1 13:15:35 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 15:09:31 2021 +0200
sc: VclPtr, missing dispose (Page Style->Edit...->Header)
Test under Linux:
1) Open Format->Page Style;
2) disable checkbox "Same content on left and right pages";
3) click on the button "Edit..." to open the Header dialog;
4) click on "Ok".
Change-Id: I2ce403a7a37d71f8f6510b6ad00028bc9f7fc5a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118221
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 2a8af81e01ec..406e23ed24bc 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -165,6 +165,8 @@ IMPL_LINK_NOARG(ScHFPage, BtnHdl, weld::Button&, void)
{
aDataSet.Put( *pDlg->GetOutputItemSet() );
}
+
+pDlg->disposeOnce();
});
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/filedlghelper.hxx |8 +---
sfx2/source/appl/appopen.cxx |4 ++--
sfx2/source/dialog/filedlghelper.cxx | 18 +-
sfx2/source/dialog/filedlgimpl.hxx |2 +-
sfx2/source/doc/guisaveas.cxx|6 +++---
5 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 5021a10f75870e7fa8f34e58512fd7c027debc68
Author: Noel Grandin
AuthorDate: Thu Jul 1 10:29:22 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 15:00:16 2021 +0200
sfx2::FileDialogHelper allocate SfxItemSet on stack
and pass around the explicit sub-type, instead of doing static_cast in
various places
Change-Id: I28ba8fd6f5c9e2a1ffbf5ec091bcf0ebdd1d18b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118210
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 356beb49c4ff..4985b7bf045e 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
namespace com::sun::star::ui::dialogs
@@ -49,6 +50,7 @@ namespace weld { class Window; }
class Graphic;
class SfxFilter;
class SfxItemSet;
+class SfxAllItemSet;
enum class FileDialogFlags {
NONE = 0x00,
@@ -222,10 +224,10 @@ public:
DECL_LINK( ExecuteSystemFilePicker, void*, void );
ErrCode Execute( std::vector& rpURLList,
- std::unique_ptr& rpSet,
+ std::optional& rpSet,
OUString& rFilter,
const OUString& rDirPath );
- ErrCode Execute( std::unique_ptr& rpSet,
+ ErrCode Execute( std::optional& rpSet,
OUString& rFilter );
};
@@ -239,7 +241,7 @@ ErrCode FileOpenDialog_Impl( weld::Window* pParent,
FileDialogFlags nFlags,
std::vector& rpURLList,
OUString& rFilter,
- std::unique_ptr& rpSet,
+ std::optional& rpSet,
const OUString* pPath,
sal_Int16 nDialog,
const OUString& rStandardDir,
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 08431c29eaaa..f26b88a1b06c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -608,7 +608,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
// get FileName from dialog
std::vector aURLList;
OUString aFilter;
-std::unique_ptr pSet;
+std::optional pSet;
OUString aPath;
const SfxStringItem* pFolderNameItem =
rReq.GetArg(SID_PATH);
if ( pFolderNameItem )
@@ -662,7 +662,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
return;
}
-rReq.SetArgs( *static_cast(pSet.get()) );
+rReq.SetArgs( *pSet );
if ( !aFilter.isEmpty() )
rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) );
rReq.AppendItem( SfxStringItem( SID_TARGETNAME, "_default" ) );
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 939863816142..c388b909a3a4 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1395,7 +1395,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const
uno::Reference< XInterfac
}
ErrCode FileDialogHelper_Impl::execute( std::vector& rpURLList,
-std::unique_ptr& rpSet,
+std::optional& rpSet,
OUString& rFilter )
{
// rFilter is a pure output parameter, it shouldn't be used for anything
else
@@ -1411,15 +1411,15 @@ ErrCode FileDialogHelper_Impl::execute(
std::vector& rpURLList,
// check password checkbox if the document had password before
if( mbHasPassword )
{
-const SfxBoolItem* pPassItem =
SfxItemSet::GetItem(rpSet.get(), SID_PASSWORDINTERACTION, false);
+const SfxBoolItem* pPassItem =
SfxItemSet::GetItem(&*rpSet, SID_PASSWORDINTERACTION, false);
mbPwdCheckBoxState = ( pPassItem != nullptr &&
pPassItem->GetValue() );
// in case the document has password to modify, the dialog should
be shown
-const SfxUnoAnyItem* pPassToModifyItem =
SfxItemSet::GetItem(rpSet.get(), SID_MODIFYPASSWORDINFO, false);
+const SfxUnoAnyItem* pPassToModifyItem =
SfxItemSet::GetItem(&*rpSet, SID_MODIFYPASSWORDINFO, false);
mbPwdCheckBoxState |= ( pPassToModifyItem &&
pPassToModifyItem->GetValue().hasValue() );
}
-const SfxBo
[Libreoffice-commits] core.git: include/vcl svx/source vcl/source
include/vcl/bitmap.hxx| 14 +-
svx/source/dialog/_bmpmask.cxx|2 -
svx/source/dialog/_contdlg.cxx|2 -
vcl/source/bitmap/BitmapEx.cxx|2 -
vcl/source/bitmap/bitmappaint.cxx | 49 +++---
5 files changed, 15 insertions(+), 54 deletions(-)
New commits:
commit 5c23560ba39fe17c75cafe3d495af743238e4d67
Author: Noel Grandin
AuthorDate: Thu Jul 1 12:59:47 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 14:33:11 2021 +0200
BmpCombine::And is dead
ever since
commit ddd2639a482befb4a3bf1f75a88e66c21a691b67
Date: Sat Feb 27 15:50:37 2021 +0200
drop mask from BitmapEx
Change-Id: I45fae0140067e2bfe5ce1ae2f5014ce733835ef1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118220
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 2a6872c179f0..d27ffdaa8559 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -78,11 +78,6 @@ enum class BmpConversion
N8BitNoConversion // make 8bit without color conversion (e.g. take the red
channel)
};
-enum class BmpCombine
-{
-Or, And
-};
-
class BitmapInfoAccess;
class BitmapReadAccess;
class BitmapWriteAccess;
@@ -238,19 +233,14 @@ public:
const tools::Rectangle& rRectSrc,
const Bitmap* pBmpSrc );
-/** Perform boolean operations with another bitmap
+/** Perform boolean OR operation with another bitmap
@param rMask
The mask bitmap in the selected combine operation
-@param eCombine
-The combine operation to perform on the bitmap
-
@return true, if the operation was completed successfully.
*/
-boolCombineSimple(
-const Bitmap& rMask,
-BmpCombine eCombine );
+boolCombineOr( const Bitmap& rMask );
/** Alpha-blend the given bitmap against a specified uniform
background color.
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 7f65bb697517..420321d2a9be 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -615,7 +615,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx&
rBitmapEx, const Color&
Bitmap aMask( rBitmapEx.GetBitmap().CreateMask( rColor, nTol ) );
if( rBitmapEx.IsAlpha() )
-aMask.CombineSimple( rBitmapEx.GetAlpha(), BmpCombine::Or );
+aMask.CombineOr( rBitmapEx.GetAlpha() );
aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask );
LeaveWait();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c6fcde5d1dfc..712544ff0c01 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -634,7 +634,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl,
ContourWindow&, rWnd, void )
Bitmap aMask = aGraphic.GetBitmapEx().GetBitmap().CreateMask(
rColor, nTol );
if( aGraphic.IsTransparent() )
-aMask.CombineSimple( aGraphic.GetBitmapEx().GetAlpha(),
BmpCombine::Or );
+aMask.CombineOr( aGraphic.GetBitmapEx().GetAlpha() );
if( !aMask.IsEmpty() )
{
diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx
index 2c56ab44b6a0..91ee55c58ed3 100644
--- a/vcl/source/bitmap/BitmapEx.cxx
+++ b/vcl/source/bitmap/BitmapEx.cxx
@@ -1443,7 +1443,7 @@ void BitmapEx::CombineMaskOr(Color maskColor, sal_uInt8
nTol)
{
Bitmap aNewMask = maBitmap.CreateMask( maskColor, nTol );
if ( IsAlpha() )
- aNewMask.CombineSimple( maAlphaMask, BmpCombine::Or );
+ aNewMask.CombineOr( maAlphaMask );
maAlphaMask = aNewMask;
}
diff --git a/vcl/source/bitmap/bitmappaint.cxx
b/vcl/source/bitmap/bitmappaint.cxx
index 847dd4171b18..e06f96e8abd7 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -1047,7 +1047,7 @@ bool Bitmap::Replace(const Color* pSearchColors, const
Color* pReplaceColors, si
return bRet;
}
-bool Bitmap::CombineSimple(const Bitmap& rMask, BmpCombine eCombine)
+bool Bitmap::CombineOr(const Bitmap& rMask)
{
ScopedReadAccess pMaskAcc(const_cast(rMask));
BitmapScopedWriteAccess pAcc(*this);
@@ -1062,51 +1062,22 @@ bool Bitmap::CombineSimple(const Bitmap& rMask,
BmpCombine eCombine)
const BitmapColor aBlack(pAcc->GetBestMatchingColor(aColBlack));
const BitmapColor
aMaskBlack(pMaskAcc->GetBestMatchingColor(aColBlack));
-switch (eCombine)
+for (tools::Long nY = 0; nY < nHeight; nY++)
{
-case BmpCombine::And:
+Scanline pScanline = pAcc->GetScanline(nY);
+Scanline pScanlineMask = pMaskAcc->GetScanline(nY);
+for (tools::Long nX = 0; nX < nWidth; nX++)
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/bindings.hxx|3 ++-
sfx2/source/control/bindings.cxx | 14 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit c94d45cd08e2d5db5c007b9a77352f7621f84a09
Author: Noel Grandin
AuthorDate: Thu Jul 1 10:11:40 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 14:24:44 2021 +0200
can pass this SfxItemSet around on the stack
Change-Id: Ie2e67ec19cfacdfdd0a6dd85c464cfa326b6500d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118209
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index f4f44bd1af7a..47b904d6d113 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -101,7 +102,7 @@ private:
SfxCallMode nCall, const SfxPoolItem
**pInternalArgs, bool bGlobalOnly=false);
SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer
-SAL_DLLPRIVATE std::unique_ptr CreateSet_Impl(SfxStateCache&
rCache, const SfxSlot* &pRealSlot,
+SAL_DLLPRIVATE std::optional CreateSet_Impl(SfxStateCache&
rCache, const SfxSlot* &pRealSlot,
const SfxSlotServer**,
SfxFoundCacheArr_Impl&);
SAL_DLLPRIVATE std::size_t GetSlotPos( sal_uInt16 nId, std::size_t
nStartSearchAt = 0 );
SAL_DLLPRIVATE void Update_Impl(SfxStateCache& rCache);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index b75d0dbcae02..ca8366f26539 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -252,7 +252,7 @@ void SfxBindings::Update_Impl(SfxStateCache& rCache /*The
up to date SfxStatusCa
const SfxSlot *pRealSlot = nullptr;
const SfxSlotServer* pMsgServer = nullptr;
SfxFoundCacheArr_Impl aFound;
-std::unique_ptr pSet = CreateSet_Impl(rCache, pRealSlot,
&pMsgServer, aFound);
+std::optional pSet = CreateSet_Impl(rCache, pRealSlot,
&pMsgServer, aFound);
bool bUpdated = false;
if ( pSet )
{
@@ -1090,7 +1090,7 @@ void SfxBindings::UpdateSlotServer_Impl()
}
-std::unique_ptr SfxBindings::CreateSet_Impl
+std::optional SfxBindings::CreateSet_Impl
(
SfxStateCache& rCache, // in: Status-Cache from nId
const SfxSlot*& pRealSlot, // out: RealSlot to nId
@@ -1103,7 +1103,7 @@ std::unique_ptr SfxBindings::CreateSet_Impl
const SfxSlotServer* pMsgSvr = rCache.GetSlotServer(*pDispatcher,
pImpl->xProv);
if (!pMsgSvr)
-return nullptr;
+return {};
pRealSlot = nullptr;
*pMsgServer = pMsgSvr;
@@ -,7 +,7 @@ std::unique_ptr SfxBindings::CreateSet_Impl
sal_uInt16 nShellLevel = pMsgSvr->GetShellLevel();
SfxShell *pShell = pDispatcher->GetShell( nShellLevel );
if ( !pShell ) // rare GPF when browsing through update from Inet-Notify
-return nullptr;
+return {};
SfxItemPool &rPool = pShell->GetPool();
@@ -1167,7 +1167,7 @@ std::unique_ptr SfxBindings::CreateSet_Impl
// Create a Set from the ranges
size_t i = 0;
-auto pSet(std::make_unique(rPool, nullptr));
+SfxItemSet aSet(rPool, nullptr);
while ( i < rFound.size() )
{
const sal_uInt16 nWhich1 = rFound[i].nWhichId;
@@ -1176,9 +1176,9 @@ std::unique_ptr SfxBindings::CreateSet_Impl
if ( rFound[i].nWhichId+1 != rFound[i+1].nWhichId )
break;
const sal_uInt16 nWhich2 = rFound[i++].nWhichId;
-pSet->MergeRange(nWhich1, nWhich2);
+aSet.MergeRange(nWhich1, nWhich2);
}
-return pSet;
+return aSet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/export/DMLPresetShapeExport.hxx |6
oox/source/export/DMLPresetShapeExport.cxx | 191 +++
sw/qa/extras/ooxmlexport/data/fail_bracePair.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 10 +
4 files changed, 145 insertions(+), 62 deletions(-)
New commits:
commit 99a459dfdfd9f82ed3506708e131dd52a1a62384
Author: Attila Bakos (NISZ)
AuthorDate: Thu Jun 24 10:03:28 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 13:50:59 2021 +0200
tdf#143028 DOCX: fix corrupt export of shape "bracePair" etc.
Regression from commit 63cd67e5e18f01aca303131e148c80398a181a41
(tdf#92525 tdf#142398: fix export of simple custom shapes)
Missing property in the shape export property list
caused an exception. The return value false led to writing
the shape transformation again, resulting a corrupt DOCX file.
Optional values have been introduced and if one of the
required value is unset, writing of the transformation
happens only once.
Thanks to Regina Henschel for reporting the problem.
Change-Id: Ieae69bb1d2629fdbb91a84325cb100f0ad9d3e12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117763
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/include/oox/export/DMLPresetShapeExport.hxx
b/include/oox/export/DMLPresetShapeExport.hxx
index 1ab460d26845..1baf1d44cabc 100644
--- a/include/oox/export/DMLPresetShapeExport.hxx
+++ b/include/oox/export/DMLPresetShapeExport.hxx
@@ -86,9 +86,9 @@ public:
private:
struct AdjustmentPointValueBase
{
-double nMaxVal;
-double nMinVal;
-double nCurrVal;
+std::optional nMaxVal;
+std::optional nMinVal;
+std::optional nCurrVal;
};
typedef AdjustmentPointValueBase RadiusAdjustmentValue;
diff --git a/oox/source/export/DMLPresetShapeExport.cxx
b/oox/source/export/DMLPresetShapeExport.cxx
index 8e4ebafcce98..e8d2f26e2e5b 100644
--- a/oox/source/export/DMLPresetShapeExport.cxx
+++ b/oox/source/export/DMLPresetShapeExport.cxx
@@ -131,15 +131,22 @@ DMLPresetShapeExporter::RadiusAdjustmentValue
DMLPresetShapeExporter::GetAdjustmentPointRadiusValue(sal_Int32 nPoint)
{
RadiusAdjustmentValue aRet;
-auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
- .get();
-aRet.nMinVal = GetHandleValueOfModificationPoint(nPoint,
u"RadiusRangeMinimum")
- .get()
- .Value.get();
-aRet.nMaxVal = GetHandleValueOfModificationPoint(nPoint,
u"RadiusRangeMaximum")
- .get()
- .Value.get();
-aRet.nCurrVal =
GetAdjustmentValues()[aValPos.First.Value.get()].Value.get();
+try
+{
+auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
+ .get();
+aRet.nMinVal = GetHandleValueOfModificationPoint(nPoint,
u"RadiusRangeMinimum")
+ .get()
+ .Value.get();
+aRet.nMaxVal = GetHandleValueOfModificationPoint(nPoint,
u"RadiusRangeMaximum")
+ .get()
+ .Value.get();
+aRet.nCurrVal =
GetAdjustmentValues()[aValPos.First.Value.get()].Value.get();
+}
+catch (...)
+{
+// Do nothing.
+}
return aRet;
};
@@ -147,11 +154,18 @@ DMLPresetShapeExporter::AngleAdjustmentValue
DMLPresetShapeExporter::GetAdjustmentPointAngleValue(sal_Int32 nPoint)
{
AngleAdjustmentValue aRet;
-auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
- .get();
-aRet.nMinVal = 0;
-aRet.nMaxVal = 360;
-aRet.nCurrVal =
GetAdjustmentValues()[aValPos.Second.Value.get()].Value.get();
+try
+{
+auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
+ .get();
+aRet.nMinVal = 0;
+aRet.nMaxVal = 360;
+aRet.nCurrVal =
GetAdjustmentValues()[aValPos.Second.Value.get()].Value.get();
+}
+catch (...)
+{
+// Do nothing.
+}
return aRet;
};
@@ -159,15 +173,22 @@ DMLPresetShapeExporter::XAdjustmentValue
DMLPresetShapeExporter::GetAdjustmentPointXValue(sal_Int32 nPoint)
{
XAdjustmentValue aRet;
-auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
- .get();
-aRet.nMinVal = GetHandleValueOfModificationPoint(nPoint, u"RangeXMinimum")
- .get()
- .Value.get();
-aRet.nMaxVal = GetHandleValueOfModificationPoint(nPoint, u"RangeXMaximum")
- .get()
- .Value.get();
-aRet.nCurrVal =
GetAdjustmentValues()[aValPos.First.Value.get()].Value.get();
+try
+{
+auto aValPos = GetHandleValueOfModificationPoint(nPoint, u"Position")
+ .get();
+aRet.n
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx | 11 ++-
sw/source/filter/ww8/ww8graf2.cxx | 12 ++--
2 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 813f6e7c9de6898f42ed28ca8bf7a6fb62a4bb2a
Author: Caolán McNamara
AuthorDate: Thu Jul 1 11:01:47 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 13:26:11 2021 +0200
ofz#30657 Timeout, ignore duplicate images when fuzzing
Change-Id: I4471379ad60a96f63ff53a441b801d48197b021c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index b5835a0da9e5..fe283e7972dd 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1447,7 +1447,16 @@ void SwWW8ImplReader::ReadGrafLayer1(WW8PLCFspecial&
rPF, tools::Long nGrafAncho
return;
}
-bool bCouldSeek = checkSeek(*m_pStrm, SVBT32ToUInt32(pF->fc));
+sal_uInt32 nPosFc = SVBT32ToUInt32(pF->fc);
+
+//skip duplicate graphics when fuzzing
+if (m_bFuzzing)
+{
+if (!m_aGrafPosSet.insert(nPosFc).second)
+return;
+}
+
+bool bCouldSeek = checkSeek(*m_pStrm, nPosFc);
OSL_ENSURE(bCouldSeek, "Invalid graphic offset");
if (!bCouldSeek)
return;
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index 266feac64975..599abce76fc3 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -258,12 +258,6 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName,
std::unique_ptr
return !rFileName.isEmpty();// read was successful
}
-GDIMetaFile aWMF;
-bool bOk = checkSeek(*pSt, nPosFc) && ReadWindowMetafile( *pSt, aWMF );
-
-if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
-return false;
-
//skip duplicate graphics when fuzzing
if (m_bFuzzing)
{
@@ -271,6 +265,12 @@ bool SwWW8ImplReader::ReadGrafFile(OUString& rFileName,
std::unique_ptr
return false;
}
+GDIMetaFile aWMF;
+bool bOk = checkSeek(*pSt, nPosFc) && ReadWindowMetafile( *pSt, aWMF );
+
+if (!bOk || pSt->GetError() || !aWMF.GetActionSize())
+return false;
+
if (m_xWwFib->m_envr != 1) // !MAC as creator
{
rpGraphic.reset(new Graphic(aWMF));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xipage.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 26e2bb5c09dc8a95ffd69c666de352a8bfd965cb
Author: Caolán McNamara
AuthorDate: Thu Jul 1 10:24:07 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 13:06:21 2021 +0200
ofz#30762 Timeout
Change-Id: Iffbf89de479d1038f21a45575957ea7212d6939c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118214
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/excel/xipage.cxx
b/sc/source/filter/excel/xipage.cxx
index 41db8abcfbd6..c06308ba78c6 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -125,10 +125,17 @@ void XclImpPageSettings::ReadHeaderFooter( XclImpStream&
rStrm )
default:OSL_FAIL( "XclImpPageSettings::ReadHeaderFooter - unknown
record" );
}
-if (maData.maHeader.getLength() > 10 && utl::ConfigManager::IsFuzzing())
-maData.maHeader = maData.maHeader.copy(0, 10);
-if (maData.maHeaderEven.getLength() > 10 &&
utl::ConfigManager::IsFuzzing())
-maData.maHeaderEven = maData.maHeaderEven.copy(0, 10);
+if (utl::ConfigManager::IsFuzzing())
+{
+if (maData.maHeader.getLength() > 10)
+maData.maHeader = maData.maHeader.copy(0, 10);
+if (maData.maFooter.getLength() > 10)
+maData.maFooter = maData.maFooter.copy(0, 10);
+if (maData.maHeaderEven.getLength() > 10)
+maData.maHeaderEven = maData.maHeaderEven.copy(0, 10);
+if (maData.maFooterEven.getLength() > 10)
+maData.maFooterEven = maData.maFooterEven.copy(0, 10);
+}
}
void XclImpPageSettings::ReadPageBreaks( XclImpStream& rStrm )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/unusedenumconstants.readonly.results | 362 - compilerplugins/clang/unusedenumconstants.untouched.results | 308 - compilerplugins/clang/unusedenumconstants.writeonly.results | 2734 ++-- 3 files changed, 1872 insertions(+), 1532 deletions(-) New commits: commit 7a1c8144ac91da056bfdc74b2f757d10b44e6f4e Author: Noel Grandin AuthorDate: Thu Jul 1 08:53:55 2021 +0200 Commit: Noel Grandin CommitDate: Thu Jul 1 12:54:46 2021 +0200 loplugin:unusedenumconstants update results Change-Id: I6153a67cd041f7dbabb650ad0c0d30427a2e558b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118206 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 085974a05544..935e74505021 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -42,12 +42,16 @@ configmgr/source/access.hxx:443 enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_GROUP_MEMBER configmgr/source/access.hxx:443 enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_SET_MEMBER +configmgr/source/components.hxx:149 +enum configmgr::Components::ModificationTarget Dconf configmgr/source/parsemanager.hxx:43 enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_OOR configmgr/source/parsemanager.hxx:43 enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XS configmgr/source/parsemanager.hxx:43 enum configmgr::ParseManager::(anonymous at /home/noel/libo2/configmgr/source/parsemanager.hxx:43:5) NAMESPACE_XSI +connectivity/source/drivers/evoab2/NConnection.hxx:37 +connectivity::evoab::SDBCAddress::sdbc_address_type Unknown cui/source/options/optgenrl.cxx:63 enum (anonymous namespace)::RowType nRowCount dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:71 @@ -232,59 +236,57 @@ editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:26 enum SvXMLAutoCorrectToken BLOCK editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx:27 enum SvXMLAutoCorrectToken BLOCKLIST -emfio/inc/mtftools.hxx:48 -enum emfio::BkMode Transparent -emfio/inc/mtftools.hxx:82 +emfio/inc/mtftools.hxx:83 enum emfio::WMFRasterOp Nop -framework/inc/xml/imagesdocumenthandler.hxx:40 +framework/inc/xml/imagesdocumenthandler.hxx:39 enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_IMAGECONTAINER -framework/inc/xml/imagesdocumenthandler.hxx:41 +framework/inc/xml/imagesdocumenthandler.hxx:40 enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_IMAGES -framework/inc/xml/imagesdocumenthandler.hxx:42 +framework/inc/xml/imagesdocumenthandler.hxx:41 enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ELEMENT_ENTRY -framework/inc/xml/imagesdocumenthandler.hxx:47 +framework/inc/xml/imagesdocumenthandler.hxx:46 enum framework::OReadImagesDocumentHandler::Image_XML_Entry IMG_ATTRIBUTE_COMMAND -framework/inc/xml/statusbardocumenthandler.hxx:44 +framework/inc/xml/statusbardocumenthandler.hxx:43 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ELEMENT_STATUSBAR -framework/inc/xml/statusbardocumenthandler.hxx:45 +framework/inc/xml/statusbardocumenthandler.hxx:44 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ELEMENT_STATUSBARITEM -framework/inc/xml/statusbardocumenthandler.hxx:46 +framework/inc/xml/statusbardocumenthandler.hxx:45 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_URL -framework/inc/xml/statusbardocumenthandler.hxx:47 +framework/inc/xml/statusbardocumenthandler.hxx:46 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_ALIGN -framework/inc/xml/statusbardocumenthandler.hxx:48 +framework/inc/xml/statusbardocumenthandler.hxx:47 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_STYLE -framework/inc/xml/statusbardocumenthandler.hxx:49 +framework/inc/xml/statusbardocumenthandler.hxx:48 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_AUTOSIZE -framework/inc/xml/statusbardocumenthandler.hxx:50 +framework/inc/xml/statusbardocumenthandler.hxx:49 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_OWNERDRAW -framework/inc/xml/statusbardocumenthandler.hxx:51 +framework/inc/xml/statusbardocumenthandler.hxx:50 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTRIBUTE_WIDTH -framework/inc/xml/statusbardocumenthandler.hxx:52 +framework/inc/xml/statusbardocumenthandler.hxx:51 enum framework::OReadStatusBarDocumentHandler::StatusBar_XML_Entry SB_ATTR
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/layout/data/Tdf121509.odt |binary
sw/qa/extras/layout/layout2.cxx | 58 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 68 ++-
sw/source/filter/ww8/docxattributeoutput.hxx |9 +++
4 files changed, 134 insertions(+), 1 deletion(-)
New commits:
commit 35732c84b05e4f6e50349796636beb01f2a09907
Author: Attila Bakos (NISZ)
AuthorDate: Mon Jun 14 15:24:06 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 12:47:35 2021 +0200
tdf#121509 DOCX export: fix corrupt shape anchoring in textbox
MSO doesn't support shapes anchored to character in a textbox.
Convert these shapes by re-anchoring them to the anchor
point of the textbox (also recalculating their positions in
simple cases), so Word can now open the exported document.
Change-Id: I28b244975981d69c50e5d4a46249918af089bae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117163
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/layout/data/Tdf121509.odt
b/sw/qa/extras/layout/data/Tdf121509.odt
new file mode 100644
index ..856f60c88764
Binary files /dev/null and b/sw/qa/extras/layout/data/Tdf121509.odt differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 72cdc908b6ca..1db5f1e69214 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -49,6 +49,9 @@
#include
#include
#include
+#include
+#include
+#include
constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/layout/data/";
@@ -1442,6 +1445,61 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf127118)
assertXPath(pXmlDoc, "/root/page[2]/body/tab/row[1]/cell[1]/txt[1]",
"WritingMode", "VertBTLR");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf121509)
+{
+auto pDoc = createSwDoc(DATA_DIRECTORY, "Tdf121509.odt");
+CPPUNIT_ASSERT(pDoc);
+
+// Get all shape/frame formats
+auto vFrameFormats = pDoc->GetSpzFrameFormats();
+// Get the textbox
+auto xTextFrame = SwTextBoxHelper::getUnoTextFrame(getShape(1));
+// Get The triangle
+auto pTriangleShapeFormat = vFrameFormats->GetFormat(2);
+CPPUNIT_ASSERT(xTextFrame);
+CPPUNIT_ASSERT(pTriangleShapeFormat);
+
+// Get the position inside the textbox
+auto xTextContentStart = xTextFrame->getText()->getStart();
+SwUnoInternalPaM aCursor(*pDoc);
+CPPUNIT_ASSERT(sw::XTextRangeToSwPaM(aCursor, xTextContentStart));
+
+// Put the triangle into the textbox
+SwFormatAnchor aNewAnch(pTriangleShapeFormat->GetAnchor());
+aNewAnch.SetAnchor(aCursor.Start());
+CPPUNIT_ASSERT(pTriangleShapeFormat->SetFormatAttr(aNewAnch));
+
+// Reload (docx)
+auto aTemp = utl::TempFile();
+save("Office Open XML Text", aTemp);
+
+// The second part: check if the reloaded doc has flys inside a fly
+uno::Reference xComponent
+= loadFromDesktop(aTemp.GetURL(), "com.sun.star.text.TextDocument");
+uno::Reference xTextDoc(xComponent, uno::UNO_QUERY);
+auto pTextDoc = dynamic_cast(xTextDoc.get());
+CPPUNIT_ASSERT(pTextDoc);
+auto pSecondDoc = pTextDoc->GetDocShell()->GetDoc();
+auto pSecondFormats = pSecondDoc->GetSpzFrameFormats();
+
+bool bFlyInFlyFound = false;
+for (auto secondformat : *pSecondFormats)
+{
+auto& pNd =
secondformat->GetAnchor().GetContentAnchor()->nNode.GetNode();
+if (pNd.FindFlyStartNode())
+{
+// So there is a fly inside another -> problem.
+bFlyInFlyFound = true;
+break;
+}
+}
+// Drop the tempfile
+aTemp.CloseStream();
+
+// With the fix this cannot be true, if it is, that means Word unable to
read the file..
+CPPUNIT_ASSERT_MESSAGE("Corrupt exported docx file!", !bFlyInFlyFound);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf134685)
{
createSwDoc(DATA_DIRECTORY, "tdf134685.docx");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7d185f5ce9c0..19dc42aa119c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6082,7 +6082,7 @@ void DocxAttributeOutput::WritePostponedDMLDrawing()
m_pPostponedOLEs = std::move(pPostponedOLEs);
}
-void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const
Point& /*rNdTopLeft*/ )
+void DocxAttributeOutput::WriteFlyFrame(const ww8::Frame& rFrame)
{
m_pSerializer->mark(Tag_OutputFlyFrame);
@@ -6254,6 +6254,71 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const
ww8::Frame &rFrame, const P
m_pSerializer->mergeTopMarks(Tag_OutputFlyFrame);
}
+void DocxAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const
Point& /*rNdTopLeft*/)
+{
+/// The old OutputFlyFrame_Impl() moved to WriteFlyFrame().
+/// Now if a frame anchored inside another frame, it will
+/// not
[Libreoffice-commits] core.git: 2 commits - hwpfilter/source
hwpfilter/source/hwpfile.cxx | 46 ---
1 file changed, 22 insertions(+), 24 deletions(-)
New commits:
commit 5827376349b01447280ee4391b03a0f149f88ce4
Author: Caolán McNamara
AuthorDate: Thu Jul 1 09:53:37 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 12:27:58 2021 +0200
Related: ofz#33724 detect earlier if comparison shape has no cshape
Change-Id: I23e2c464ffda5de892ae78a188b4c25b81b61fd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118213
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 29f25cb39e08..762bb31d0582 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -633,6 +633,8 @@ int HWPFile::compareParaShape(const ParaShape* shape)
for (int i = 0; i < count; ++i)
{
ParaShape *pshape = pslist[i].get();
+if (!pshape->cshape)
+continue;
if (shape->left_margin == pshape->left_margin &&
shape->right_margin == pshape->right_margin &&
shape->pspacing_prev == pshape->pspacing_prev &&
@@ -643,8 +645,7 @@ int HWPFile::compareParaShape(const ParaShape* shape)
shape->outline == pshape->outline &&
shape->pagebreak == pshape->pagebreak)
{
-if (pshape->cshape &&
-shape->cshape->size == pshape->cshape->size &&
+if (shape->cshape->size == pshape->cshape->size &&
shape->cshape->font[0] == pshape->cshape->font[0] &&
shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
shape->cshape->space[0] == pshape->cshape->space[0] &&
commit 57ad52ce8037ce24b4d0a0019e5089c03b90f3c8
Author: Caolán McNamara
AuthorDate: Thu Jul 1 09:52:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 12:27:44 2021 +0200
can flatten this a level
Change-Id: I71742038c2a2ac8e335a404e99f5412430c0ff8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118212
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 3a2d2c282e9b..29f25cb39e08 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -630,33 +630,30 @@ int HWPFile::compareParaShape(const ParaShape* shape)
return 0;
int count = pslist.size();
-if (count > 0)
+for (int i = 0; i < count; ++i)
{
-for (int i = 0; i < count; ++i)
+ParaShape *pshape = pslist[i].get();
+if (shape->left_margin == pshape->left_margin &&
+shape->right_margin == pshape->right_margin &&
+shape->pspacing_prev == pshape->pspacing_prev &&
+shape->pspacing_next == pshape->pspacing_next &&
+shape->indent == pshape->indent &&
+shape->lspacing == pshape->lspacing &&
+shape->arrange_type == pshape->arrange_type &&
+shape->outline == pshape->outline &&
+shape->pagebreak == pshape->pagebreak)
{
-ParaShape *pshape = pslist[i].get();
-if (shape->left_margin == pshape->left_margin &&
-shape->right_margin == pshape->right_margin &&
-shape->pspacing_prev == pshape->pspacing_prev &&
-shape->pspacing_next == pshape->pspacing_next &&
-shape->indent == pshape->indent &&
-shape->lspacing == pshape->lspacing &&
-shape->arrange_type == pshape->arrange_type &&
-shape->outline == pshape->outline &&
-shape->pagebreak == pshape->pagebreak)
+if (pshape->cshape &&
+shape->cshape->size == pshape->cshape->size &&
+shape->cshape->font[0] == pshape->cshape->font[0] &&
+shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
+shape->cshape->space[0] == pshape->cshape->space[0] &&
+shape->cshape->color[1] == pshape->cshape->color[1] &&
+shape->cshape->color[0] == pshape->cshape->color[0] &&
+shape->cshape->shade == pshape->cshape->shade &&
+shape->cshape->attr == pshape->cshape->attr)
{
-if (pshape->cshape &&
-shape->cshape->size == pshape->cshape->size &&
-shape->cshape->font[0] == pshape->cshape->font[0] &&
-shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
-shape->cshape->space[0] == pshape->cshape->space[0] &&
-shape->cshape->color[1] == pshape->cshape->color[1] &&
-shape->cshape->color[0] == pshape->cshape->color[0] &&
-shape->cshape->shade == pshape->cshape->shade &&
-shape->cshape->attr == pshape->cshape->attr)
-{
-return pshape->index
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hwpfile.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 567922d076cfaf90c11c32c34e8a4955c9248b9b
Author: Caolán McNamara
AuthorDate: Thu Jul 1 09:49:01 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 12:27:18 2021 +0200
ofz#33724 compareParaShape will return 0 if input shape has no cshape
so return early in that case and avoid the expensive loop
Change-Id: Ibdde814322c6e9c094c3652c28e0d79887d1f5bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118211
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 3fbaf6c6f2fc..3a2d2c282e9b 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -626,6 +626,9 @@ int HWPFile::compareCharShape(CharShape const *shape)
int HWPFile::compareParaShape(const ParaShape* shape)
{
+if (!shape->cshape)
+return 0;
+
int count = pslist.size();
if (count > 0)
{
@@ -642,7 +645,7 @@ int HWPFile::compareParaShape(const ParaShape* shape)
shape->outline == pshape->outline &&
shape->pagebreak == pshape->pagebreak)
{
-if (shape->cshape && pshape->cshape &&
+if (pshape->cshape &&
shape->cshape->size == pshape->cshape->size &&
shape->cshape->font[0] == pshape->cshape->font[0] &&
shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - wizards/Package_scriptforge.mk wizards/source
wizards/Package_scriptforge.mk |1 wizards/source/scriptforge/po/pt.po | 1141 2 files changed, 1142 insertions(+) New commits: commit 306ff415cb19b1a3f01a6deda0f5f0d41c60594a Author: Rafael Lima AuthorDate: Tue Jun 29 13:15:01 2021 +0200 Commit: Jean-Pierre Ledure CommitDate: Thu Jul 1 12:25:27 2021 +0200 Add Portuguese support to ScriptForge library (l10n) Change-Id: I04341059becb36467795a2aa1d5c2f573fe1bc6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118092 Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure (cherry picked from commit 1b7d564ee8c75d35dc2b8cb99afcad499c9e6fb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118172 Tested-by: Jean-Pierre Ledure Reviewed-by: Rafael Lima diff --git a/wizards/Package_scriptforge.mk b/wizards/Package_scriptforge.mk index 13742b29b250..f9494e7d9c2d 100644 --- a/wizards/Package_scriptforge.mk +++ b/wizards/Package_scriptforge.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Package_add_files,wizards_basicsrvscriptforge,$(LIBO_SHARE_FOLD $(eval $(call gb_Package_add_files,wizards_basicsrvscriptforge,$(LIBO_SHARE_FOLDER)/basic/ScriptForge/po,\ po/ScriptForge.pot \ po/en.po \ + po/pt.po \ )) $(eval $(call gb_Package_add_files,wizards_basicsrvscriptforge,$(LIBO_LIB_PYUNO_FOLDER),\ diff --git a/wizards/source/scriptforge/po/pt.po b/wizards/source/scriptforge/po/pt.po new file mode 100644 index ..aaea80055641 --- /dev/null +++ b/wizards/source/scriptforge/po/pt.po @@ -0,0 +1,1141 @@ +# +# This pristine POT file has been generated by LibreOffice/ScriptForge +# Full documentation is available on https://help.libreoffice.org/ +# +# * +# *** The ScriptForge library and its associated libraries *** +# *** are part of the LibreOffice project. *** +# * +# +# ScriptForge Release 7.2 +# --- +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?"; +"product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" +"POT-Creation-Date: 2021-06-19 16:57:15\n" +"PO-Revision-Date: 2021-06-28 18:30-0300\n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 3.0\n" +"X-Accelerator-Marker: ~\n" +"Last-Translator: \n" +"Language: pt_BR\n" + +#. Text in close buttons of progress and console dialog boxes +msgctxt "CLOSEBUTTON" +msgid "Close" +msgstr "Fechar" + +#. Title in error message box +#. %1: an error number +#, kde-format +msgctxt "ERRORNUMBER" +msgid "Error %1" +msgstr "Erro %1" + +#. Error message box +#. %1: a line number +#, kde-format +msgctxt "ERRORLOCATION" +msgid "Location : %1" +msgstr "Localização : %1" + +#. Logfile record +#, kde-format +msgctxt "LONGERRORDESC" +msgid "Error %1 - Location = %2 - Description = %3" +msgstr "Erro %1 - Localização = %2 - Descrição = %3" + +#. SF_Utils._Validate error message +msgctxt "STOPEXECUTION" +msgid "THE EXECUTION IS CANCELLED." +msgstr "A EXECUÇÃO FOI CANCELADA." + +#. SF_Exception.RaiseAbort error message +msgctxt "INTERNALERROR" +msgid "" +"The ScriptForge library has crashed. The reason is unknown.\n" +"Maybe a bug that could be reported on\n" +"https://bugs.documentfoundation.org/\n"; +"\n" +"More details : \n" +"\n" +msgstr "" +"A biblioteca ScriptForge encontrou um erro grave. A razão é desconhecida.\n" +"Talvez seja um bug que pode ser relatado em\n" +"https://bugs.documentfoundation.org/\n"; +"\n" +"Mais detalhes: \n" +"\n" + +#. SF_Utils._Validate error message +#. %1: probably ScriptForge +#. %2: service or module name +#. %3: property or method name where the error occurred +#, kde-format +msgctxt "VALIDATESOURCE" +msgid "" +"Library : %1\n" +"Service : %2\n" +"Method :%3" +msgstr "" +"Biblioteca : %1\n" +"Serviço : %2\n" +"Método : %3" + +#. SF_Utils._Validate error message +#. %1: list of arguments of the method +#, kde-format +msgctxt "VALIDATEARGS" +msgid "Arguments: %1" +msgstr "Argumentos: %1" + +#. SF_Utils._Validate error message +#. %1: Wrong argument name +#, kde-format +msgctxt "VALIDATEERROR" +msgid "A serious error has been detected in your code on argument : « %1 »." +msgstr "Um erro grave foi detectado em seu código no argumento : « %1»." + +#. SF_Utils.Validate error message +msgctxt "VALIDATIONRULES" +msgid "Validation rules :" +msgstr "Regras de validação:" + +#. SF_Utils._Validate error message +#. %1: Wrong argument name +#. %2: Comma separated list of allowed types +#, kde-format +msgctxt "VALIDATETYPES" +msgid "« %1 » must have next type (or one of next types) : %2" +msgstr "" +"« %1 » deve ter o seguinte tipo (ou
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - framework/qa sfx2/inc sfx2/source
framework/qa/cppunit/data/empty.fodp |2 ++
framework/qa/cppunit/dispatchtest.cxx | 32
sfx2/inc/unoctitm.hxx |7 ++-
sfx2/source/control/unoctitm.cxx | 21 +
4 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit d0f203e70bce041ea71943af6a909b13ca3ec0e4
Author: Michael Stahl
AuthorDate: Wed Jun 30 13:26:59 2021 +0200
Commit: Michael Stahl
CommitDate: Thu Jul 1 12:19:41 2021 +0200
sfx2: try to fix lifecycle of SfxOfficeDispatch
This can be created either from the global SfxApplication, or from a
SfxViewFrame.
Particularly in the latter case, the SfxDispatcher and SfxBindings
members are owned by SfxViewFrame, so in case that is destroyed, the
SfxOfficeDispatch must clear its pointers.
It looks like the member pointers are checked before access already
everywhere, so just listen at the SfxViewFrame.
Change-Id: If08825734e94dd54e32cb77546684fd583c336ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118162
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
(cherry picked from commit 7cbd6d768d282077053c354254315f3dc89bf254)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118176
Tested-by: Jenkins
diff --git a/framework/qa/cppunit/data/empty.fodp
b/framework/qa/cppunit/data/empty.fodp
new file mode 100644
index ..3c2a4cf2cda5
--- /dev/null
+++ b/framework/qa/cppunit/data/empty.fodp
@@ -0,0 +1,2 @@
+
+
diff --git a/framework/qa/cppunit/dispatchtest.cxx
b/framework/qa/cppunit/dispatchtest.cxx
index 586c4af3b9b0..2f21a71b005e 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
@@ -199,6 +200,37 @@ CPPUNIT_TEST_FIXTURE(DispatchTest, testInterception)
// This was 1: MyInterceptor::queryDispatch() was called for .uno:Italic.
CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
}
+
+constexpr OUStringLiteral DATA_DIRECTORY = u"/framework/qa/cppunit/data/";
+
+CPPUNIT_TEST_FIXTURE(DispatchTest, testSfxOfficeDispatchDispose)
+{
+// this test doesn't work with a new document because of aURL.Main check
in SfxBaseController::dispatch()
+mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "empty.fodp",
+
"com.sun.star.presentation.PresentationDocument");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xModel.is());
+uno::Reference
xController(xModel->getCurrentController());
+CPPUNIT_ASSERT(xController.is());
+uno::Reference xFrame(xController->getFrame(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFrame.is());
+
+uno::Reference
xParser(util::URLTransformer::create(mxComponentContext));
+util::URL url;
+url.Complete = xModel->getURL() + "#dummy";
+xParser->parseStrict(url);
+
+uno::Reference xDisp(xFrame->queryDispatch(url, "", 0));
+CPPUNIT_ASSERT(xDisp.is());
+
+mxComponent->dispose();
+
+util::URL urlSlot;
+urlSlot.Complete = "slot:5598";
+xParser->parseStrict(urlSlot);
+// crashed with UAF
+xDisp->dispatch(urlSlot, {});
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index c180150325cc..7f6bf815e1f9 100644
--- a/sfx2/inc/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -101,7 +102,9 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-class SfxDispatchController_Impl : public SfxControllerItem
+class SfxDispatchController_Impl
+: public SfxControllerItem
+, public SfxListener
{
css::util::URL aDispatchURL;
SfxDispatcher* pDispatcher;
@@ -126,6 +129,8 @@ public:
const css::util::URL& rURL
);
virtual ~SfxDispatchController_Impl() override;
+virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
+
static OUString getSlaveCommand( const css::util::URL& rURL );
voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState, SfxSlotServer const * pServ );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6228266abeb6..10e759e1eede 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -321,6 +321,27 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
BindInternal_Impl( nSlot, pBindings );
pBindings->LEAVEREGISTRATIONS();
}
+assert(pDispatcher);
+assert(SfxApplication::Get()->GetAppDispatcher_Impl() == pDispatcher
+|| pDispatcher->GetFrame() != nullptr);
+if (pDispatcher->GetFrame())
+{
+StartListening(*pDispatcher->GetFrame());
+}
+else
+{
+
[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721b' - framework/qa sfx2/inc sfx2/source
framework/qa/cppunit/data/empty.fodp |2 ++
framework/qa/cppunit/dispatchtest.cxx | 32
sfx2/inc/unoctitm.hxx |7 ++-
sfx2/source/control/unoctitm.cxx | 21 +
4 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit 9622539a8fa1faf485abc0a17ce88d88ba017c14
Author: Michael Stahl
AuthorDate: Wed Jun 30 13:26:59 2021 +0200
Commit: Michael Stahl
CommitDate: Thu Jul 1 12:00:14 2021 +0200
sfx2: try to fix lifecycle of SfxOfficeDispatch
This can be created either from the global SfxApplication, or from a
SfxViewFrame.
Particularly in the latter case, the SfxDispatcher and SfxBindings
members are owned by SfxViewFrame, so in case that is destroyed, the
SfxOfficeDispatch must clear its pointers.
It looks like the member pointers are checked before access already
everywhere, so just listen at the SfxViewFrame.
Change-Id: If08825734e94dd54e32cb77546684fd583c336ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118162
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
(cherry picked from commit 7cbd6d768d282077053c354254315f3dc89bf254)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118195
Tested-by: Jenkins
(cherry picked from commit 06b84e45ffbe4f281c5d63da0b385c5faff2ef7b)
diff --git a/framework/qa/cppunit/data/empty.fodp
b/framework/qa/cppunit/data/empty.fodp
new file mode 100644
index ..3c2a4cf2cda5
--- /dev/null
+++ b/framework/qa/cppunit/data/empty.fodp
@@ -0,0 +1,2 @@
+
+
diff --git a/framework/qa/cppunit/dispatchtest.cxx
b/framework/qa/cppunit/dispatchtest.cxx
index 0dd6b4cfc33d..2e2efec4693a 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
@@ -201,6 +202,37 @@ CPPUNIT_TEST_FIXTURE(DispatchTest, testInterception)
// This was 1: MyInterceptor::queryDispatch() was called for .uno:Italic.
CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
}
+
+constexpr OUStringLiteral DATA_DIRECTORY = u"/framework/qa/cppunit/data/";
+
+CPPUNIT_TEST_FIXTURE(DispatchTest, testSfxOfficeDispatchDispose)
+{
+// this test doesn't work with a new document because of aURL.Main check
in SfxBaseController::dispatch()
+mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "empty.fodp",
+
"com.sun.star.presentation.PresentationDocument");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xModel.is());
+uno::Reference
xController(xModel->getCurrentController());
+CPPUNIT_ASSERT(xController.is());
+uno::Reference xFrame(xController->getFrame(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFrame.is());
+
+uno::Reference
xParser(util::URLTransformer::create(mxComponentContext));
+util::URL url;
+url.Complete = xModel->getURL() + "#dummy";
+xParser->parseStrict(url);
+
+uno::Reference xDisp(xFrame->queryDispatch(url, "", 0));
+CPPUNIT_ASSERT(xDisp.is());
+
+mxComponent->dispose();
+
+util::URL urlSlot;
+urlSlot.Complete = "slot:5598";
+xParser->parseStrict(urlSlot);
+// crashed with UAF
+xDisp->dispatch(urlSlot, {});
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index c180150325cc..7f6bf815e1f9 100644
--- a/sfx2/inc/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -101,7 +102,9 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-class SfxDispatchController_Impl : public SfxControllerItem
+class SfxDispatchController_Impl
+: public SfxControllerItem
+, public SfxListener
{
css::util::URL aDispatchURL;
SfxDispatcher* pDispatcher;
@@ -126,6 +129,8 @@ public:
const css::util::URL& rURL
);
virtual ~SfxDispatchController_Impl() override;
+virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
+
static OUString getSlaveCommand( const css::util::URL& rURL );
voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState, SfxSlotServer const * pServ );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 00b9c7188d67..ff1029a2b61f 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -320,6 +320,27 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
BindInternal_Impl( nSlot, pBindings );
pBindings->LEAVEREGISTRATIONS();
}
+assert(pDispatcher);
+assert(SfxApplication::Get()->GetAppDispatcher_Impl() == pDispatcher
+|| pDispatcher->GetFrame() != nullptr);
+if (pDispatcher->GetFrame())
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - framework/qa sfx2/inc sfx2/source
framework/qa/cppunit/data/empty.fodp |2 ++
framework/qa/cppunit/dispatchtest.cxx | 32
sfx2/inc/unoctitm.hxx |7 ++-
sfx2/source/control/unoctitm.cxx | 21 +
4 files changed, 61 insertions(+), 1 deletion(-)
New commits:
commit 06b84e45ffbe4f281c5d63da0b385c5faff2ef7b
Author: Michael Stahl
AuthorDate: Wed Jun 30 13:26:59 2021 +0200
Commit: Michael Stahl
CommitDate: Thu Jul 1 11:57:37 2021 +0200
sfx2: try to fix lifecycle of SfxOfficeDispatch
This can be created either from the global SfxApplication, or from a
SfxViewFrame.
Particularly in the latter case, the SfxDispatcher and SfxBindings
members are owned by SfxViewFrame, so in case that is destroyed, the
SfxOfficeDispatch must clear its pointers.
It looks like the member pointers are checked before access already
everywhere, so just listen at the SfxViewFrame.
Change-Id: If08825734e94dd54e32cb77546684fd583c336ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118162
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
(cherry picked from commit 7cbd6d768d282077053c354254315f3dc89bf254)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118195
Tested-by: Jenkins
diff --git a/framework/qa/cppunit/data/empty.fodp
b/framework/qa/cppunit/data/empty.fodp
new file mode 100644
index ..3c2a4cf2cda5
--- /dev/null
+++ b/framework/qa/cppunit/data/empty.fodp
@@ -0,0 +1,2 @@
+
+
diff --git a/framework/qa/cppunit/dispatchtest.cxx
b/framework/qa/cppunit/dispatchtest.cxx
index 0dd6b4cfc33d..2e2efec4693a 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
#include
#include
@@ -201,6 +202,37 @@ CPPUNIT_TEST_FIXTURE(DispatchTest, testInterception)
// This was 1: MyInterceptor::queryDispatch() was called for .uno:Italic.
CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
}
+
+constexpr OUStringLiteral DATA_DIRECTORY = u"/framework/qa/cppunit/data/";
+
+CPPUNIT_TEST_FIXTURE(DispatchTest, testSfxOfficeDispatchDispose)
+{
+// this test doesn't work with a new document because of aURL.Main check
in SfxBaseController::dispatch()
+mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "empty.fodp",
+
"com.sun.star.presentation.PresentationDocument");
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xModel.is());
+uno::Reference
xController(xModel->getCurrentController());
+CPPUNIT_ASSERT(xController.is());
+uno::Reference xFrame(xController->getFrame(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFrame.is());
+
+uno::Reference
xParser(util::URLTransformer::create(mxComponentContext));
+util::URL url;
+url.Complete = xModel->getURL() + "#dummy";
+xParser->parseStrict(url);
+
+uno::Reference xDisp(xFrame->queryDispatch(url, "", 0));
+CPPUNIT_ASSERT(xDisp.is());
+
+mxComponent->dispose();
+
+util::URL urlSlot;
+urlSlot.Complete = "slot:5598";
+xParser->parseStrict(urlSlot);
+// crashed with UAF
+xDisp->dispatch(urlSlot, {});
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index c180150325cc..7f6bf815e1f9 100644
--- a/sfx2/inc/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include
@@ -101,7 +102,9 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-class SfxDispatchController_Impl : public SfxControllerItem
+class SfxDispatchController_Impl
+: public SfxControllerItem
+, public SfxListener
{
css::util::URL aDispatchURL;
SfxDispatcher* pDispatcher;
@@ -126,6 +129,8 @@ public:
const css::util::URL& rURL
);
virtual ~SfxDispatchController_Impl() override;
+virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
+
static OUString getSlaveCommand( const css::util::URL& rURL );
voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState, SfxSlotServer const * pServ );
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b32235b4ca48..aed3c709604a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -321,6 +321,27 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
BindInternal_Impl( nSlot, pBindings );
pBindings->LEAVEREGISTRATIONS();
}
+assert(pDispatcher);
+assert(SfxApplication::Get()->GetAppDispatcher_Impl() == pDispatcher
+|| pDispatcher->GetFrame() != nullptr);
+if (pDispatcher->GetFrame())
+{
+StartListening(*pDispatcher->GetFrame());
+}
+else
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/source
svx/source/dialog/weldeditview.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 553b7a044c83498288227e261f1de918db6cd421
Author: Caolán McNamara
AuthorDate: Tue Jun 29 11:20:40 2021 +0100
Commit: Michael Stahl
CommitDate: Thu Jul 1 11:46:19 2021 +0200
Related: tdf#143088 return early on notification from frozen editengine
processing EE_NOTIFY_PROCESSNOTIFICATIONS from an EditEngine with an
UpdateMode mode of false will just to on to cause
AccessibleTextHelper_Impl::GetTextForwarder to throw an exception as a
Frozen EditEngine is considered Invalid so return early instead
Change-Id: I86f9647b7bf839cf3c7cf2f029be8c7c5aeef1f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118071
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/svx/source/dialog/weldeditview.cxx
b/svx/source/dialog/weldeditview.cxx
index 1a315930c332..56ce13f12c3a 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -769,6 +769,19 @@ WeldTextForwarder::~WeldTextForwarder()
IMPL_LINK(WeldTextForwarder, NotifyHdl, EENotify&, rNotify, void)
{
+if (EditEngine* pEditEngine = m_rEditAcc.GetEditEngine())
+{
+if (rNotify.eNotificationType == EE_NOTIFY_PROCESSNOTIFICATIONS
+&& !pEditEngine->GetUpdateMode())
+{
+// tdf#143088 an UpdateMode of false will just to on to cause
+// AccessibleTextHelper_Impl::GetTextForwarder to throw an
+// exception as a Frozen EditEngine is considered Invalid so return
+// early instead
+return;
+}
+}
+
::std::unique_ptr aHint =
SvxEditSourceHelper::EENotification2Hint(&rNotify);
if (aHint)
m_rEditSource.GetBroadcaster().Broadcast(*aHint);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sd/inc sd/source vcl/inc vcl/source writerfilter/source
include/oox/shape/ShapeContextHandler.hxx |6 ---
oox/source/shape/ShapeContextHandler.cxx | 32 -
sd/inc/sdabstdlg.hxx |1
sd/source/ui/dlg/sddlgfact.cxx|5 --
sd/source/ui/dlg/sddlgfact.hxx|1
vcl/inc/wizdlg.hxx| 14 ---
vcl/source/control/roadmapwizard.cxx | 30
vcl/source/control/wizardmachine.cxx | 33 --
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 -
9 files changed, 124 deletions(-)
New commits:
commit 65af6fda33bc40670d41055f63e010c763f5b0b1
Author: Noel Grandin
AuthorDate: Thu Jul 1 10:27:41 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 11:26:04 2021 +0200
loplugin:unusedmethods
Change-Id: I3ff5333c1e73ca61b0a7339e4b7dcfce211b88e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118207
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/shape/ShapeContextHandler.hxx
b/include/oox/shape/ShapeContextHandler.hxx
index 39549c5d33af..ba500dd48f76 100644
--- a/include/oox/shape/ShapeContextHandler.hxx
+++ b/include/oox/shape/ShapeContextHandler.hxx
@@ -85,24 +85,18 @@ public:
css::uno::Reference< css::drawing::XShape > getShape();
-css::uno::Reference< css::drawing::XDrawPage > getDrawPage();
void setDrawPage(const css::uno::Reference< css::drawing::XDrawPage > &
the_value);
-css::uno::Reference< css::frame::XModel > getModel();
void setModel(const css::uno::Reference< css::frame::XModel > & the_value);
-OUString getRelationFragmentPath();
void setRelationFragmentPath(const OUString & the_value);
sal_Int32 getStartToken();
void setStartToken( sal_Int32 _starttoken );
-css::awt::Point getPosition();
void setPosition(const css::awt::Point& rPosition);
void setDocumentProperties(const
css::uno::Reference& xDocProps);
-css::uno::Reference
getDocumentProperties();
-css::uno::Sequence getMediaDescriptor();
void setMediaDescriptor(const
css::uno::Sequence& rMediaDescriptor);
void setGraphicMapper(css::uno::Reference
const & rGraphicMapper);
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 0d03d322d011..066d49d00f60 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -513,23 +513,11 @@ ShapeContextHandler::getShape()
return xResult;
}
-css::uno::Reference< css::drawing::XDrawPage >
ShapeContextHandler::getDrawPage()
-{
-return mxDrawPage;
-}
-
void ShapeContextHandler::setDrawPage(const css::uno::Reference<
css::drawing::XDrawPage > & the_value)
{
mxDrawPage = the_value;
}
-css::uno::Reference< css::frame::XModel > ShapeContextHandler::getModel()
-{
-if( !mxShapeFilterBase.is() )
-throw uno::RuntimeException();
-return mxShapeFilterBase->getModel();
-}
-
void ShapeContextHandler::setModel(const css::uno::Reference<
css::frame::XModel > & the_value)
{
if( !mxShapeFilterBase.is() )
@@ -538,11 +526,6 @@ void ShapeContextHandler::setModel(const
css::uno::Reference< css::frame::XModel
mxShapeFilterBase->setTargetDocument(xComp);
}
-OUString ShapeContextHandler::getRelationFragmentPath()
-{
-return msRelationFragmentPath;
-}
-
void ShapeContextHandler::setRelationFragmentPath(const OUString & the_value)
{
msRelationFragmentPath = the_value;
@@ -558,11 +541,6 @@ void ShapeContextHandler::setStartToken( sal_Int32
_starttoken )
mnStartToken = _starttoken;
}
-awt::Point ShapeContextHandler::getPosition()
-{
-return maPosition;
-}
-
void ShapeContextHandler::setPosition(const awt::Point& rPosition)
{
maPosition = rPosition;
@@ -574,16 +552,6 @@ void ShapeContextHandler::setDocumentProperties(const
uno::ReferencecheckDocumentProperties(mxDocumentProperties);
}
-uno::Reference
ShapeContextHandler::getDocumentProperties()
-{
-return mxDocumentProperties;
-}
-
-uno::Sequence ShapeContextHandler::getMediaDescriptor()
-{
-return maMediaDescriptor;
-}
-
void ShapeContextHandler::setMediaDescriptor(const
uno::Sequence& rMediaDescriptor)
{
maMediaDescriptor = rMediaDescriptor;
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index c5c8c3a38ad4..4c9c547f98a2 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -70,7 +70,6 @@ class AbstractSdCustomShowDlg : public VclAbstractDialog
protected:
virtual ~AbstractSdCustomShowDlg() override = default;
public:
-virtual boolIsModified() const = 0;
virtual boolIsCustomShow() const = 0;
};
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index f5ab2524cdb9..0335c68fa8be 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -240,11 +240,6 @@
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e754591fc13cf29c21fbbe4fb05146dbf4b60679
Author: Caolán McNamara
AuthorDate: Tue Jun 29 12:13:19 2021 +0100
Commit: Michael Stahl
CommitDate: Thu Jul 1 11:09:09 2021 +0200
Related: tdf#143088 listen to DefaultWindow for Settings changed
having multiple Application::EventListener are expensive while a
Window::EventListener is cheap and in this document there are thousands
of comments so having thousands of EventListeners is problematic.
Change-Id: I64fd12e4bcb8e4fd131effe94e6882e54cfcaf19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118084
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 2d4dc36ce5fe..6b2e557c35bf 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13642,7 +13642,7 @@ private:
GtkInstanceDrawingArea* pThis =
static_cast(widget);
return pThis->signal_scroll(pEvent);
}
-DECL_LINK(SettingsChangedHdl, VclSimpleEvent&, void);
+DECL_LINK(SettingsChangedHdl, VclWindowEvent&, void);
public:
GtkInstanceDrawingArea(GtkDrawingArea* pDrawingArea, GtkInstanceBuilder*
pBuilder, const a11yref& rA11y, bool bTakeOwnership)
: GtkInstanceWidget(GTK_WIDGET(pDrawingArea), pBuilder, bTakeOwnership)
@@ -13660,7 +13660,7 @@ public:
g_object_set_data(G_OBJECT(m_pDrawingArea),
"g-lo-GtkInstanceDrawingArea", this);
m_xDevice->EnableRTL(get_direction());
-Application::AddEventListener(LINK(this, GtkInstanceDrawingArea,
SettingsChangedHdl));
+ImplGetDefaultWindow()->AddEventListener(LINK(this,
GtkInstanceDrawingArea, SettingsChangedHdl));
}
AtkObject* GetAtkObject(AtkObject* pDefaultAccessible)
@@ -13798,7 +13798,7 @@ public:
virtual ~GtkInstanceDrawingArea() override
{
-Application::RemoveEventListener(LINK(this, GtkInstanceDrawingArea,
SettingsChangedHdl));
+ImplGetDefaultWindow()->RemoveEventListener(LINK(this,
GtkInstanceDrawingArea, SettingsChangedHdl));
g_object_steal_data(G_OBJECT(m_pDrawingArea),
"g-lo-GtkInstanceDrawingArea");
if (m_pAccessible)
@@ -13830,12 +13830,12 @@ public:
}
};
-IMPL_LINK(GtkInstanceDrawingArea, SettingsChangedHdl, VclSimpleEvent&, rEvent,
void)
+IMPL_LINK(GtkInstanceDrawingArea, SettingsChangedHdl, VclWindowEvent&, rEvent,
void)
{
-if (rEvent.GetId() != VclEventId::ApplicationDataChanged)
+if (rEvent.GetId() != VclEventId::WindowDataChanged)
return;
-DataChangedEvent* pData =
static_cast(static_cast(rEvent).GetData());
+DataChangedEvent* pData = static_cast(rEvent.GetData());
if (pData->GetType() == DataChangedEventType::SETTINGS)
signal_style_updated();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_Root.xba |2 ++
wizards/source/scriptforge/SF_Session.xba |7 +++
wizards/source/scriptforge/python/ScriptForgeHelper.py |1 +
wizards/source/scriptforge/python/scriptforge.py |5 +
4 files changed, 15 insertions(+)
New commits:
commit 28ee6bc8cf9548a6c24e68e5804077a96605a1f2
Author: Jean-Pierre Ledure
AuthorDate: Wed Jun 30 17:07:43 2021 +0200
Commit: Jean-Pierre Ledure
CommitDate: Thu Jul 1 11:05:09 2021 +0200
ScriptForge - Backdoor to alternate Python helper script
While developing a new version of
ScriptForgeHelper.py
the dev should be sure to invoke the new version
instead of the standard version shipped with its
LO release.
This can be done now by setting
- in Python a specific ScriptForge class property
ScriptForge.pythonhelpermodule2 = 'user#QA/ScriptForgeHelper.py'
- in Basic a specific property of the root class
_SF_.PythonHelper2 = "QA/ScriptForgeHelper.py"
both in the test script
Testing a new version of scriptforge.py can be configured
entirely from the test script by inserting next statements
import sys
sys.path.reverse()
sys.path.append('/home/jean-pierre/.config/libreoffice/4/user/Scripts/python/QA')
sys.path.reverse()
Change-Id: Iab6db518932e9dde9030b7e5bbe00a50dee31840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118171
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/SF_Root.xba
b/wizards/source/scriptforge/SF_Root.xba
index 6e89920a3c34..f435bcec6f1f 100644
--- a/wizards/source/scriptforge/SF_Root.xba
+++ b/wizards/source/scriptforge/SF_Root.xba
@@ -77,6 +77,7 @@ Private TreeDataModel As Object '
com.sun.star.awt.tree.MutableTreeDataMod
' Specific persistent services objects or properties
Private FileSystemNaming As String ' If "SYS", file
and folder naming is based on operating system notation
Private PythonHelper As String ' File name of Python
helper functions (stored in $(inst)/share/Scripts/python)
+Private PythonHelper2 As String ' Alternate Python helper
file name for test purposes
Private Interface As Object ' ScriptForge own
L10N service
Private OSName As String ' WIN, LINUX, MACOS
Private SFDialogs As Variant ' Persistent
storage for the SFDialogs library
@@ -127,6 +128,7 @@ Private Sub Class_Initialize()
Set Introspection = Nothing
FileSystemNaming = "ANY"
PythonHelper = "ScriptForgeHelper.py"
+ PythonHelper2 = ""
Set Interface = Nothing
Set BrowseNodeFactory = Nothing
Set DatabaseContext = Nothing
diff --git a/wizards/source/scriptforge/SF_Session.xba
b/wizards/source/scriptforge/SF_Session.xba
index 837c26b2a048..63fd4c57bf0a 100644
--- a/wizards/source/scriptforge/SF_Session.xba
+++ b/wizards/source/scriptforge/SF_Session.xba
@@ -291,6 +291,13 @@ Try:
If VarType(vArg) = V_DATE Then pvArgs(i) =
SF_Utils._CDateToIso(vArg)
Next i
+ ' Intercept alternate Python helpers file when relevant
+ With _SF_
+ If SF_String.StartsWith(Script, .PythonHelper) And
Len(.PythonHelper2) > 0 Then
+ Scope = SCRIPTISPERSONAL
+ Script = .PythonHelper2 & Mid(Script,
Len(.PythonHelper) + 1)
+ End If
+ End With
' Find script
Set oScript = SF_Session._GetScript("Python", Scope, Script)
diff --git a/wizards/source/scriptforge/python/ScriptForgeHelper.py
b/wizards/source/scriptforge/python/ScriptForgeHelper.py
index aec9311a3f3f..12fbaa337ebe 100644
--- a/wizards/source/scriptforge/python/ScriptForgeHelper.py
+++ b/wizards/source/scriptforge/python/ScriptForgeHelper.py
@@ -283,6 +283,7 @@ if __name__ == "__main__":
print(_SF_Platform('OSRelease'))
print(_SF_Platform('OSVersion'))
print(_SF_Platform('Processor'))
+print(_SF_Platform('PythonVersion'))
#
print(hashlib.algorithms_guaranteed)
print(_SF_FileSystem__HashFile('/opt/libreoffice6.4/program/libbootstraplo.so',
'md5'))
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index 33b98fc491f8..0f16613d618f 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -224,6 +224,11 @@ class ScriptForge(object, metaclass = _Singleton):
if '.py$' in script.lower(): # Python
if len(scope) == 0:
scope = 'share' # Default for Python
+# Provide an alternate helper script depending on test context
+if script.startswith(cls.pythonhelpermodule) and hasattr(cls
[Libreoffice-commits] core.git: oox/source sd/source
oox/source/drawingml/textcharacterpropertiescontext.cxx |6 --
oox/source/export/drawingml.cxx | 12 ++--
oox/source/export/shapes.cxx|3 ++-
sd/source/filter/eppt/epptooxml.hxx |6 +++---
sd/source/filter/eppt/pptx-epptooxml.cxx|8
5 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit f63c56f87294d87275b409f6b39b7fcdc0b2be92
Author: Sarper Akdemir
AuthorDate: Tue Jun 29 11:10:41 2021 +0300
Commit: Miklos Vajna
CommitDate: Thu Jul 1 11:00:53 2021 +0200
address style concerns and better practices for pptx footer export
Change-Id: I9954141fb24022487983f2f6ed37e3df2a98c482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118072
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 9363a69673bb..ce2ac6a4a119 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -50,11 +50,13 @@
TextCharacterPropertiesContext::TextCharacterPropertiesContext(
int nVisualTokenAmount = sax_fastparser::castToFastAttributeList(
rAttribs.getFastAttributeList()
).getFastAttributeTokens().size();
-if ( rAttribs.hasAttribute( XML_lang ) ){
+if ( rAttribs.hasAttribute( XML_lang ) )
+{
mrTextCharacterProperties.moLang = rAttribs.getString( XML_lang );
--nVisualTokenAmount; // Not a visual attribute
}
-if ( rAttribs.hasAttribute( XML_altLang )){
+if ( rAttribs.hasAttribute( XML_altLang ))
+{
--nVisualTokenAmount; // Not a visual attribute
}
if ( rAttribs.hasAttribute( XML_sz ) )
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 72d7b6d67a37..455e50159612 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2938,20 +2938,20 @@ void DrawingML::WriteLstStyles(const
css::uno::Reference& rXShapePropSet)
{
-Reference access(rParagraph, UNO_QUERY);
-if (!access.is())
+Reference xAccess(rParagraph, UNO_QUERY);
+if (!xAccess.is())
return;
-Reference enumeration(access->createEnumeration());
-if (!enumeration.is())
+Reference xEnumeration(xAccess->createEnumeration());
+if (!xEnumeration.is())
return;
Reference rRun;
-if (enumeration->hasMoreElements())
+if (xEnumeration->hasMoreElements())
{
-Any aAny(enumeration->nextElement());
+Any aAny(xEnumeration->nextElement());
if (aAny >>= rRun)
{
float fFirstCharHeight = rnCharHeight / 1000.;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 32732178bef5..795c864bc600 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1590,7 +1590,8 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference<
XInterface >& xIface, s
pFS->startElementNS(nXmlNamespace,
(GetDocumentType() != DOCUMENT_DOCX ? XML_txBody :
XML_txbx));
-WriteText( xIface, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX),
true, 0, bWritePropertiesAsLstStyles );
+WriteText(xIface, /*bBodyPr=*/(GetDocumentType() != DOCUMENT_DOCX),
/*bText=*/true,
+ /*nXmlNamespace=*/0,
/*bWritePropertiesAsLstStyles=*/bWritePropertiesAsLstStyles);
pFS->endElementNS( nXmlNamespace, (GetDocumentType() != DOCUMENT_DOCX
? XML_txBody : XML_txbx) );
if (GetDocumentType() == DOCUMENT_DOCX)
WriteText( xIface, /*bBodyPr=*/true, /*bText=*/false,
/*nXmlNamespace=*/nXmlNamespace );
diff --git a/sd/source/filter/eppt/epptooxml.hxx
b/sd/source/filter/eppt/epptooxml.hxx
index 8643ff58e841..82bb6a3ab937 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -123,7 +123,7 @@ private:
@param rXShape Master placeholder shape
@returns Placeholder index
*/
-unsigned CreateNewPlaceholderIndex(const
css::uno::Reference& rXShape);
+sal_Int32 CreateNewPlaceholderIndex(const
css::uno::Reference& rXShape);
css::uno::Reference
GetReferencedPlaceholderXShape(const PlaceholderType eType, PageType ePageType)
const;
void WritePlaceholderReferenceShapes(PowerPointShapeExport& rDML, PageType
ePageType);
@@ -151,9 +151,9 @@ private:
::oox::drawingml::ShapeExport::ShapeHashMap maShapeMap;
-unsigned mnPlaceholderIndexMax; ///< Last used placeholder index
+sal_Int32 mnPlaceholderIndexMax; ///< Last used placeholder index
/// Map of placeholder indexes for Master placeholders
-std::unordered_map< css::uno::Reference, unsigned >
maPlaceholderShapeToIndexMap;
+std::unordered_map< css::uno::Reference, sal_Int32 >
maPlaceholderShapeToIndexMap;
struct A
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/glbltree.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5398a6e36489bd68ba31e834833d39fa7de1cbad
Author: Andreas Heinisch
AuthorDate: Wed Jun 30 19:07:38 2021 +0200
Commit: Andreas Heinisch
CommitDate: Thu Jul 1 10:48:22 2021 +0200
tdf#127978 - Don't URL encode filename for navigator's tooltip
Change-Id: I70ea7fb739f14c5c60915acc6c66ea241f67524c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118197
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/sw/source/uibase/utlui/glbltree.cxx
b/sw/source/uibase/utlui/glbltree.cxx
index 4225633077a4..59d193807d04 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1076,7 +1076,9 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl,
sfx2::FileDialogHelper*, _pFileDlg, vo
sal_Int32 nPos = 0;
for (const std::unique_ptr& pMed : aMedList)
{
-OUString sFileName = pMed->GetURLObject().GetMainURL(
INetURLObject::DecodeMechanism::NONE )
+// tdf#127978 - don't URL encode filename for navigator's tooltip
+OUString sFileName
+=
pMed->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)
+ OUStringChar(sfx2::cTokenSeparator)
+ pMed->GetFilter()->GetFilterName()
+ OUStringChar(sfx2::cTokenSeparator);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/docs
odk/docs/tools.html |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 25580a3d72f64a3cee04ef330c58caf77873ef45 Author: Samuel Mehrbrodt AuthorDate: Tue Jun 29 14:05:33 2021 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Jul 1 10:19:55 2021 +0200 Update documentation for uno executable After -r parameter was removed with 5a1d51139c580dc64578d36dc1b4a31a4e5e0ef8 Change-Id: I1961f35ea375e7fd7426958275de0809c8fc9e2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118087 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 0d4e3cbd3224..6100f6fd09f2 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -258,10 +258,10 @@ The UNO-starter is for running a component or service process, and providing a runtime environment. Raising a component might look like this - [c:\] uno.exe -c MyComponent -l mycomp.dll -r myregistry.rdb + [c:\] uno.exe -c MyComponent -l mycomp.dll -env:URE_MORE_SERVICES=myservices.rdb -env:URE_MORE_TYPES=mytypes.rdb -- foo bar or - [c:\] uno.exe -s foo.bar.FooBarService -r myregistry.rdb + [c:\] uno.exe -s foo.bar.FooBarService -env:URE_MORE_SERVICES=myservices.rdb -env:URE_MORE_TYPES=mytypes.rdb -- foo bar The starter loads the component and instantiates it. The component must export the interface com.sun.star.lang.XMain: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: .git-blame-ignore-revs
.git-blame-ignore-revs | 89 + 1 file changed, 89 insertions(+) New commits: commit 210dd59742e9e0643325efc0dfb7678e5d79e8c7 Author: Samuel Mehrbrodt AuthorDate: Tue Jun 29 15:14:41 2021 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Jul 1 10:19:17 2021 +0200 tdf#123936 Add formatting commits to .git-blame-ignore-revs git log --oneline --author Hofer --grep Formatting --pretty=format:"%H" >> .git-blame-ignore-revs Change-Id: I7fea4396274e926e7866ddb25d68fd068ce345ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118115 Tested-by: Samuel Mehrbrodt Reviewed-by: Samuel Mehrbrodt diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2cfc555cf365..7298b0ab85b6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -40,3 +40,92 @@ b86ca947115f2ef61dd71c7a43e7a3ec1f1cf3b0 11485a500196af7a2533787f4faf32e14693f480 e190529f40988bbeb23b7b3abaeca6900f96213f 35fa77d0137350e69b17418e2bc33f1fa0be2efb +10b23330a9655658e6d7ef1d008a3302a15e9629 +79b6055acd1ea27a9f054e6980abbe2024cdc4a2 +315f270d2db7541e9400852b070afb30f371f644 +1e17165f6643afe583bb97a40fb25ecb7bab24d9 +a9bce41c64bda648be2609a0dc4aea728fa8ec77 +c096ab87c8a11e8d75dc689ea7024288419cfd22 +b35232bdf56fbda34476cf537d53bbea31235a95 +58d98a08aee7bf027c109eeb94183d24351827fa +01baeab99890e5650b3dabc15f8d900490a5a133 +0108cd51faf942b3fc3a292522d4b2f421f1cf45 +2184efed3943fe9634e6e361e8b0306a374cbf59 +d0b3815392d1fb253ed05218422a7f9b37c9df24 +70e36068a43cb6747232441ee67e609c86362aa0 +e8e093f14b698fc710930b2dead57c7d4fb63b8e +302d64cb3c21335867b447970ab8db8d1fabdef3 +2d72bc353b9d086e3eb3f9cf00a034c86f13ca21 +156da5b55362db37d4e61a22e43e489e48797452 +15d080d2ca19891187a547f66d77183ebed0811b +c927d6daa9a6403c53cc41b1ab4dde820f08f387 +7b49f8c7ebf40048181b56e9bfb11135bd473cab +481fdcc619dadf0a65e5af73b0c33b26df2400e5 +5d8cf2021d8f7f171924f2b1adf824532cd67497 +eb4c2e96f38a6b5280a83709e55fbb5b8d7e9d36 +4d4e95be173e84b5040af46a459b3c071bfd744a +dab1e6435728c6d7e81d6d6158e1fa45470345d2 +c4ab5393e1c2332d92ea6672d3c8ffc3a6220afa +de80fdc2060abe5b171bcef72944dd7b914ccd33 +5ce88c782e44dae6de8df2933b7c036f0dd48172 +c19cc6ad7676a987475fc718488007af3672a025 +672ddcb7d7a496f4a4f761b32aceaa72e4f600ed +2e4529c0016529325289701080499b3498a270f9 +7c9a2c4b97c145a358084bed4b875396d3dc3e5c +02d65d7a19981d342d9ef3996b296b4efda905a4 +39821e7d24deffa72bd9254414d4b58f22be2fca +69b12a6eb3616d15035310eeb0c3dbc7aefcb5c1 +6ceb1d0f2e23749fe03fab08ec338ba4d7782173 +695280feb90729fde1a7ecf1c409ae16f8281a46 +6d5ff94b994e7279cea3d54d9d546f4f1a8cdb4d +856bdfb0585cea3c67eedfb535c6477d51e4c352 +afb92ffc62ba140ee1366ac5ecd526706e3d8a74 +0ce86801128b0955dd46aca5e5b5add4b719df0a +49fbda99b4e563be54ee7c85560a5929f0627654 +65717f77c43ca7cbf91e4c158d643a02a181e439 +b9e9ac51a731a1b9515d935fd543218b2ee107c1 +25e14502fdeac6c03dfed125d789b2822f488cfe +c4286f91f2d8dce8d42bad2dda85c13658d5e0b9 +b58f43e13902517dae5343913e584b7232cc2155 +8e7f1188899023de3be07c99f146196b39dfd584 +1582d9a2c5ef9f28bc97a74e25c3948a7611fac1 +f5e3b2e83ab463064f100a9cd93f09cadaae2292 +03e79e8ab515e061fbfc435e6660e1f57b4f460d +cb0630df7f32232bb3c51c464c28dcc66cdf7729 +9d561c5440dd68285aa84fb3dac20a8d1df4870f +f05246dc2ae1145f54e1b6e53b47fd53382add96 +580b4c5f945df4e98bc2bacdf3620da688b2dbdf +69397a13d9458174ea3d0160cb65d77ac83c205c +9c9a8229201bd134df923420c97db84688a7813c +7721e7a79733a5ac5e029869eeb88638ec00102e +36074893c87f80daf889287c736d604f590c0ae5 +11aa7dc7a6009c02e681f41f7255902fe578ab7e +4d9e9f2125867adde3558b9866d08f7bafb4386b +49494bb703107835f83671d9272a0326feec8bb4 +951764106e2d82fc59dcf39e14bc17838856a00c +32b57a159ea6ab3b0cdef7ca9d746639d42aa192 +5035f265cd6e19ef3589db55ca0b780944812365 +eedafe6e5c1c1f598170e6349c29ed19437d1f8c +fddcbd5d28bb58993ee3d210f1d11e57c70a8894 +7ebd82e885b60552464e060236e869162fcadc71 +71b69ac75b623fc2f36c5c1a0ba632152aa101b8 +a079d78439cd371dd270fb5a1de125d5de9cf472 +31fbd2be47819796eb6e7c23a8fc23925004abd6 +ec35fc62993111e4e7dd917e7dbc91ef82b02f74 +d66683f86a719b9961a076237aba07d6b4fea359 +79368f81028a05f1d3685f0052806d3f93cd2da8 +6da61d5fa731fc34dc27607b6dc02b91928e4a54 +16389aae367ebfa8ce19f8ee1c26232fec7ff729 +0eaf2092940dc604926d31ef11b6ffb07abedc5a +26573395db55ddbd56d4dde39c8d5e5306c7a6ce +0d3fb848a2995a0869c4c5fa8916214a513865ac +f0126ffa6469d6c43f04596cb6f5ca83919ef8fc +635bc2ea81fd9493a2997e89c2de5aa7d8405578 +dd6e0ab30a120512e39f0d9b2e422243deae7b5f +6ef7a95285f4684113ee8d4e06eada8794f4daac +9b88f814309ddf73f92327d526b1e43c813c1de1 +2c771b7b79a206987241b595712b9026fdcb5e89 +4391c275df68b409a9bf7295934350bffd1abc00 +80139bf7977d2e78e3c619956813893f5933f929 +e05af8af958c9caa4bb7a4f6d8600ddf0a22c54b +b53fa6344d033f8b8f03b9274dbdd811251c2c1a \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf139549.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 39 +++
2 files changed, 39 insertions(+)
New commits:
commit 02809c8b53e225ea45952de66d1b634267c8f28b
Author: Tünde Tóth
AuthorDate: Tue Jun 29 10:40:04 2021 +0200
Commit: László Németh
CommitDate: Thu Jul 1 09:59:17 2021 +0200
tdf#139549 add test to commit 2ffdd37067926ddb841c6055205f267b96706945
(tdf#139549 DOCX import: document got modified at import time)
to check the fixed position of the frame.
Note: to test it under Linux, use SAL_USE_VCLPLUGIN=gen:
$ make CPPUNIT_TEST_NAME=testTdf139549 CppunitTest_sw_ooxmlexport16
SAL_USE_VCLPLUGIN=gen
Change-Id: I13ddfd5b5b4568bc7eb164cbda23f1d99fcab443
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118074
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf139549.docx
b/sw/qa/extras/ooxmlexport/data/tdf139549.docx
new file mode 100644
index ..6e76ae57c02f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf139549.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index bafe3b511730..ecd0e4b62803 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -587,6 +587,45 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(Test_ShadowDirection,
"tdf142361ShadowDirect
"rotWithShape", "0");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf139549, "tdf139549.docx")
+{
+// Document contains a VML textbox, the position of the textbox was
incorrect.
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+OUString aStyle = getXPath(pXmlDoc, "//w:pict/v:shape", "style");
+/* original is:
"position:absolute;margin-left:138.5pt;margin-top:40.1pt;width:183pt;
+
height:68pt;z-index:251675648;mso-position-horizontal:absolute;
+
mso-position-horizontal-relative:page;mso-position-vertical:absolute;
+ mso-position-vertical-relative:page" */
+CPPUNIT_ASSERT(!aStyle.isEmpty());
+
+sal_Int32 nextTokenPos = 0;
+OUString aStyleCommand = aStyle.getToken(0, ';', nextTokenPos);
+CPPUNIT_ASSERT(!aStyleCommand.isEmpty());
+
+OUString aStyleCommandName = aStyleCommand.getToken(0, ':');
+OUString aStyleCommandValue = aStyleCommand.getToken(1, ':');
+CPPUNIT_ASSERT_EQUAL(OUString("position"), aStyleCommandName);
+CPPUNIT_ASSERT_EQUAL(OUString("absolute"), aStyleCommandValue);
+
+aStyleCommand = aStyle.getToken(0, ';', nextTokenPos);
+CPPUNIT_ASSERT(!aStyleCommand.isEmpty());
+
+aStyleCommandName = aStyleCommand.getToken(0, ':');
+aStyleCommandValue = aStyleCommand.getToken(1, ':');
+CPPUNIT_ASSERT_EQUAL(OUString("margin-left"), aStyleCommandName);
+// Without the fix it failed, because the margin-left was 171.85pt.
+CPPUNIT_ASSERT_DOUBLES_EQUAL(138.5, aStyleCommandValue.toFloat(), 0.1);
+
+aStyleCommand = aStyle.getToken(0, ';', nextTokenPos);
+CPPUNIT_ASSERT(!aStyleCommand.isEmpty());
+
+aStyleCommandName = aStyleCommand.getToken(0, ':');
+aStyleCommandValue = aStyleCommand.getToken(1, ':');
+CPPUNIT_ASSERT_EQUAL(OUString("margin-top"), aStyleCommandName);
+// Without the fix it failed, because the margin-top was 55.45pt.
+CPPUNIT_ASSERT_DOUBLES_EQUAL(40.1, aStyleCommandValue.toFloat(), 0.1);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/ndtxt.cxx|4 ++--
sw/source/uibase/docvw/FrameControlsManager.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3d8b07093873e7793b07c5cd10de2ad542d05cdb
Author: Noel Grandin
AuthorDate: Wed Jun 30 15:48:42 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 1 09:51:19 2021 +0200
avoid some dynamic_casts
where we know the object must be of the destination type
Change-Id: Ib5c7d1a55a89d77060e4064d3469f706f2ad7040
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118166
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 170f67e974e8..c1387a1fe2b9 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4110,7 +4110,7 @@ void SwTextNode::SetListRestart( bool bRestart )
bool SwTextNode::IsListRestart() const
{
const SfxBoolItem& aIsRestartItem =
-dynamic_cast(GetAttr( RES_PARATR_LIST_ISRESTART ));
+static_cast(GetAttr( RES_PARATR_LIST_ISRESTART ));
return aIsRestartItem.GetValue();
}
@@ -4225,7 +4225,7 @@ void SwTextNode::SetCountedInList( bool bCounted )
bool SwTextNode::IsCountedInList() const
{
const SfxBoolItem& aIsCountedInListItem =
-dynamic_cast(GetAttr( RES_PARATR_LIST_ISCOUNTED ));
+static_cast(GetAttr( RES_PARATR_LIST_ISCOUNTED ));
return aIsCountedInListItem.GetValue();
}
diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx
b/sw/source/uibase/docvw/FrameControlsManager.cxx
index 1da032330d57..f66150fc6d73 100644
--- a/sw/source/uibase/docvw/FrameControlsManager.cxx
+++ b/sw/source/uibase/docvw/FrameControlsManager.cxx
@@ -139,7 +139,7 @@ void SwFrameControlsManager::SetPageBreakControl( const
SwPageFrame* pPageFrame
pControl.swap( pNewControl );
}
-SwPageBreakWin* pWin = dynamic_cast(pControl->GetWindow());
+SwPageBreakWin* pWin = static_cast(pControl->GetWindow());
assert (pWin != nullptr);
pWin->UpdatePosition();
if (!pWin->IsVisible())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hwpfile.cxx | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 8c8f66fe54eba8ccb01759dea2fc006930c00044
Author: Caolán McNamara
AuthorDate: Wed Jun 30 21:12:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 09:48:01 2021 +0200
fix indent
Change-Id: I8ee2ac371be458b08993f1e197a2f78986e03545
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118201
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 6e04d8f67429..3fbaf6c6f2fc 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -624,36 +624,36 @@ int HWPFile::compareCharShape(CharShape const *shape)
return 0;
}
-int HWPFile::compareParaShape(ParaShape const *shape)
+int HWPFile::compareParaShape(const ParaShape* shape)
{
int count = pslist.size();
-if( count > 0 )
+if (count > 0)
{
-for(int i = 0; i< count; i++)
+for (int i = 0; i < count; ++i)
{
ParaShape *pshape = pslist[i].get();
-if( shape->left_margin == pshape->left_margin &&
+if (shape->left_margin == pshape->left_margin &&
shape->right_margin == pshape->right_margin &&
shape->pspacing_prev == pshape->pspacing_prev &&
shape->pspacing_next == pshape->pspacing_next &&
shape->indent == pshape->indent &&
shape->lspacing == pshape->lspacing &&
shape->arrange_type == pshape->arrange_type &&
-shape->outline == pshape->outline &&
- shape->pagebreak == pshape->pagebreak)
+shape->outline == pshape->outline &&
+shape->pagebreak == pshape->pagebreak)
{
-if( shape->cshape && pshape->cshape &&
- shape->cshape->size == pshape->cshape->size &&
- shape->cshape->font[0] == pshape->cshape->font[0] &&
- shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
- shape->cshape->space[0] == pshape->cshape->space[0] &&
- shape->cshape->color[1] == pshape->cshape->color[1] &&
- shape->cshape->color[0] == pshape->cshape->color[0] &&
- shape->cshape->shade == pshape->cshape->shade &&
- shape->cshape->attr == pshape->cshape->attr )
-{
- return pshape->index;
-}
+if (shape->cshape && pshape->cshape &&
+shape->cshape->size == pshape->cshape->size &&
+shape->cshape->font[0] == pshape->cshape->font[0] &&
+shape->cshape->ratio[0] == pshape->cshape->ratio[0] &&
+shape->cshape->space[0] == pshape->cshape->space[0] &&
+shape->cshape->color[1] == pshape->cshape->color[1] &&
+shape->cshape->color[0] == pshape->cshape->color[0] &&
+shape->cshape->shade == pshape->cshape->shade &&
+shape->cshape->attr == pshape->cshape->attr)
+{
+return pshape->index;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hwpfile.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 123a3ccacdb30dce0733212f35dea738bcafb747
Author: Caolán McNamara
AuthorDate: Wed Jun 30 21:08:46 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 1 09:47:09 2021 +0200
getParaShape() adds bounds checking we don't need in this case
Change-Id: I02f917169fcae0dc5bdfc55653cd21fe67eac9c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118200
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 4c79a6c1211f..6e04d8f67429 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -624,7 +624,6 @@ int HWPFile::compareCharShape(CharShape const *shape)
return 0;
}
-
int HWPFile::compareParaShape(ParaShape const *shape)
{
int count = pslist.size();
@@ -632,7 +631,7 @@ int HWPFile::compareParaShape(ParaShape const *shape)
{
for(int i = 0; i< count; i++)
{
-ParaShape *pshape = getParaShape(i);
+ParaShape *pshape = pslist[i].get();
if( shape->left_margin == pshape->left_margin &&
shape->right_margin == pshape->right_margin &&
shape->pspacing_prev == pshape->pspacing_prev &&
@@ -661,7 +660,6 @@ int HWPFile::compareParaShape(ParaShape const *shape)
return 0;
}
-
HWPFile *GetCurrentDoc()
{
return HWPFile::cur_doc;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 2 commits - external/gpgmepp external/libassuan external/libgpg-error
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 +- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit b3b8c23bb3ea5294002c22bd5b47cff6008fa7a1 Author: Christian Lohmaier AuthorDate: Sat May 1 10:40:58 2021 +0200 Commit: Armin Le Grand (Allotropia) CommitDate: Thu Jul 1 09:28:19 2021 +0200 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117600 Tested-by: Jenkins CollaboraOffice Reviewed-by: Mike Kaganski diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 8ecdf60e6f87..d7835622ca21 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 83d79a520988..899c21e4cec9 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) else commit d3fdad5d0ccc1cfef14540319825aa09044d63f9 Author: Armin Le Grand (Allotropia) AuthorDate: Thu Jul 1 09:26:34 2021 +0200 Commit: Armin Le Grand (Allotropia) CommitDate: Thu Jul 1 09:26:34 2021 +0200 Revert "avoid windres preprocessor quoting-messups with current cygwin" This reverts commit 731010a3124c92458be5c7c4839e8804d1c32463. Instead, try 15d36bdb2069cb531cabd9b3b9ffb0fb913a6bd0 diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index e190f44eda63..8ecdf60e6f87 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -39,7
