[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |2 ++
vcl/source/filter/svm/SvmReader.cxx | 31 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 8f962ddc45ca4f6825b41f2786f9fd219b4c1586
Author: panoskorovesis
AuthorDate: Wed Jul 7 15:45:12 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:58:57 2021 +0200
Add handler for MetaPolyLine Read
The handler separates the MetaPolyLine::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: Ic800b13cdca5bc6ffc00f1564e5a05303c445c5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118566
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 3b64225f37eb..f5da5b6e9f5c 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -48,6 +48,7 @@ public:
rtl::Reference ArcHandler();
rtl::Reference PieHandler();
rtl::Reference ChordHandler();
+rtl::Reference PolyLineHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index d8b1f31b6a28..4578c791d61e 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -427,6 +427,8 @@ public:
const tools::Polygon& GetPolygon() const { return maPoly; }
const LineInfo& GetLineInfo() const { return maLineInfo; }
+voidSetLineInfo(LineInfo& rLineInfo) { maLineInfo =
rLineInfo; }
+voidSetPolygon(tools::Polygon& rPoly) { maPoly = rPoly; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolygonAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 50d2ed8a7415..5406e786dfaf 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -186,7 +186,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return ChordHandler();
break;
case MetaActionType::POLYLINE:
-pAction = new MetaPolyLineAction;
+return PolyLineHandler();
break;
case MetaActionType::POLYGON:
pAction = new MetaPolygonAction;
@@ -541,4 +541,33 @@ rtl::Reference SvmReader::ChordHandler()
return pAction;
}
+
+rtl::Reference SvmReader::PolyLineHandler()
+{
+auto pAction = new MetaPolyLineAction();
+
+VersionCompatRead aCompat(mrStream);
+
+// Version 1
+tools::Polygon aPolygon;
+ReadPolygon(mrStream, aPolygon);
+
+// Version 2
+if (aCompat.GetVersion() >= 2)
+{
+LineInfo aLineInfo;
+ReadLineInfo(mrStream, aLineInfo);
+pAction->SetLineInfo(aLineInfo);
+}
+if (aCompat.GetVersion() >= 3)
+{
+sal_uInt8 bHasPolyFlags(0);
+mrStream.ReadUChar(bHasPolyFlags);
+if (bHasPolyFlags)
+aPolygon.Read(mrStream);
+}
+pAction->SetPolygon(aPolygon);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 23 ++-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 18b8e90ec255ce5cd94fd6fd0b3dc1729043552f
Author: panoskorovesis
AuthorDate: Wed Jul 7 15:35:15 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:57:50 2021 +0200
Add Handler for MetaChord Read
The handler separates the MetaChordAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: Id4251e270bab9dc609c220ad0f304ee38b9ed2bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118565
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 04ed88d5880c..3b64225f37eb 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -47,6 +47,7 @@ public:
rtl::Reference EllipseHandler();
rtl::Reference ArcHandler();
rtl::Reference PieHandler();
+rtl::Reference ChordHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 461006525272..d8b1f31b6a28 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -393,6 +393,9 @@ public:
const tools::Rectangle&GetRect() const { return maRect; }
const Point&GetStartPoint() const { return maStartPt; }
const Point&GetEndPoint() const { return maEndPt; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
+voidSetStartPoint(Point& rPoint) { maStartPt = rPoint; }
+voidSetEndPoint(Point& rPoint) { maEndPt = rPoint; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolyLineAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 3ccd2ae0d5c2..50d2ed8a7415 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -183,7 +183,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return PieHandler();
break;
case MetaActionType::CHORD:
-pAction = new MetaChordAction;
+return ChordHandler();
break;
case MetaActionType::POLYLINE:
pAction = new MetaPolyLineAction;
@@ -520,4 +520,25 @@ rtl::Reference SvmReader::PieHandler()
return pAction;
}
+
+rtl::Reference SvmReader::ChordHandler()
+{
+auto pAction = new MetaChordAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+Point aPoint;
+aSerializer.readPoint(aPoint);
+Point aEndPoint;
+aSerializer.readPoint(aEndPoint);
+
+pAction->SetRect(aRectangle);
+pAction->SetStartPoint(aPoint);
+pAction->SetEndPoint(aEndPoint);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 23 ++-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit e935e60431ab138eab044573355e2ed27bb1b8fa
Author: panoskorovesis
AuthorDate: Wed Jul 7 12:46:13 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:57:17 2021 +0200
Add Handler for MetaPie Read
The handler separates the MetaPieAction::Read from the metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I7b601a6ef03f4b0e777558e36aff87cd24588573
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118550
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index d7fa1ef2974c..04ed88d5880c 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -46,6 +46,7 @@ public:
rtl::Reference RoundRectHandler();
rtl::Reference EllipseHandler();
rtl::Reference ArcHandler();
+rtl::Reference PieHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index e899755e36db..461006525272 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -357,6 +357,9 @@ public:
const tools::Rectangle&GetRect() const { return maRect; }
const Point&GetStartPoint() const { return maStartPt; }
const Point&GetEndPoint() const { return maEndPt; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
+voidSetStartPoint(Point& rPoint) { maStartPt = rPoint; }
+voidSetEndPoint(Point& rPoint) { maEndPt = rPoint; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaChordAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 58333a188f83..3ccd2ae0d5c2 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -180,7 +180,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return ArcHandler();
break;
case MetaActionType::PIE:
-pAction = new MetaPieAction;
+return PieHandler();
break;
case MetaActionType::CHORD:
pAction = new MetaChordAction;
@@ -499,4 +499,25 @@ rtl::Reference SvmReader::ArcHandler()
return pAction;
}
+
+rtl::Reference SvmReader::PieHandler()
+{
+auto pAction = new MetaPieAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+Point aPoint;
+aSerializer.readPoint(aPoint);
+Point aEndPoint;
+aSerializer.readPoint(aEndPoint);
+
+pAction->SetRect(aRectangle);
+pAction->SetStartPoint(aPoint);
+pAction->SetEndPoint(aEndPoint);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 23 ++-
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 4fc97b63f144d2fa2eeb05f3e88b5c863fd4f12b
Author: panoskorovesis
AuthorDate: Wed Jul 7 10:31:55 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:56:49 2021 +0200
Add Handler for MetaArc Read
The handler separates the MetaArcAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I2d6e6bfa53b00811ba473db7e4d2255a1ca4becf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118545
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index acee4279eb22..d7fa1ef2974c 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -45,6 +45,7 @@ public:
rtl::Reference LineHandler();
rtl::Reference RoundRectHandler();
rtl::Reference EllipseHandler();
+rtl::Reference ArcHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 44c1e5db4917..e899755e36db 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -321,6 +321,9 @@ public:
const tools::Rectangle&GetRect() const { return maRect; }
const Point&GetStartPoint() const { return maStartPt; }
const Point&GetEndPoint() const { return maEndPt; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
+voidSetStartPoint(Point& rPoint) { maStartPt = rPoint; }
+voidSetEndPoint(Point& rPoint) { maEndPt = rPoint; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPieAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 87969933cee4..58333a188f83 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -177,7 +177,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return EllipseHandler();
break;
case MetaActionType::ARC:
-pAction = new MetaArcAction;
+return ArcHandler();
break;
case MetaActionType::PIE:
pAction = new MetaPieAction;
@@ -478,4 +478,25 @@ rtl::Reference SvmReader::EllipseHandler()
return pAction;
}
+
+rtl::Reference SvmReader::ArcHandler()
+{
+auto pAction = new MetaArcAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+Point aPoint;
+aSerializer.readPoint(aPoint);
+Point aEndPoint;
+aSerializer.readPoint(aEndPoint);
+
+pAction->SetRect(aRectangle);
+pAction->SetStartPoint(aPoint);
+pAction->SetEndPoint(aEndPoint);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 17 -
3 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 0fab99d596f87739a3c98776591ca4f0c51b15b9
Author: panoskorovesis
AuthorDate: Tue Jul 6 13:04:02 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:56:02 2021 +0200
Add Handler for MetaEllipse Read
The handler separates the MetaEllipseAction::Read from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I40c5f7c2993dd34cb370d909e251be9a588f6168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118473
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 7df5a1a45e3a..acee4279eb22 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -44,6 +44,7 @@ public:
rtl::Reference PixelHandler();
rtl::Reference LineHandler();
rtl::Reference RoundRectHandler();
+rtl::Reference EllipseHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 1b20cbf72952..44c1e5db4917 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -287,6 +287,7 @@ public:
virtual voidScale( double fScaleX, double fScaleY ) override;
const tools::Rectangle&GetRect() const { return maRect; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaArcAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index ba5311ac9ccf..87969933cee4 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -174,7 +174,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return RoundRectHandler();
break;
case MetaActionType::ELLIPSE:
-pAction = new MetaEllipseAction;
+return EllipseHandler();
break;
case MetaActionType::ARC:
pAction = new MetaArcAction;
@@ -463,4 +463,19 @@ rtl::Reference SvmReader::RoundRectHandler()
return pAction;
}
+
+rtl::Reference SvmReader::EllipseHandler()
+{
+auto pAction = new MetaEllipseAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+
+pAction->SetRect(aRectangle);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 22 +-
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 3f6c589530fbe7dbc418d777bdd5a7a1804e85bc
Author: panoskorovesis
AuthorDate: Mon Jul 5 14:50:39 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:55:29 2021 +0200
Add Handler for MetaRoundRect Read
The handler separates the MetaRoundRect::Read from the metaact.hxx
Read Implementation is now in SvmReader.hxx
Change-Id: Ic0b29b2119db3417c2feba8dc5fd44215256c040
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118433
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 6a134424a9c5..7df5a1a45e3a 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -43,6 +43,7 @@ public:
rtl::Reference PointHandler();
rtl::Reference PixelHandler();
rtl::Reference LineHandler();
+rtl::Reference RoundRectHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index d433b5f3dc81..1b20cbf72952 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -256,6 +256,9 @@ public:
const tools::Rectangle&GetRect() const { return maRect; }
sal_uInt32 GetHorzRound() const { return mnHorzRound; }
sal_uInt32 GetVertRound() const { return mnVertRound; }
+voidSetRect(const tools::Rectangle& rRect) { maRect =
rRect; }
+voidSetHorzRound(sal_uInt32 rHorzRound) { mnHorzRound =
rHorzRound; }
+voidSetVertRound(sal_uInt32 rVertRound) { mnVertRound =
rVertRound; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaEllipseAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index f2e87d224d7c..ba5311ac9ccf 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -171,7 +171,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return RectHandler();
break;
case MetaActionType::ROUNDRECT:
-pAction = new MetaRoundRectAction;
+return RoundRectHandler();
break;
case MetaActionType::ELLIPSE:
pAction = new MetaEllipseAction;
@@ -443,4 +443,24 @@ rtl::Reference SvmReader::LineHandler()
return pAction;
}
+
+rtl::Reference SvmReader::RoundRectHandler()
+{
+auto pAction = new MetaRoundRectAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+sal_uInt32 HorzRound;
+sal_uInt32 VertRound;
+mrStream.ReadUInt32(HorzRound).ReadUInt32(VertRound);
+
+pAction->SetRect(aRectangle);
+pAction->SetHorzRound(HorzRound);
+pAction->SetVertRound(VertRound);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 29 -
3 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 082554ee94e61008c75595c45bdcf01af989241a
Author: panoskorovesis
AuthorDate: Mon Jul 5 10:56:36 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:54:49 2021 +0200
Add Hanlder for MetaLine Read
The handler separates the MetaLineAction::Read from the metaact.hxx
Read Implementation is now in SvmReader.hxx
Change-Id: I27bfcc4323e8d351e8277898334fc623d6a53dd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118403
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index c62aff4355d1..6a134424a9c5 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -42,6 +42,7 @@ public:
rtl::Reference RectHandler();
rtl::Reference PointHandler();
rtl::Reference PixelHandler();
+rtl::Reference LineHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index a2c0a1a9f67e..d433b5f3dc81 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -191,6 +191,9 @@ public:
const Point&GetStartPoint() const { return maStartPt; }
const Point&GetEndPoint() const { return maEndPt; }
const LineInfo& GetLineInfo() const { return maLineInfo; }
+voidSetStartPoint(Point& rPoint) { maStartPt = rPoint; }
+voidSetEndPoint(Point& rPoint) { maEndPt = rPoint; }
+voidSetLineInfo(LineInfo& rLineInfo) { maLineInfo =
rLineInfo; }
};
class VCL_DLLPUBLIC MetaRectAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 3404650eebac..f2e87d224d7c 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -165,7 +165,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return PointHandler();
break;
case MetaActionType::LINE:
-pAction = new MetaLineAction;
+return LineHandler();
break;
case MetaActionType::RECT:
return RectHandler();
@@ -416,4 +416,31 @@ rtl::Reference SvmReader::PixelHandler()
return pAction;
}
+
+rtl::Reference SvmReader::LineHandler()
+{
+auto pAction = new MetaLineAction();
+
+VersionCompatRead aCompat(mrStream);
+
+// Version 1
+TypeSerializer aSerializer(mrStream);
+Point aPoint;
+Point aEndPoint;
+aSerializer.readPoint(aPoint);
+aSerializer.readPoint(aEndPoint);
+
+pAction->SetStartPoint(aPoint);
+pAction->SetEndPoint(aEndPoint);
+
+// Version 2
+if (aCompat.GetVersion() >= 2)
+{
+LineInfo aLineInfo;
+ReadLineInfo(mrStream, aLineInfo);
+pAction->SetLineInfo(aLineInfo);
+}
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |2 ++
vcl/source/filter/svm/SvmReader.cxx | 20 +++-
3 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit e21558852131de5c6721264edd274ebbc6c72973
Author: panoskorovesis
AuthorDate: Mon Jul 5 10:28:15 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:54:14 2021 +0200
Add Handler for MetaPixel Read
The handler separates the MetaPixelAction::Read from metaact.hxx
Read Implementation is now in SvmReader.hxx
Change-Id: If45e8c46c28957c4f11c95d8a0ebbaeab01894d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118399
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index c2e1e2c07df6..c62aff4355d1 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -41,6 +41,7 @@ public:
rtl::Reference FillColorHandler();
rtl::Reference RectHandler();
rtl::Reference PointHandler();
+rtl::Reference PixelHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 940ba20f8fb8..a2c0a1a9f67e 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -127,6 +127,8 @@ public:
const Point&GetPoint() const { return maPt; }
const Color&GetColor() const { return maColor; }
+voidSetPoint(Point& rPt) { maPt = rPt; }
+voidSetColor(Color& rColor) { maColor = rColor; }
};
class SAL_DLLPUBLIC_RTTI MetaPointAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index b257460184fc..3404650eebac 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -159,7 +159,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
pAction = new MetaAction;
break;
case MetaActionType::PIXEL:
-pAction = new MetaPixelAction;
+return PixelHandler();
break;
case MetaActionType::POINT:
return PointHandler();
@@ -398,4 +398,22 @@ rtl::Reference SvmReader::PointHandler()
return pAction;
}
+
+rtl::Reference SvmReader::PixelHandler()
+{
+auto pAction = new MetaPixelAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+Point aPoint;
+aSerializer.readPoint(aPoint);
+Color aColor;
+ReadColor(aColor);
+
+pAction->SetPoint(aPoint);
+pAction->SetColor(aColor);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 16 +++-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit c23b42ce803f58e547637100e83bb6bab2843fe0
Author: panoskorovesis
AuthorDate: Mon Jul 5 09:56:48 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:53:40 2021 +0200
Add Handler for MetaPoint Read
The handler separates the MetaPointAction::Read from mataact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: Ic383be9029f5a74479c511b29cf8759815d55713
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118398
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 0537eedb0b90..c2e1e2c07df6 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -40,6 +40,7 @@ public:
rtl::Reference LineColorHandler();
rtl::Reference FillColorHandler();
rtl::Reference RectHandler();
+rtl::Reference PointHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index cf18190c230f..940ba20f8fb8 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -154,6 +154,7 @@ public:
virtual voidScale( double fScaleX, double fScaleY ) override;
const Point&GetPoint() const { return maPt; }
+voidSetPoint(Point& rPt) { maPt = rPt; }
};
class VCL_DLLPUBLIC MetaLineAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 7bc892102d20..b257460184fc 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -162,7 +162,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
pAction = new MetaPixelAction;
break;
case MetaActionType::POINT:
-pAction = new MetaPointAction;
+return PointHandler();
break;
case MetaActionType::LINE:
pAction = new MetaLineAction;
@@ -384,4 +384,18 @@ rtl::Reference SvmReader::RectHandler()
return pAction;
}
+
+rtl::Reference SvmReader::PointHandler()
+{
+auto pAction = new MetaPointAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+Point aPoint;
+aSerializer.readPoint(aPoint);
+pAction->SetPoint(aPoint);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |1 +
vcl/source/filter/svm/SvmReader.cxx | 16 +++-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 7c320f2836f01f92129551f7fee4df9583d3aef5
Author: panoskorovesis
AuthorDate: Mon Jul 5 09:42:09 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 08:52:23 2021 +0200
Add Handler for MetaRect Read
The handler separates the read method from metaact.hxx
Read implementation is now in SvmReader.hxx
Change-Id: I824a06d9018b473fd2398802d69b4952d33c4ada
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118396
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index c8ece1c5043c..0537eedb0b90 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -39,6 +39,7 @@ public:
rtl::Reference MetaActionHandler(ImplMetaReadData* pData);
rtl::Reference LineColorHandler();
rtl::Reference FillColorHandler();
+rtl::Reference RectHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 657a06c9227a..cf18190c230f 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -216,6 +216,7 @@ public:
virtual voidScale( double fScaleX, double fScaleY ) override;
const tools::Rectangle&GetRect() const { return maRect; }
+voidSetRect(tools::Rectangle& rRect) { maRect = rRect; }
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index e30984148517..7bc892102d20 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -168,7 +168,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
pAction = new MetaLineAction;
break;
case MetaActionType::RECT:
-pAction = new MetaRectAction;
+return RectHandler();
break;
case MetaActionType::ROUNDRECT:
pAction = new MetaRoundRectAction;
@@ -370,4 +370,18 @@ rtl::Reference SvmReader::FillColorHandler()
return pAction;
}
+
+rtl::Reference SvmReader::RectHandler()
+{
+auto pAction = new MetaRectAction();
+
+VersionCompatRead aCompat(mrStream);
+TypeSerializer aSerializer(mrStream);
+
+tools::Rectangle aRectangle;
+aSerializer.readRectangle(aRectangle);
+pAction->SetRect(aRectangle);
+
+return pAction;
+}
/* 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 'distro/collabora/co-2021' - sc/inc sc/qa sc/source
sc/inc/address.hxx| 26 +-
sc/qa/unit/data/xlsx/invalid-named-range.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 19 +++
sc/source/filter/inc/defnamesbuffer.hxx |1 +
sc/source/filter/oox/defnamesbuffer.cxx | 22 ++
5 files changed, 55 insertions(+), 13 deletions(-)
New commits:
commit 4873bb10c136a503be00bd73d1e7c4ec66e9a10c
Author: Miklos Vajna
AuthorDate: Mon Jul 5 12:29:18 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 8 08:39:26 2021 +0200
XLSX import: fix handling of named ranges referring to PathMissing sheets
In case xl/externalLinks/externalLink1.xml refers to a sheet where type
is PathMissing, then both and gets ignored on
import. Make sure to also ignore named ranges referring to such external
documents.
The resulting named range was just a string anyway, and exporting this
back to XLSX results in Excel marking the whole file as corrupted.
(cherry picked from commit db1c8df98a23d687d6806f371bdd416dd1b84589)
Conflicts:
sc/qa/unit/subsequent_export-test2.cxx
Change-Id: Ifde07b5e59fba371f1f8ab3e82861c6997c6dbf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118551
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Luboš Luňák
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 4b2ad09691ba..8f3b6830e030 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -494,7 +494,7 @@ inline bool ValidAddress( const ScAddress& rAddress, SCCOL
nMaxCol = MAXCOL, SCR
}
// ScRange
-class SAL_WARN_UNUSED ScRange final
+class SAL_WARN_UNUSED SC_DLLPUBLIC ScRange final
{
public:
ScAddress aStart;
@@ -551,18 +551,18 @@ public:
inline bool In( const ScAddress& ) const; ///< is Address& in Range?
inline bool In( const ScRange& ) const; ///< is Range& in Range?
-SC_DLLPUBLIC ScRefFlags Parse( const OUString&, const ScDocument&,
+ScRefFlags Parse( const OUString&, const ScDocument&,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1,
ScAddress::ExternalInfo* pExtInfo = nullptr,
const
css::uno::Sequence* pExternalLinks = nullptr,
const OUString* pErrRef = nullptr );
-SC_DLLPUBLIC ScRefFlags ParseAny( const OUString&, const ScDocument&,
+ScRefFlags ParseAny( const OUString&, const ScDocument&,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1 );
-SC_DLLPUBLIC ScRefFlags ParseCols( const ScDocument& rDoc,
+ScRefFlags ParseCols( const ScDocument& rDoc,
const OUString&,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1 );
-SC_DLLPUBLIC void ParseRows( const ScDocument& rDoc,
+void ParseRows( const ScDocument& rDoc,
const OUString&,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1 );
@@ -614,14 +614,14 @@ public:
@returns
String contains formatted cell range in address convention
*/
-SC_DLLPUBLIC OUString Format( const ScDocument& rDocument,
+OUString Format( const ScDocument& rDocument,
ScRefFlags nFlags = ScRefFlags::ZERO,
const ScAddress::Details& rDetails =
ScAddress::detailsOOOa1,
bool bFullAddressNotation = false ) const;
inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
-SC_DLLPUBLIC void PutInOrder();
+void PutInOrder();
/**
@param rErrorRange
@@ -630,18 +630,18 @@ public:
@param pDocument
The document for the maximum defined sheet number.
*/
-[[nodiscard]] SC_DLLPUBLIC bool Move( SCCOL aDeltaX, SCROW aDeltaY, SCTAB
aDeltaZ,
+[[nodiscard]] bool Move( SCCOL aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ,
ScRange& rErrorRange, const ScDocument* pDocument = nullptr );
/** Same as Move() but with sticky end col/row anchors. */
-[[nodiscard]] SC_DLLPUBLIC bool MoveSticky( const ScDocument& rDoc, SCCOL
aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ,
+[[nodiscard]] bool MoveSticky( const ScDocument& rDoc, SCCOL aDeltaX,
SCROW aDeltaY, SCTAB aDeltaZ,
ScRange& rErrorRange );
-SC_DLLPUBLIC void IncColIfNotLessThan(const ScDocument& rDoc, SCCOL
nStartCol, SCCOL nOffset);
-SC_DLLPUBLIC void IncRowIfNotLessThan(const ScDocument& rDoc, SCROW
nStartRow, SCROW nOffset);
+void IncColIfNotLessThan(const ScDocument& rDoc, SCCOL nStartCol, SCCOL
nOffset);
+void IncRowIfNotLessThan(const ScDocume
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 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-test.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 dc6c9a37f367fd28a45e70e6de98cb0b24e50040
Author: Miklos Vajna
AuthorDate: Thu Jul 1 12:34:52 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 8 08:39:05 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.
(cherry picked from commit 1e3263a677b61c718d0fd1be15c066b933f7de18)
Conflicts:
sc/qa/unit/subsequent_export-test2.cxx
Change-Id: I278b4925414d29399401cc15ab3d944db88ee0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118546
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Luboš Luňák
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 25f607cb5ae0..76dad54c8904 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
@@ -1402,6 +1403,7 @@ contributors
control
control1
control2
+controlPr
controls
convMailMergeEsc
convex
@@ -2371,6 +2373,7 @@ forcedash
foredepth
forestGreen
forgetLastTabAlignment
+formControlPr
formFld
formLetters
formProt
@@ -3178,6 +3181,7 @@ location
lock
lockRevision
lockStructure
+lockText
lockWindows
locked
lockedCanvas
@@ -3660,6 +3664,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-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 4baebf766459..3b5e3903290a 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -282,6 +282,7 @@ public:
void testTdf136721_paper_size();
void testTdf139258_rotated_image();
void testCheckboxFormControlXlsxExport();
+void testButtonFormControlXlsxExport();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -462,6 +463,7 @@ public:
CPPUNIT_TEST(testTdf136721_paper_size);
CPPUNIT_TEST(testTdf139258_rotated_image);
CPPUNIT_TEST(testCheckboxFormControlXlsxExport);
+CPPUNIT_TEST(testButtonFormControlXlsxExport);
CPPUNIT_TEST_SUITE_END();
@@ -5869,6 +5871,29 @@ void ScExportTest::testCheckboxFormControlXlsxExport()
assertXPathContent(pDoc, "/xml/v:shape/xx:ClientData/xx:Anchor", "1, 22,
3, 3, 3, 30, 6, 1");
}
+void ScExportTest::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(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 19fb63465a48..67b1e7807322 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1153,6 +1153,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());
@@ -1165,7 +1168,11 @@ void VmlFormControlExporter::EndShape(sal_Int32
nShapeElement)
aAnchor += ", "
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/qa sc/source
sc/qa/unit/data/xlsx/checkbox-form-control.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 20
sc/source/filter/excel/xeescher.cxx | 99 +++-
sc/source/filter/inc/xeescher.hxx |3
sc/source/filter/xcl97/xcl97rec.cxx | 12 ++
5 files changed, 132 insertions(+), 2 deletions(-)
New commits:
commit c9a07fa73742a10b072300e7120be3ef8427d8e7
Author: Miklos Vajna
AuthorDate: Wed Jun 30 16:22:42 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 8 08:38:36 2021 +0200
XLSX export: improve handling of checkbox (form controls)
This builds on top of commit fd238380ae7820f12ac1f7c52d0f7180a93f3ba3
(tdf#106181 XLSX export: output form controls, 2020-05-13) and adds the
missing VML version which seems to be mandated by Excel 2019.
It is not perfect (e.g. there is still an unwanted border around the
checkbox), but the checkbox has a correct position and its label is
readable, while it was just lost previously.
(cherry picked from commit 94678a7b9c6b7e577c15adacc885e03551bcf17b)
Conflicts:
sc/qa/unit/subsequent_export-test2.cxx
Change-Id: I08198d068a0eb85061d138719cfc60d73c46398e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118488
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Luboš Luňák
diff --git a/sc/qa/unit/data/xlsx/checkbox-form-control.xlsx
b/sc/qa/unit/data/xlsx/checkbox-form-control.xlsx
new file mode 100644
index ..ad761a573aae
Binary files /dev/null and b/sc/qa/unit/data/xlsx/checkbox-form-control.xlsx
differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 77068268bff8..4baebf766459 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -281,6 +281,7 @@ public:
void testTdf84874();
void testTdf136721_paper_size();
void testTdf139258_rotated_image();
+void testCheckboxFormControlXlsxExport();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -460,6 +461,7 @@ public:
CPPUNIT_TEST(testTdf84874);
CPPUNIT_TEST(testTdf136721_paper_size);
CPPUNIT_TEST(testTdf139258_rotated_image);
+CPPUNIT_TEST(testCheckboxFormControlXlsxExport);
CPPUNIT_TEST_SUITE_END();
@@ -5849,6 +5851,24 @@ void ScExportTest::testTdf139258_rotated_image()
assertXPathContent(pDrawing, "/xdr:wsDr/xdr:twoCellAnchor/xdr:to/xdr:row",
"25");
}
+void ScExportTest::testCheckboxFormControlXlsxExport()
+{
+// Given a document that has a checkbox form control:
+ScDocShellRef xShell = loadDoc(u"checkbox-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 VML markup is written and it has a correct position
+ size:
+xmlDocUniquePtr pDoc
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/drawings/vmlDrawing1.vml");
+// Without the fix in place, this test would have failed as there was no
such stream.
+CPPUNIT_ASSERT(pDoc);
+assertXPathContent(pDoc, "/xml/v:shape/xx:ClientData/xx:Anchor", "1, 22,
3, 3, 3, 30, 6, 1");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index 7a7514aa7061..19fb63465a48 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -70,6 +70,8 @@
#include
#include
#include
+#include
+#include
#include
using namespace com::sun::star;
@@ -659,7 +661,8 @@ XclExpTbxControlObj::XclExpTbxControlObj(
XclExpObjectManager& rRoot, Reference<
mbScrollHor( false ),
mbPrint( false ),
mbVisible( false ),
-mnShapeId( 0 )
+mnShapeId( 0 ),
+mrRoot(rRoot)
{
namespace FormCompType = css::form::FormComponentType;
namespace AwtVisualEffect = css::awt::VisualEffect;
@@ -1092,6 +1095,100 @@ void XclExpTbxControlObj::setShapeId(sal_Int32 aShapeId)
mnShapeId = aShapeId;
}
+namespace
+{
+/// Handles the VML export of form controls (e.g. checkboxes).
+class VmlFormControlExporter : public oox::vml::VMLExport
+{
+sal_uInt16 m_nObjType;
+tools::Rectangle m_aAreaFrom;
+tools::Rectangle m_aAreaTo;
+OUString m_aLabel;
+
+public:
+VmlFormControlExporter(const sax_fastparser::FSHelperPtr& p, sal_uInt16
nObjType,
+ const tools::Rectangle& rAreaFrom, const
tools::Rectangle& rAreaTo,
+ const OUString& rLabel);
+
+protected:
+using VMLExport::StartShape;
+sal_Int32 StartShape() override;
+using VMLExport::EndShape;
+void EndShape(sal_Int32 nShapeElement) override;
+};
+
+VmlFormControlExporter::VmlFormControlExporter(const
sax_fastparser::FSHelperPtr& p,
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/textboxhelper.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 0025e80ba6d882f6f885499efaf37ab0e2ed699d
Author: Miklos Vajna
AuthorDate: Wed Jul 7 20:23:44 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu Jul 8 08:37:32 2021 +0200
sw: use SfxPoolItem::StaticWhichCast() in SwTextBoxHelper
case RES_VERT_ORIENT + pItem->StaticWhichCast(RES_VERT_ORIENT)
is more likely to match than
case RES_VERT_ORIENT + static_cast(*pItem)
Change-Id: If6ce65ae26b1088acb41b390a4fc8c1a69c141bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118590
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index a47d1d251164..f372c21fb16b 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -921,8 +921,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat&
rShape, SfxItemSet const&
syncProperty(&rShape, RES_ANCHOR, MID_ANCHOR_ANCHORTYPE,
uno::Any(aNewAnchorType));
if (bInlineAnchored)
return;
-auto& rOrient = static_cast(*pItem);
-SwFormatVertOrient aOrient(rOrient);
+SwFormatVertOrient
aOrient(pItem->StaticWhichCast(RES_VERT_ORIENT));
tools::Rectangle aRect = getTextRectangle(&rShape,
/*bAbsolute=*/false);
if (!aRect.IsEmpty())
@@ -948,10 +947,9 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat&
rShape, SfxItemSet const&
const text::TextContentAnchorType aNewAnchorType
= mapAnchorType(rShape.GetAnchor().GetAnchorId());
syncProperty(&rShape, RES_ANCHOR, MID_ANCHOR_ANCHORTYPE,
uno::Any(aNewAnchorType));
-auto& rOrient = static_cast(*pItem);
if (bInlineAnchored)
return;
-SwFormatHoriOrient aOrient(rOrient);
+SwFormatHoriOrient
aOrient(pItem->StaticWhichCast(RES_HORI_ORIENT));
tools::Rectangle aRect = getTextRectangle(&rShape,
/*bAbsolute=*/false);
if (!aRect.IsEmpty())
@@ -993,8 +991,7 @@ void SwTextBoxHelper::syncFlyFrameAttr(SwFrameFormat&
rShape, SfxItemSet const&
break;
case RES_ANCHOR:
{
-auto& rAnchor = static_cast(*pItem);
-if (rAnchor == rShape.GetAnchor())
+if (pItem->StaticWhichCast(RES_ANCHOR) == rShape.GetAnchor())
// the anchor have to be synced
{
const text::TextContentAnchorType aNewAnchorType
___
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' - officecfg/registry sfx2/sdi
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 --- sfx2/sdi/appslots.sdi|4 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 4d95672531225a436f4b7b0ba94ba9974e7949b4 Author: Heiko Tietze AuthorDate: Mon Jul 5 08:31:22 2021 +0200 Commit: Heiko Tietze CommitDate: Thu Jul 8 08:35:10 2021 +0200 Resolves tdf#143174 - UNO MoreDictionaries not working Missing exec method added Change-Id: I2272654ae6ed9d9525c98392a9f65a74a108af02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118412 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index e20e08b7f707..eb8d07581cca 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -7045,9 +7045,6 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 More Dictionaries Online... - - 1 - diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index af5e394f3fb2..7e7ca24495d3 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -321,6 +321,10 @@ shell SfxApplication [ ExecMethod = OfaExec_Impl ; ] +SID_MORE_DICTIONARIES +[ +ExecMethod = OfaExec_Impl ; +] } shell SfxModule ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx |3 ++-
svx/source/tbxctrls/tbcontrl.cxx|9 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 396ceb05ef2bb75ba5c81b83f443863c485fa0b9
Author: Thorsten Wagner
AuthorDate: Mon Jun 28 23:40:12 2021 +0200
Commit: Heiko Tietze
CommitDate: Thu Jul 8 08:34:05 2021 +0200
tdf#125533 Update Calc style names for style sidebar dropdown
Style names for Calc are updated to current style names. As
default styles shown by sidebar dropdown are hardcoded, styles
Accent 1, Accent 2, and Accent 3 were added to offer a few
more options.
Change-Id: I0e4b00f7e8a64e1ded077c559ed208fe71d784ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118038
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
index 47995067ae03..8a96feeb43c9 100644
--- a/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
+++ b/svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx
@@ -91,7 +91,8 @@ void StylesPreviewToolBoxControl::InitializeStyles(
}
else if
(xServices->supportsService("com.sun.star.sheet.SpreadsheetDocument"))
{
-static const char* aCalcStyles[] = { "Default", "Heading1",
"Result", "Result2" };
+static const char* aCalcStyles[] = { "Default", "Accent 1",
"Accent 2", "Accent 3",
+ "Heading 1", "Heading 2",
"Result" };
css::uno::Reference xCellStyles;
xStylesSupplier->getStyleFamilies()->getByName("CellStyles") >>=
xCellStyles;
for (const char* pCalcStyle : aCalcStyles)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 1add34406833..7495876f2563 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2595,9 +2595,12 @@ struct SvxStyleToolBoxControl::Impl
static const char* aCalcStyles[] =
{
"Default",
-"Heading1",
-"Result",
-"Result2"
+"Accent 1",
+"Accent 2",
+"Accent 3",
+"Heading 1",
+"Heading 2",
+"Result"
};
Reference xCellStyles;
xStylesSupplier->getStyleFamilies()->getByName("CellStyles")
>>= xCellStyles;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/CppunitTest_jvmfwk_sunversion.mk jvmfwk/Module_jvmfwk.mk jvmfwk/plugins jvmfwk/qa solenv/clang-format
jvmfwk/CppunitTest_jvmfwk_sunversion.mk | 40 +++
jvmfwk/Module_jvmfwk.mk |4
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 110 ---
jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx |2
jvmfwk/qa/unit/sunversion.cxx| 128 +++
solenv/clang-format/excludelist |1
6 files changed, 173 insertions(+), 112 deletions(-)
New commits:
commit 395ecf1ed3040b4eac6b1fc8d6b96ca426657321
Author: Stephan Bergmann
AuthorDate: Wed Jul 7 16:00:12 2021 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 8 08:05:26 2021 +0200
Turn OSL_DEBUG_LEVEL >= 2 SelfTest into CppunitTest
...and move "10.0", "10.10", and "1.5.0_010" from badVersions[] to good
versions[] to make the test succeed (assuming these shall indeed be
classified
as good by now, presumably due to changes to the SunVersion implementation
in
the meantime)
Change-Id: Ia7cf9b0e607743a5e0534078c0221c1423f6cfb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118570
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/jvmfwk/CppunitTest_jvmfwk_sunversion.mk
b/jvmfwk/CppunitTest_jvmfwk_sunversion.mk
new file mode 100644
index ..8aa6a2c68ea2
--- /dev/null
+++ b/jvmfwk/CppunitTest_jvmfwk_sunversion.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column:
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,jvmfwk_sunversion))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,jvmfwk_sunversion, \
+jvmfwk/qa/unit/sunversion \
+))
+
+$(eval $(call gb_CppunitTest_set_include,jvmfwk_sunversion, \
+$$(INCLUDE) \
+-I$(SRCDIR) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,jvmfwk_sunversion, \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,jvmfwk_sunversion, \
+sal \
+salhelper \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,jvmfwk_sunversion, \
+jvmfwk \
+))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_CppunitTest_use_system_darwin_frameworks,jvmfwk_sunversion, \
+Foundation \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 396ed21de8d9..802daed57005 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -28,6 +28,10 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
endif
endif
+$(eval $(call gb_Module_add_check_targets,jvmfwk, \
+CppunitTest_jvmfwk_sunversion \
+))
+
endif
# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index ded1fc5f45f5..49157f033616 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -22,21 +22,9 @@
#include
#include
#include
-#if OSL_DEBUG_LEVEL >= 2
-#include
-#include "diagnostics.h"
-#endif
namespace jfw_plugin { //stoc_javadetect
-#if OSL_DEBUG_LEVEL >= 2
-class SelfTest
-{
-public:
-SelfTest();
-} test;
-#endif
-
SunVersion::SunVersion(std::u16string_view usVer):
m_nUpdateSpecial(0), m_preRelease(Rel_NONE)
{
@@ -314,104 +302,6 @@ bool SunVersion::operator == (const SunVersion& ver) const
return bRet;
}
-
-#if OSL_DEBUG_LEVEL >= 2
-SelfTest::SelfTest()
-{
-bool bRet = true;
-
-static char const * versions[] = {"1.4.0", "1.4.1", "1.0.0", "10.0.0",
"10.10.0",
- "10.2.2", "10.10.0", "10.10.10", "111.0.999",
- "1.4.1_01", "9.90.99_09", "1.4.1_99",
- "1.4.1_00a",
- "1.4.1-ea", "1.4.1-beta", "1.4.1-rc1",
- "1.5.0_01-ea", "1.5.0_01-rc2"};
-static char const * badVersions[] = {".4.0", "..1", "", "10.0",
"10.10.0.", "10.10.0-", "10.10.0.",
-"10.2-2", "10_10.0", "10..10","10.10", "a.0.999",
-"1.4b.1_01", "9.90.-99_09", "1.4.1_99-",
-"1.4.1_00a2", "1.4.0_z01z", "1.4.1__99A",
-"1.4.1-1ea", "1.5.0_010", "1.5.0._01-",
"1.5.0_01-eac"};
-static char const * orderedVer[] = { "1.3.1-ea", "1.3.1-beta", "1.3.1-rc1",
-"1.3.1", "1.3.1_00a", "1.3.1_01", "1.3.1_01a",
-"1.3.2", "1.4.0", "1.5.0_01-ea", "2.0.0"};
-
-int num = SAL_N_ELEMENTS (versions);
-int numBad = SAL_N_ELEMENTS (badVersions);
-int numOrdered = SAL_N_ELEMENTS (orderedVer);
-//parsing test (positive)
-for (int i = 0; i < num; i++)
-{
-SunVersion ver(versions[i]);
-if ( ! ver)
-{
-bRet = false;
-b
[Libreoffice-commits] core.git: nlpsolver/ThirdParty
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
| 13 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
|3 ++
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
|3 +-
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
|1
4 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 822f128e734f37ee4de9bf5b62640cbec140701e
Author: Todor Balabanov
AuthorDate: Wed Jul 7 16:01:19 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Thu Jul 8 03:49:56 2021 +0200
Polymorphism is a better approach when there are chains of inheritance.
Change-Id: I2580dafcf8792bf4b11db78988db8c2976e4545c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118569
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
index 58250089b02f..88aa56eff837 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java
@@ -66,7 +66,7 @@ public class DEPSAgent implements ILibEngine {
// the own memory: store the personal best point
private SearchPoint pbest_t;
- // Generate-and-test Behaviors
+ // Generate-and-test behaviors.
private DEGTBehavior deGTBehavior;
private PSGTBehavior psGTBehavior;
public double switchP = 0.5;
@@ -100,16 +100,7 @@ public class DEPSAgent implements ILibEngine {
}
public void setGTBehavior(AbsGTBehavior gtBehavior) {
-if (gtBehavior instanceof DEGTBehavior) {
- deGTBehavior = ((DEGTBehavior) gtBehavior);
- deGTBehavior.setPbest(pbest_t);
- return;
-}
-if (gtBehavior instanceof PSGTBehavior) {
- psGTBehavior = ((PSGTBehavior) gtBehavior);
- psGTBehavior.setMemPoints(pbest_t, pcurrent_t, pold_t);
- return;
-}
+gtBehavior.setMemPoints(pbest_t, pcurrent_t, pold_t);
}
public void generatePoint() {
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
index b811572ada82..c96174227b93 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java
@@ -21,6 +21,7 @@ import net.adaptivebox.goodness.IGoodnessCompareEngine;
import net.adaptivebox.knowledge.Library;
import net.adaptivebox.knowledge.SearchPoint;
import net.adaptivebox.problem.ProblemEncoder;
+import net.adaptivebox.space.BasicPoint;
abstract public class AbsGTBehavior {
// The referred social library
@@ -30,6 +31,8 @@ abstract public class AbsGTBehavior {
socialLib = lib;
}
+ abstract public void setMemPoints(SearchPoint pbest, BasicPoint pcurrent,
BasicPoint pold);
+
abstract public void generateBehavior(SearchPoint trailPoint, ProblemEncoder
problemEncoder);
abstract public void testBehavior(SearchPoint trailPoint,
IGoodnessCompareEngine qualityComparator);
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
index df7ff571065d..ada457f3233c 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java
@@ -52,7 +52,8 @@ public class DEGTBehavior extends AbsGTBehavior implements
ILibEngine {
// the own memory: store the point that generated in last learning cycle
private SearchPoint pbest_t;
- public void setPbest(SearchPoint pbest) {
+ @Override
+ public void setMemPoints(SearchPoint pbest, BasicPoint pcurrent, BasicPoint
pold) {
pbest_t = pbest;
}
diff --git
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
index 3c7523209138..eb35a1ad4e9a 100644
---
a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
+++
b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java
@@ -85,6 +85,7 @@ public class PSGTBehavior extends AbsGTBehavior {
// the own memory: store the personal best point
private SearchPoint pbest_t;
+ @Override
public void setMemPoints(SearchPoint pbest, BasicPoint pcurrent, BasicPoint
pold) {
pcurrent_t = pcurrent;
pbest_t = pbest;
[Libreoffice-commits] core.git: include/svl svl/source
include/svl/nfkeytab.hxx|2
include/svl/zforlist.hxx|4 -
include/svl/zformat.hxx |3 -
svl/source/numbers/zforlist.cxx | 104
svl/source/numbers/zformat.cxx |6 +-
svl/source/numbers/zforscan.cxx | 13 +++--
svl/source/numbers/zforscan.hxx |2
7 files changed, 105 insertions(+), 29 deletions(-)
New commits:
commit 7a58221f800e215934cbcb2d3907c35b44981611
Author: Eike Rathke
AuthorDate: Wed Jul 7 20:50:28 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 8 00:14:08 2021 +0200
Resolves: tdf#122191 BOOLEAN is a keyword, treat it as such
... to not end up with "BOOL"E"AN" instead, which is a date type
with an era year and literal strings.
This never worked but only was uncovered by
commit ce4fc2fc08be8ea2773194e303ed42d2579e93a0
CommitDate: Fri Mar 2 20:27:45 2018 +0100
Resolves: tdf#115351 convert boolean equivalent format codes to
proper Boolean
if the format also had to be converted between locales.
Also preserve boolean equivalent formats during Excel export and
try hard to convert back as much as possible if a literal boolean
string format is a Boolean equivalent of the target locale.
Change-Id: I54f65c276cbf7bb99e960b6d7053c5fa95fbccb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118591
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index fe1e3bb69ec5..3b8140498128 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -71,13 +71,13 @@ enum NfKeywordIndex
NF_KEY_WW, // week of year, as of version 8, 19.06.98
NF_KEY_THAI_T, // Thai T modifier, speciality of Thai Excel, only
used with Thai locale and converted to [NatNum1]
NF_KEY_CCC, // currency bank symbol (old version)
+NF_KEY_BOOLEAN, // boolean
NF_KEY_GENERAL, // General / Standard
NF_KEY_LASTKEYWORD = NF_KEY_GENERAL,
// Reserved words translated and color names follow:
NF_KEY_TRUE,// boolean true
NF_KEY_FALSE, // boolean false
-NF_KEY_BOOLEAN, // boolean
NF_KEY_COLOR, // color
NF_KEY_FIRSTCOLOR,
NF_KEY_BLACK = NF_KEY_FIRSTCOLOR, // you do know colors, don't you?
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 7a8703873460..c3d82d7b109a 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -473,7 +473,7 @@ public:
nKey contains the index key of the format.
*/
bool PutEntry( OUString& rString, sal_Int32& nCheckPos, SvNumFormatType&
nType, sal_uInt32& nKey,
- LanguageType eLnge = LANGUAGE_DONTKNOW );
+ LanguageType eLnge = LANGUAGE_DONTKNOW, bool
bReplaceBooleanEquivalent = true );
/** Same as PutEntry but the format code string is
considered to be of language/country eLnge and is converted to
@@ -481,7 +481,7 @@ public:
bool PutandConvertEntry( OUString& rString, sal_Int32& nCheckPos,
SvNumFormatType& nType, sal_uInt32& nKey,
LanguageType eLnge, LanguageType eNewLnge,
- bool bConvertDateOrder );
+ bool bConvertDateOrder, bool
bReplaceBooleanEquivalent = true );
/** Same as PutandConvertEntry but the format code string
is considered to be of the System language/country eLnge and is
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 543c5967804c..976488257218 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -171,7 +171,8 @@ public:
ImpSvNumberformatScan* pSc,
ImpSvNumberInputScan* pISc,
sal_Int32& nCheckPos,
- LanguageType& eLan );
+ LanguageType& eLan,
+ bool bReplaceBooleanEquivalent = true );
// Copy ctor
SvNumberformat( SvNumberformat const & rFormat );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index b1885ad4a94a..0a2f699f81ec 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -569,7 +569,8 @@ bool SvNumberFormatter::PutEntry(OUString& rString,
sal_Int32& nCheckPos,
SvNumFormatType& nType,
sal_uInt32& nKey, // format key
- LanguageType eLnge)
+ LanguageType eLnge,
+ bool bReplaceBooleanEquivalent)
{
::osl::MutexGuard aGuard( GetInstanceMutex() );
nKey = 0;
@@ -589,7 +590,8 @@ bool SvNumberFormatter::PutEntry(OUString& rString,
pFormatScanner.get(),
Gsoc week 3,4 summary : Integrating .ui dialogs with strings
Hallooo This 2 weeks is full of final exams so i decreased the flow a little * output the mapping in the form of Json to be processed with other tools/scripts later . * fixed the paths to relative paths * started the script of querying the unit id of each screenshot * started the POST script of posting the screenshot. What will i do till the evaluation : *finish the scripts and posting them to gerrit to be reviewed *generating the summary file that contain screenshot name ,screenshot id ,associated unit id and location - context pair. wish me luck in the exams , and i wish luck to all my peers in the exams and gsoc too . Thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svl/source sw/source
svl/source/items/imageitm.cxx |2 +-
sw/source/uibase/config/usrpref.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 227eb3987511e8cba0fb2a16edb99e46ecae0379
Author: dante
AuthorDate: Tue Dec 29 19:58:04 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 22:12:49 2021 +0200
Remove warning while building
Operator >>= from any does not guarantee initialization, so compiler warns
you.
Value defaluted at 0.
Change-Id: Icecc765be73bb653f0167958e319a1417df6ac86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108485
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit edc7a8a372a689802a583092ff0da0f60b6dbf97)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118584
Reviewed-by: Caolán McNamara
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 7a2d528c1fce..2c2a88600cc9 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -72,7 +72,7 @@ bool SfxImageItem::PutValue( const css::uno::Any& rVal,
sal_uInt8 )
sal_Int16 nVal = sal_Int16();
if ( aSeq[0] >>= nVal )
SetValue( nVal );
-sal_Int16 nTmp;
+sal_Int16 nTmp = 0;
aSeq[1] >>= nTmp;
mnAngle = Degree10(nTmp);
aSeq[2] >>= mbMirrored;
diff --git a/sw/source/uibase/config/usrpref.cxx
b/sw/source/uibase/config/usrpref.cxx
index 615098813db2..a896acb30c90 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -233,7 +233,7 @@ void SwContentViewConfig::Load()
case 23: m_rParent.SetShowChangesInMargin(bSet); break;//
"Display/ShowChangesInMargin"
case 24:
{
-sal_Int32 nSet;
+sal_Int32 nSet = 0;
pValues[nProp] >>= nSet;
m_rParent.SetDefaultAnchor(nSet);
}
___
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/ActionMapTypesOASIS.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ad9c861e6fea4e4174c31736b9d70a4aeda2510c
Author: Caolán McNamara
AuthorDate: Wed Jul 7 17:33:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 22:12:19 2021 +0200
WaE: Wodr type 'ActionMapTypesOOo' violates the C++ ODR
Change-Id: If0b83e62e6c9905b1ae391fbed7c43b379dce5db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118505
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx
b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 1be989b340df..eb9753ab4e9d 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -19,7 +19,7 @@
#pragma once
-enum ActionMapTypesOOo
+enum ActionMapTypesOasis
{
PROP_OASIS_GRAPHIC_ATTR_ACTIONS,
PROP_OASIS_DRAWING_PAGE_ATTR_ACTIONS,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit e30d71fe58a2c06143c65a34b1de8dff45054550
Author: Caolán McNamara
AuthorDate: Wed Jul 7 17:35:52 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 22:12:12 2021 +0200
gtk4: GtkMenuButton might have no GtkPopoverMenu
Change-Id: Icfc2f0c39fc223c94c1a3f038a4c186349be4fa5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118587
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 05bbdb1eb30c..741d7c29470a 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4998,7 +4998,7 @@ public:
{
clear_actions();
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
process_menu_model(pMenuModel);
}
@@ -5061,7 +5061,7 @@ public:
#else
(void)pIconName; (void)pImageSurface;
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
auto aSectionAndPos = get_section_and_pos_for(pMenuModel, pos);
GMenu* pMenu = G_MENU(aSectionAndPos.first);
@@ -5093,7 +5093,7 @@ public:
if (pos != -1)
gtk_menu_reorder_child(m_pMenu, pItem, pos);
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
auto aSectionAndPos = get_section_and_pos_for(pMenuModel, pos);
@@ -5132,7 +5132,7 @@ public:
remove_from_map(pMenuItem);
gtk_widget_destroy(GTK_WIDGET(pMenuItem));
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
std::pair aRes = find_id(pMenuModel, rIdent);
if (!aRes.first)
@@ -5198,7 +5198,7 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_menu_item_set_label(m_aMap[rIdent],
MapToGtkAccelerator(rText).getStr());
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
std::pair aRes = find_id(pMenuModel, rIdent);
if (!aRes.first)
@@ -5220,7 +5220,7 @@ public:
const gchar* pText =
gtk_menu_item_get_label(m_aMap.find(rIdent)->second);
return OUString(pText, pText ? strlen(pText) : 0,
RTL_TEXTENCODING_UTF8);
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
std::pair aRes = find_id(pMenuModel, rIdent);
if (!aRes.first)
@@ -5279,7 +5279,7 @@ public:
return id;
#else
OString sTarget;
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
auto aSectionAndPos = get_section_and_pos_for(pMenuModel, pos);
char *id;
@@ -5301,7 +5301,7 @@ public:
g_list_free(pChildren);
return nLen;
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
return count_immediate_children(pMenuModel);
return 0;
#endif
@@ -5318,7 +5318,7 @@ public:
}
m_aMap.clear();
#else
-if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+if (GMenuModel* pMenuModel = m_pMenu ?
gtk_popover_menu_get_menu_model(m_pMenu) : nullptr)
{
GMenu* pMenu = G_MENU(pMenuModel);
g_menu_remove_all(pMenu);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source xmloff/source
sw/source/filter/ww8/docxattributeoutput.cxx|5 +++--
xmloff/source/transform/ActionMapTypesOASIS.hxx |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit f62d2de95c3553e0615d3485645bf5061b97d520
Author: Caolán McNamara
AuthorDate: Wed Jul 7 17:33:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 22:11:59 2021 +0200
WaE: Wodr type 'ActionMapTypesOOo' violates the C++ ODR
Change-Id: If0b83e62e6c9905b1ae391fbed7c43b379dce5db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118586
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/xmloff/source/transform/ActionMapTypesOASIS.hxx
b/xmloff/source/transform/ActionMapTypesOASIS.hxx
index 1be989b340df..eb9753ab4e9d 100644
--- a/xmloff/source/transform/ActionMapTypesOASIS.hxx
+++ b/xmloff/source/transform/ActionMapTypesOASIS.hxx
@@ -19,7 +19,7 @@
#pragma once
-enum ActionMapTypesOOo
+enum ActionMapTypesOasis
{
PROP_OASIS_GRAPHIC_ATTR_ACTIONS,
PROP_OASIS_DRAWING_PAGE_ATTR_ACTIONS,
commit ed2d309b5ccdaa1a58f37f70a00ad74452e163cd
Author: Caolán McNamara
AuthorDate: Wed Jul 7 17:12:50 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 22:11:44 2021 +0200
make code a little clearer to indicate that pAnchor isn't leaked
Change-Id: I656a8c8506d7905ece3ff1b0547c82c42b234ab6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118585
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bbf4994a1d05..f5978957635c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6450,7 +6450,8 @@ void
DocxAttributeOutput::WriteTextBox(uno::Reference xShape)
SwFrameFormat* pTextBox = SwTextBoxHelper::getOtherTextBoxFormat(xShape);
assert(pTextBox);
const SwPosition* pAnchor = nullptr;
-if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE)
//tdf135711
+const bool bFlyAtPage = pTextBox->GetAnchor().GetAnchorId() ==
RndStdIds::FLY_AT_PAGE;
+if (bFlyAtPage) //tdf135711
{
auto pNdIdx = pTextBox->GetContent().GetContentIdx();
if (pNdIdx) //Is that possible it is null?
@@ -6465,7 +6466,7 @@ void
DocxAttributeOutput::WriteTextBox(uno::Reference xShape)
{
ww8::Frame aFrame(*pTextBox, *pAnchor);
m_rExport.SdrExporter().writeDMLTextFrame(&aFrame, m_anchorId++,
/*bTextBoxOnly=*/true);
-if (pTextBox->GetAnchor().GetAnchorId() == RndStdIds::FLY_AT_PAGE)
+if (bFlyAtPage)
{
delete pAnchor;
}
___
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' - cui/source
cui/source/tabpages/numpages.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit ec29cffe003f987a4d329b9467efb30bde39c66b
Author: Andreas Heinisch
AuthorDate: Thu Jul 1 11:59:35 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 7 22:01:02 2021 +0200
tdf#114070 - Only show the last name of the filename without its extension
In the bullets and numbering dialog, don't show the filename including
its extension in the tooltip of the image.
Change-Id: I2a37f79e8c57d3126e6607f01756771857440faa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118215
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
(cherry picked from commit 226f7e2ab96fce33a2705ad91ef0d539a6bad7b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118415
Reviewed-by: Xisco Fauli
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a0d360622d0b..47542d147853 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -746,8 +746,12 @@
SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC
m_xExamplesVS->InsertItem( i + 1, i);
INetURLObject aObj(grfName);
-if(aObj.GetProtocol() == INetProtocol::File)
-grfName = aObj.PathToFileName();
+if (aObj.GetProtocol() == INetProtocol::File)
+{
+// tdf#114070 - only show the last name of the filename without
its extension
+aObj.removeExtension();
+grfName =
aObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous);
+}
m_xExamplesVS->SetItemText( i + 1, grfName );
++i;
@@ -981,8 +985,12 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage,
ClickAddBrowseHdl_Impl, weld::Button&, voi
{
m_xExamplesVS->InsertItem( i + 1, i);
INetURLObject aObj(grfName);
-if(aObj.GetProtocol() == INetProtocol::File)
-grfName = aObj.PathToFileName();
+if (aObj.GetProtocol() == INetProtocol::File)
+{
+// tdf#114070 - only show the last name of the filename without
its extension
+aObj.removeExtension();
+grfName =
aObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous);
+}
m_xExamplesVS->SetItemText( i + 1, grfName );
++i;
}
___
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' - drawinglayer/source emfio/qa
drawinglayer/source/tools/emfphelperdata.cxx| 44 ++--
emfio/qa/cppunit/emf/EmfImportTest.cxx | 34 +
emfio/qa/cppunit/emf/data/TestDrawImagePointsTypeBitmap.emf |binary
3 files changed, 73 insertions(+), 5 deletions(-)
New commits:
commit 032b00382f654962ec787029b3a887f9efbd2a3d
Author: Bartosz Kosiorek
AuthorDate: Tue Jun 22 14:36:15 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 7 22:00:24 2021 +0200
EMF+ tdf#142941 Fixes for SrcRect in DrawImagePoints
The SrcRect could be specified outside of source bitmap.
In such cases the Destination bitmap should be displayed as shifted
(eg. if position is negative), and scaled properly.
Change-Id: Ied6d339703999faaae061802ef6a28e190d5a176
Change-Id: Ia9772ced282684c2c94a261d97d30b53921d6171
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118345
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit 4992780d2bc996c111b333549314d72f6891308d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118304
Reviewed-by: Xisco Fauli
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 23ceb6487d66..7a2007da07ba 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1443,7 +1443,8 @@ namespace emfplushelper
EMFPImage& image = *static_cast(maEMFPObjects[flags & 0xff].get());
float sx, sy, sw, sh;
ReadRectangle(rMS, sx, sy, sw, sh);
-::tools::Rectangle aSource(Point(sx, sy), Size(sw,
sh));
+
+::tools::Rectangle aSource(Point(sx, sy), Size(sw
+ 1, sh + 1));
SAL_INFO("drawinglayer.emf", "EMF+\t " << (type ==
EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage") << " source
rectangle: " << sx << "," << sy << " " << sw << "x" << sh);
::basegfx::B2DPoint aDstPoint;
::basegfx::B2DSize aDstSize;
@@ -1464,10 +1465,43 @@ namespace emfplushelper
ReadPoint(rMS, x2, y2, flags); //
upper-right
ReadPoint(rMS, x3, y3, flags); //
lower-left
-SAL_INFO("drawinglayer.emf", "EMF+\t
destination points: P1:" << x1 << "," << y1 << " P2:" << x2 << "," << y2 << "
P3:" << x3 << "," << y3);
-
-aDstPoint = ::basegfx::B2DPoint(x1, y1);
-aDstSize = ::basegfx::B2DSize(x2 - x1, y3
- y1);
+SAL_INFO("drawinglayer.emf",
+ "EMF+\t destination points: " <<
x1 << "," << y1 << " "
+ <<
x2 << "," << y2 << " "
+ <<
x3 << "," << y3);
+float xDstShift = x1;
+float yDstShift = y2;
+float xDstSize = x2 - x1;
+float yDstSize = y3 - y1;
+if (image.type == ImageDataTypeBitmap)
+{
+const Size
aSize(image.graphic.GetBitmapEx().GetSizePixel());
+if (sx < 0)
+{
+// If src position is negative
then we need shift image to right
+xDstShift = xDstShift + ((-sx) /
sw) * (x2 - x1);
+if (sx + sw <= aSize.Width())
+xDstSize = ((sw + sx) / sw) *
xDstSize;
+else
+xDstSize = (aSize.Width() /
sw) * xDstSize;
+}
+else if (sx + sw > aSize.Width())
+// If the src image is smaller
that what we want to cut, then we need to scale down
+xDstSize = ((aSize.Width() - sx) /
sw) * xDstSize;
+
+if (sy < 0)
+{
+yDstShift = yDstShift + ((-sy) /
sh) * (y3 - y1);
+if (sy + sh <= aSize.Height())
+yDstSize = ((sh + sy) / sh) *
yDstSize;
+else
+yDstSize = (a
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - basic/qa basic/source
basic/qa/vba_tests/roundcompatibility.vb | 29 +
basic/source/runtime/methods1.cxx| 23 ++-
2 files changed, 31 insertions(+), 21 deletions(-)
New commits:
commit 70e86db58bd04d919b3f67efad6c94dc967fd900
Author: baltasarq
AuthorDate: Mon Jul 5 17:17:54 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 7 21:59:24 2021 +0200
tdf#142922 fixes Round to follow half-to-even rounding
The LibreOffice's Basic Round function does not return values
that are compatible with VBA's Round. This can be easily fixed
using rtl/round, which has a flag parameter called
rtl_math_RoundingMode_HalfEven which rounds real numbers
exactly in the expected way.
Change-Id: I2215f08427e5777fc2d35f054b635dfa6247af8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118444
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 0eacbfa75132724faaeeb9ea22a1c3e44eefb515)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118493
Reviewed-by: Xisco Fauli
diff --git a/basic/qa/vba_tests/roundcompatibility.vb
b/basic/qa/vba_tests/roundcompatibility.vb
new file mode 100644
index ..aaa078925d3b
--- /dev/null
+++ b/basic/qa/vba_tests/roundcompatibility.vb
@@ -0,0 +1,29 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Option VBASupport 1
+Option Explicit
+
+Function doUnitTest() As String
+TestUtil.TestInit
+verify_roundCompatibility
+doUnitTest = TestUtil.GetResult()
+End Function
+
+Sub verify_roundCompatibility()
+On Error GoTo errorHandler
+
+TestUtil.AssertEqual(Round(0.12335,4), 0.1234, "Round(0.12335,4)")
+TestUtil.AssertEqual(Round(0.12345,4), 0.1234, "Round(0.12345,4)")
+TestUtil.AssertEqual(Round(0.12355,4), 0.1236, "Round(0.12355,4)")
+TestUtil.AssertEqual(Round(0.12365,4), 0.1236, "Round(0.12365,4)")
+
+Exit Sub
+errorHandler:
+TestUtil.ReportErrorHandler("verify_roundCompatibility", Err, Error$, Erl)
+End Sub
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 9addf7140adf..b20b3fce3775 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2388,13 +2389,6 @@ void SbRtl_Round(StarBASIC *, SbxArray & rPar, bool)
double dRes = 0.0;
if( dVal != 0.0 )
{
-bool bNeg = false;
-if( dVal < 0.0 )
-{
-bNeg = true;
-dVal = -dVal;
-}
-
sal_Int16 numdecimalplaces = 0;
if( nParCount == 3 )
{
@@ -2406,20 +2400,7 @@ void SbRtl_Round(StarBASIC *, SbxArray & rPar, bool)
}
}
-if( numdecimalplaces == 0 )
-{
-dRes = floor( dVal + 0.5 );
-}
-else
-{
-double dFactor = pow( 10.0, numdecimalplaces );
-dVal *= dFactor;
-dRes = floor( dVal + 0.5 );
-dRes /= dFactor;
-}
-
-if( bNeg )
-dRes = -dRes;
+dRes = rtl_math_round(dVal, numdecimalplaces,
rtl_math_RoundingMode_HalfEven);
}
rPar.Get(0)->PutDouble(dRes);
}
___
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' - 2 commits - i18npool/source sfx2/source
i18npool/source/localedata/data/en_US.xml |4 ++-- sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |6 ++ 2 files changed, 8 insertions(+), 2 deletions(-) New commits: commit b2d93a34ce83e9442ba12c4f11586c9a02e63119 Author: Heiko Tietze AuthorDate: Mon Jul 5 14:26:22 2021 +0200 Commit: Xisco Fauli CommitDate: Wed Jul 7 21:59:13 2021 +0200 Resolves tdf#137160 - Thin space before f./ff. in en_US Change-Id: I3a2f2206d9784de2da6af8ea2b882e1ebe6205e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118439 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 06e48b4beb0f898483211c77adbb2e83d8908cee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118426 Reviewed-by: Xisco Fauli diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml index a96750aab17d..9e852f743125 100644 --- a/i18npool/source/localedata/data/en_US.xml +++ b/i18npool/source/localedata/data/en_US.xml @@ -258,8 +258,8 @@ A-Z 0 1 -f. -ff. + f. + ff. commit 419e70876f19787e0bf1cf99178fc2e00fc4dcc6 Author: Gizem Ozgun AuthorDate: Mon Jun 28 23:55:42 2021 +0300 Commit: Xisco Fauli CommitDate: Wed Jul 7 21:59:01 2021 +0200 tdf#142459 Fixed long class names are truncated(gen) Change-Id: I9c88beb3fc83c23b2e866824985d50567b056f7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118035 Tested-by: Jenkins Reviewed-by: Gülşah Köse (cherry picked from commit 1c8483d2174bc6419829dface97627a4304c8912) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118430 Reviewed-by: Xisco Fauli diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index d7d4895e5d6b..362907e92a4b 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -1322,6 +1322,12 @@ void ObjectInspectorTreeHandler::inspectObject(uno::Reference c // Set implementation name OUString aImplementationName = getInterfaceImplementationClass(xInterface); mpObjectInspectorWidgets->mpClassNameLabel->set_label(aImplementationName); +sal_Int32 nStrLen = aImplementationName.getLength(); +sal_Int32 nDigitWidth += mpObjectInspectorWidgets->mpClassNameLabel->get_approximate_digit_width(); + +//get_about_digit_width() returns an approximate value. To always see the full class name (nStrLen+2) +mpObjectInspectorWidgets->mpClassNameLabel->set_size_request((nStrLen + 2) * nDigitWidth, -1); // Fire entering the current opened page manually auto rPageId = mpObjectInspectorWidgets->mpNotebook->get_current_page_ident(); ___ 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' - 2 commits - cui/source sc/qa sc/source
cui/source/tabpages/numpages.cxx |8 ++--
sc/qa/unit/data/ods/tdf142764.ods|binary
sc/qa/unit/subsequent_export-test2.cxx | 19 +++
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 12 +---
4 files changed, 34 insertions(+), 5 deletions(-)
New commits:
commit 2de1b879b70535a6c1e7207b4be9271a54e2dfc9
Author: Daniel Arato (NISZ)
AuthorDate: Thu Jun 24 15:01:54 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 7 21:58:25 2021 +0200
tdf#142764 sc: import "Same content on first/left page"
Different header of the first page was never imported
(related to the missing UI support), despite its working
ODF export.
This commit sets the values of those options at ODS file load
according to the "display" attribute used to hide or show
a particular header/footer.
Follow-up to commit 19fa853ce12136b5c14e0c5a0aa906c296b75388
"tdf#121715 XLSX: support custom first page header/footer".
Change-Id: I3409ad94a4d3ff86fd7f6d8afede3e7603024515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117788
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 52beb3907dd3c7e6ae112e263def1005272cecd8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118501
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf142764.ods
b/sc/qa/unit/data/ods/tdf142764.ods
new file mode 100644
index ..bbc4355dab32
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf142764.ods differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx
b/sc/qa/unit/subsequent_export-test2.cxx
index 1c088c813f21..47a50a3d8ee6 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -142,6 +142,7 @@ public:
void testPivotCacheAfterExportXLSX();
void testTdf114969XLSX();
void testTdf115192XLSX();
+void testTdf142764();
void testTdf91634XLSX();
void testTdf115159();
void testTdf112567();
@@ -237,6 +238,7 @@ public:
CPPUNIT_TEST(testPivotCacheAfterExportXLSX);
CPPUNIT_TEST(testTdf114969XLSX);
CPPUNIT_TEST(testTdf115192XLSX);
+CPPUNIT_TEST(testTdf142764);
CPPUNIT_TEST(testTdf91634XLSX);
CPPUNIT_TEST(testTdf115159);
CPPUNIT_TEST(testTdf112567);
@@ -1211,6 +1213,23 @@ void ScExportTest2::testTdf115192XLSX()
xDocSh->DoClose();
}
+void ScExportTest2::testTdf142764()
+{
+ScDocShellRef xShell = loadDoc(u"tdf142764.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell);
+
+auto pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+xmlDocUniquePtr pSheet
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet);
+
+assertXPath(pSheet, "/x:worksheet/x:headerFooter", "differentOddEven",
"true");
+assertXPath(pSheet, "/x:worksheet/x:headerFooter", "differentFirst",
"true");
+
+xShell->DoClose();
+}
+
void ScExportTest2::testTdf91634XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"image_hyperlink.", FORMAT_XLSX);
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index a34015a999cf..c0b5c6eb6cc1 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -53,6 +53,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
OUString sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) :
OUString(SC_UNO_PAGE_LEFTHDRCONT) );
OUString sContentFirst( bFooter ? OUString(SC_UNO_PAGE_FIRSTFTRCONT) :
OUString(SC_UNO_PAGE_FIRSTHDRCONT) );
OUString sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) :
OUString(SC_UNO_PAGE_HDRSHARED) );
+OUString sShareFirstContent( bFooter ?
OUString(SC_UNO_PAGE_FIRSTFTRSHARED) : OUString(SC_UNO_PAGE_FIRSTHDRSHARED) );
bool bDisplay( true );
for( auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ) )
{
@@ -61,10 +62,9 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
else
XMLOFF_WARN_UNKNOWN("sc", aIter);
}
+bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
if( bLeft )
{
-bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
-
if( bOn && bDisplay )
{
if( ::cppu::any2bool(xPropSet->getPropertyValue( sShareContent )) )
@@ -80,16 +80,22 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
}
else
{
-bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
if ( bOn != bDisplay )
xPropSet->setPropertyValue( sOn, uno::makeAny(bDisplay) );
}
if (bLeft)
+{
sCont = sContentLeft;
+}
else if (bFirst)
+{
sCont = sContentFir
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - toolkit/source
toolkit/source/helper/unowrapper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1e7f4ecdfbb30cdf35501292ced01388b8d24647 Author: Michael Weghorn AuthorDate: Wed Jul 7 13:24:37 2021 +0100 Commit: Xisco Fauli CommitDate: Wed Jul 7 21:50:50 2021 +0200 tdf#140594 Create proper window peer for FORMATTEDFIELD commit 2a694f9e0e7789b4b3b792a9eedd29366fa10c1c Date: Wed May 6 14:08:07 2020 -0400 lok: fix the window type of the formatted field control had introduced the new 'WindowType::FORMATTEDFIELD' and set it for the 'FormattedField' control (instead of using the previous default value set in the 'SpinField' ctor, which is 'WindowType::SPINFIELD'). So far, this type was not explicitly handled when creating the XWindow peer. Handle it just the same as 'WindowType::SPINFIELD' and return a new 'VCLXNumericField', which e.g. makes sure that a "proper" accessible is created and thus alues of a spin field are announced by the NVDA screen reader (again). (See also commit 33cac418db78f64f7fa84b8e65c01c2b02cf17a7 Date: Fri May 29 16:53:59 2020 +0200 tdf#133498 Make native drawing of FormattedField work (again) which had fixed a similar regression elsewhere.) Change-Id: Ie8a4d279a12a1b83a9cf97f1304d84214b3a2a2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118568 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit cdc752fd5e5b3bf97043b9542867d84827614f2c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118503 Reviewed-by: Xisco Fauli diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index eb37d4137419..34bcdb6d12f4 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -54,6 +54,7 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c case WindowType::METRICBOX: case WindowType::COMBOBOX: return new VCLXComboBox; case WindowType::SPINFIELD: +case WindowType::FORMATTEDFIELD: case WindowType::CURRENCYFIELD: return new VCLXNumericField; case WindowType::DATEFIELD: return new VCLXDateField; case WindowType::MULTILINEEDIT: ___ 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' - toolkit/source
toolkit/source/helper/unowrapper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 1ac29daf64273814227e81e8c3f4e519e0809e57 Author: Michael Weghorn AuthorDate: Wed Jul 7 13:24:37 2021 +0100 Commit: Xisco Fauli CommitDate: Wed Jul 7 21:50:17 2021 +0200 tdf#140594 Create proper window peer for FORMATTEDFIELD commit 2a694f9e0e7789b4b3b792a9eedd29366fa10c1c Date: Wed May 6 14:08:07 2020 -0400 lok: fix the window type of the formatted field control had introduced the new 'WindowType::FORMATTEDFIELD' and set it for the 'FormattedField' control (instead of using the previous default value set in the 'SpinField' ctor, which is 'WindowType::SPINFIELD'). So far, this type was not explicitly handled when creating the XWindow peer. Handle it just the same as 'WindowType::SPINFIELD' and return a new 'VCLXNumericField', which e.g. makes sure that a "proper" accessible is created and thus alues of a spin field are announced by the NVDA screen reader (again). (See also commit 33cac418db78f64f7fa84b8e65c01c2b02cf17a7 Date: Fri May 29 16:53:59 2020 +0200 tdf#133498 Make native drawing of FormattedField work (again) which had fixed a similar regression elsewhere.) Change-Id: Ie8a4d279a12a1b83a9cf97f1304d84214b3a2a2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118568 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit cdc752fd5e5b3bf97043b9542867d84827614f2c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118502 Reviewed-by: Xisco Fauli diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index a83cd540ba5e..aa32d1b86aa6 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -56,6 +56,7 @@ static rtl::Reference CreateXWindow( vcl::Window const * pWindow ) case WindowType::METRICBOX: case WindowType::COMBOBOX: return new VCLXComboBox; case WindowType::SPINFIELD: +case WindowType::FORMATTEDFIELD: case WindowType::CURRENCYFIELD: return new VCLXNumericField; case WindowType::DATEFIELD: return new VCLXDateField; case WindowType::MULTILINEEDIT: ___ 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' - include/svx
include/svx/svxids.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7c1221f15ced762b6ffcfd4abf6ebc2327f0341f Author: Hossein AuthorDate: Tue Jul 6 06:58:03 2021 +0200 Commit: Xisco Fauli CommitDate: Wed Jul 7 21:48:47 2021 +0200 tdf#143204 svx: fix SID_ATTR_TEXTCOLUMNS_SPACING SID collision These two SIDs have the same ID, which is fixed now: * include/sfx2/sfxsids.hrc: #define SID_NOTEBOOKBAR (SID_SVX_START + 338) * include/svx/svxids.hrc: #define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 338 ) The symptom tdf#143204 is that the tabbed interface was hidden in Impress or Draw, which is now fixed. Looking at b66d87086804460c1986df1b832fd6b2ea075a90 (2014-04-01) we read: As commit 669ad519902e21e0cb3537fb7e203987f75a4077 (colliding SID_SVX_START based ids, 2013-06-24) suggests, new SID_SVX_START-based SID's shouldn't be added to include/editeng/editids.hrc. However, if it was done, at least add a comment about it to include/svx/svxids.hrc, so it becomes obvious that the two slots have the same ID. Also in include/sfx2/sfxsids.hrc:551 slot IDs from SVX (svxids.hrc) These SID_SVX_START entries came from include/svx/svxids.hrc, avoid accidentally colliding entries with include/svx/svxids.hrc and include/editeng/editids.hrc. Only add new SID_SVX_START entries to include/svx/svxids.hrc Change-Id: I5e8c14bdbaa72f1b030a686dd5fffc9ae8dd1306 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118459 Tested-by: Jenkins Reviewed-by: Michael Meeks Reviewed-by: Mike Kaganski (cherry picked from commit 8ea9a8bc43ea054521a44dc8e3bc537110ca9e33) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118504 Reviewed-by: Xisco Fauli diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 6b23b3176f17..ac0373e2ad97 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -438,8 +438,8 @@ class SdrAngleItem; //#define SID_SIDEBAR ( SID_SVX_START + 336 ) -> sfxsids.hrc -#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 337 ) -#define SID_ATTR_TEXTCOLUMNS_SPACING( SID_SVX_START + 338 ) +#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 340) +#define SID_ATTR_TEXTCOLUMNS_SPACING( SID_SVX_START + 341 ) #define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 ) #define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Building the whole LibreOffice instead of running a single test
On Tuesday 06 of July 2021, Radhey Parekh wrote: > Good Morning everyone! > > I'm facing this issue since couple of days that when I tried to ran a > single test, it starts building the whole thing from the beginning! Do > anyone had faced such problem yet? Also, do let me know if you have some > tips to overcome this. The command I used to ran a test is below: > > CPPUNIT_TEST_NAME="MyTest" make -sr > CppunitTest_sw_ooxmlexport16 If make rebuilds something, then it thinks a dependency of the final target needs rebuilding, most likely because it has changed. You can run make with --debug to see everything make consider and find it there. You can also make things faster using the -C option here to run make only in the one module. -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - RepositoryExternal.mk
RepositoryExternal.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d03ab54d94ca1d772523067a098552c2b66d6445 Author: Luboš Luňák AuthorDate: Thu Apr 22 17:10:53 2021 +0200 Commit: Pranam Lashkari CommitDate: Wed Jul 7 20:23:06 2021 +0200 fix cairocanvas build with internal cairo 3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b made cairocanvas #include also a pixman header, but the internal cairo case wasn't setting up the pixman include path. Change-Id: Ib0daab3a5ec1a6ebf1b29eb37b039d2f41f770c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114491 Tested-by: Jenkins Reviewed-by: Luboš Luňák (cherry picked from commit 04bd21d483c33c5011e31ac12d02c9e00dc410ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118498 Tested-by: Jenkins CollaboraOffice Reviewed-by: Pranam Lashkari diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5db36ebad3d0..fbd48dd2c699 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1301,6 +1301,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,cairo) \ -I$(call gb_UnpackedTarball_get_dir,cairo)/src \ + -I$(call gb_UnpackedTarball_get_dir,pixman)/pixman \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 46 +-
1 file changed, 37 insertions(+), 9 deletions(-)
New commits:
commit 7d180d713392b98e40bc3778d9434a9b6fd0aa8b
Author: Caolán McNamara
AuthorDate: Wed Jul 7 16:33:48 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 18:37:36 2021 +0200
gtk4: implement Menu::get_n_children for gtk4
Change-Id: I6a6202783d30da2487e4033bcbe859e72f959f12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118579
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 79cabe5f3ec0..05bbdb1eb30c 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4900,7 +4900,7 @@ public:
#if GTK_CHECK_VERSION(4, 0, 0)
/* LibreOffice likes to think of separators between menu entries, while
gtk likes
to think of sections of menus with separators drawn between sections.
We always
- arrange to have a section in a menua so toplevel menumodels comprise of
+ arrange to have a section in a menu so toplevel menumodels comprise of
sections and we move entries between sections on pretending to insert
separators */
static std::pair get_section_and_pos_for(GMenuModel*
pMenuModel, int pos)
{
@@ -4927,6 +4927,27 @@ public:
return std::make_pair(pSectionModel, nIndexWithinSection);
}
+
+static int count_immediate_children(GMenuModel* pMenuModel)
+{
+int nSectionCount = g_menu_model_get_n_items(pMenuModel);
+assert(nSectionCount);
+
+int nExternalPos = 0;
+for (int nSection = 0; nSection < nSectionCount; ++nSection)
+{
+GMenuModel* pSectionModel = g_menu_model_get_item_link(pMenuModel,
nSection, G_MENU_LINK_SECTION);
+assert(pSectionModel);
+int nCount = g_menu_model_get_n_items(pSectionModel);
+for (int nIndexWithinSection = 0; nIndexWithinSection < nCount;
++nIndexWithinSection)
+{
+++nExternalPos;
+}
+++nExternalPos;
+}
+
+return nExternalPos - 1;
+}
#endif
#if GTK_CHECK_VERSION(4, 0, 0)
@@ -5272,6 +5293,20 @@ public:
#endif
}
+int get_n_children() const
+{
+#if !GTK_CHECK_VERSION(4, 0, 0)
+GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu));
+int nLen = g_list_length(pChildren);
+g_list_free(pChildren);
+return nLen;
+#else
+if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+return count_immediate_children(pMenuModel);
+return 0;
+#endif
+}
+
void clear_items()
{
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -10519,14 +10554,7 @@ public:
virtual int n_children() const override
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
-GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu));
-int nLen = g_list_length(pChildren);
-g_list_free(pChildren);
-return nLen;
-#else
-return 0;
-#endif
+return get_n_children();
}
void remove(const OString& rIdent) override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 29 -
1 file changed, 12 insertions(+), 17 deletions(-)
New commits:
commit e3c1460462ce1fdb7073b876c1d802e4b2cb49c6
Author: Caolán McNamara
AuthorDate: Wed Jul 7 16:21:37 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 18:37:20 2021 +0200
gtk4: implement MenuHelper::clear_items for gtk4
Change-Id: I0df18e50ad8955b3e5933287cba2ddcee02fec31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118577
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c35af7b23d96..79cabe5f3ec0 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -5282,6 +5282,15 @@ public:
gtk_widget_destroy(GTK_WIDGET(pMenuItem));
}
m_aMap.clear();
+#else
+if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+{
+GMenu* pMenu = G_MENU(pMenuModel);
+g_menu_remove_all(pMenu);
+g_menu_insert_section(pMenu, 0, nullptr,
G_MENU_MODEL(g_menu_new()));
+m_aHiddenIds.clear();
+update_action_group_from_popover_model();
+}
#endif
}
@@ -9805,21 +9814,7 @@ public:
virtual void clear() override
{
-#if GTK_CHECK_VERSION(4, 0, 0)
-GtkPopover* pPopover = gtk_menu_button_get_popover(m_pMenuButton);
-if (GMenuModel* pMenuModel = GTK_IS_POPOVER_MENU(pPopover) ?
-
gtk_popover_menu_get_menu_model(GTK_POPOVER_MENU(pPopover)) :
- nullptr)
-{
-GMenu* pMenu = G_MENU(pMenuModel);
-g_menu_remove_all(pMenu);
-g_menu_insert_section(pMenu, 0, nullptr,
G_MENU_MODEL(g_menu_new()));
-m_aHiddenIds.clear();
-update_action_group_from_popover_model();
-}
-#else
-clear_items();
-#endif
+MenuHelper::clear_items();
}
virtual void set_item_active(const OString& rIdent, bool bActive) override
@@ -10183,7 +10178,7 @@ public:
virtual void clear() override
{
-clear_items();
+MenuHelper::clear_items();
}
virtual void set_item_active(const OString& rIdent, bool bActive) override
@@ -10442,8 +10437,8 @@ public:
{
#if !GTK_CHECK_VERSION(4, 0, 0)
clear_extras();
-clear_items();
#endif
+MenuHelper::clear_items();
}
virtual void insert(int pos, const OUString& rId, const OUString& rStr,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit a38fc872839909774a7097671fcaefe3c9127bdd
Author: Caolán McNamara
AuthorDate: Wed Jul 7 16:10:55 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 18:36:47 2021 +0200
gtk4: silence warnings
Change-Id: I4d9d391239a57ab81ce6f513a713ac91846b61d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118576
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index da39cf03f41a..c35af7b23d96 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10505,6 +10505,15 @@ public:
m_pTopLevelMenuHelper->add_to_map(pMenuItem);
if (pos != -1)
gtk_menu_reorder_child(m_pMenu, pItem, pos);
+#else
+SAL_WARN("vcl.gtk", "needs to be implemented for gtk4");
+(void)pos;
+(void)rId;
+(void)rStr;
+(void)pIconName;
+(void)pImageSurface;
+(void)rGraphic;
+(void)eCheckRadioFalse;
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0db3e8a815d4008a23f19df5c89871281c698ae8 Author: Olivier Hallot AuthorDate: Wed Jul 7 13:08:45 2021 -0300 Commit: Gerrit Code Review CommitDate: Wed Jul 7 18:08:45 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to dc68b55ae08e9445e3ec982b7d5e91a4b522b9a1 - tdf#143232 Set correct name for shrink/expand in Help Change-Id: Ia95edf96335a45743fc40e253d35d4b5de7c4f80 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118580 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7c10c96ab3e2..dc68b55ae08e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7c10c96ab3e221764a797442b0a04e8013584815 +Subproject commit dc68b55ae08e9445e3ec982b7d5e91a4b522b9a1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0001.xhp | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit dc68b55ae08e9445e3ec982b7d5e91a4b522b9a1 Author: Olivier Hallot AuthorDate: Wed Jul 7 12:52:18 2021 -0300 Commit: Olivier Hallot CommitDate: Wed Jul 7 18:08:45 2021 +0200 tdf#143232 Set correct name for shrink/expand in Help Change-Id: Ia95edf96335a45743fc40e253d35d4b5de7c4f80 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118580 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index a03dff236..64aa29e11 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -147,13 +147,13 @@ -Shrink / Maximize - Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Maximize icon. Click it to restore the dialog to its original size. +Shrink / Expand + Click the Shrink icon to reduce the dialog to the size of the input field. It is then easier to mark the required reference in the sheet. The icons then automatically convert to the Expand icon. Click it to restore the dialog to its original size. The dialog is automatically minimized when you click into a sheet with the mouse. As soon as you release the mouse button, the dialog is restored and the reference range defined with the mouse is highlighted in the document by a blue frame. - Icon + Icon shrink Shrink @@ -161,10 +161,10 @@ - Icon + Icon Expand - Maximize + Expand ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 273 +++
1 file changed, 138 insertions(+), 135 deletions(-)
New commits:
commit c118d90e13fff1b9404e179b61cd5919115a449c
Author: Caolán McNamara
AuthorDate: Wed Jul 7 16:03:04 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 17:57:32 2021 +0200
gtk4: add get_item_id to MenuHelper
and implement for the GMenuModel case
Change-Id: I57da4d984f6a743043cd82c32edff35115fe94c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118575
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index cd4f8efc8e40..da39cf03f41a 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -5248,6 +5248,30 @@ public:
#endif
}
+OString get_item_id(int pos) const
+{
+#if !GTK_CHECK_VERSION(4, 0, 0)
+GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu));
+gpointer pMenuItem = g_list_nth_data(pChildren, pos);
+OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem));
+g_list_free(pChildren);
+return id;
+#else
+OString sTarget;
+if (GMenuModel* pMenuModel = gtk_popover_menu_get_menu_model(m_pMenu))
+{
+auto aSectionAndPos = get_section_and_pos_for(pMenuModel, pos);
+char *id;
+if (g_menu_model_get_item_attribute(aSectionAndPos.first,
aSectionAndPos.second, "target", "s", &id))
+{
+sTarget = OString(id);
+g_free(id);
+}
+}
+return sTarget;
+#endif
+}
+
void clear_items()
{
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -10486,15 +10510,7 @@ public:
virtual OString get_id(int pos) const override
{
-#if !GTK_CHECK_VERSION(4, 0, 0)
-GList* pChildren = gtk_container_get_children(GTK_CONTAINER(m_pMenu));
-gpointer pMenuItem = g_list_nth_data(pChildren, pos);
-OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem));
-g_list_free(pChildren);
-return id;
-#else
-return OString();
-#endif
+return get_item_id(pos);
}
virtual int n_children() const override
commit 857943a0e4e75f12ffe7b1dc9d91ef88fbdb75d6
Author: Caolán McNamara
AuthorDate: Wed Jul 7 15:22:58 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 17:57:17 2021 +0200
gtk4: move more GMenuModel/GtkPopoverMenu handling into MenuHelper
Change-Id: I994a0c6aeb2bfabec01999e4722ac0f72a3f359e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c5bc9657f309..cd4f8efc8e40 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4775,6 +4775,8 @@ protected:
bool m_bTakeOwnership;
private:
+virtual void signal_item_activate(const OString& rIdent) = 0;
+
#if !GTK_CHECK_VERSION(4, 0, 0)
static void collect(GtkWidget* pItem, gpointer widget)
{
@@ -4791,8 +4793,6 @@ private:
SolarMutexGuard aGuard;
pThis->signal_item_activate(::get_buildable_id(GTK_BUILDABLE(pItem)));
}
-
-virtual void signal_item_activate(const OString& rIdent) = 0;
#else
static std::pair find_id(GMenuModel* pMenuModel, const
OString& rId)
{
@@ -4825,6 +4825,28 @@ private:
return std::make_pair(nullptr, -1);
}
+
+void clear_actions()
+{
+for (const auto& rAction : m_aActionEntries)
+{
+g_action_map_remove_action(G_ACTION_MAP(m_pActionGroup),
rAction.name);
+g_action_map_remove_action(G_ACTION_MAP(m_pHiddenActionGroup),
rAction.name);
+}
+m_aActionEntries.clear();
+m_aInsertedActions.clear();
+m_aIdToAction.clear();
+}
+
+static void action_activated(GSimpleAction*, GVariant* pParameter,
gpointer widget)
+{
+gsize nLength(0);
+const gchar* pStr = g_variant_get_string(pParameter, &nLength);
+OString aStr(pStr, nLength);
+MenuHelper* pThis = static_cast(widget);
+SolarMutexGuard aGuard;
+pThis->signal_item_activate(aStr);
+}
#endif
public:
@@ -4907,11 +4929,75 @@ public:
}
#endif
-#if !GTK_CHECK_VERSION(4, 0, 0)
-void insert_item(int pos, std::u16string_view rId, const OUString& rStr,
+#if GTK_CHECK_VERSION(4, 0, 0)
+void process_menu_model(GMenuModel* pMenuModel)
+{
+for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i <
nCount; ++i)
+{
+OString sAction, sTarget;
+char *id;
+if (g_menu_model_get_item_attribute(pMenuModel, i, "action", "s",
&id))
+{
+assert(OString(id).startsWith("menu."));
+
+sAction = OString(id + 5);
+
+auto res = m_aInsertedActions.insert(sAction);
+if (res.se
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e3fa55f33dde9d8890a2a318b68f9d69a5a804af Author: Olivier Hallot AuthorDate: Wed Jul 7 12:53:59 2021 -0300 Commit: Gerrit Code Review CommitDate: Wed Jul 7 17:53:59 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 7c10c96ab3e221764a797442b0a04e8013584815 - Fix typo on sf_methods.xhp Change-Id: I10ac058ca55a5fd7a5b606e0ad48f28399563b5f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118578 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b46d9178afe7..7c10c96ab3e2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b46d9178afe749e720ef1a3ba3666e153111fc32 +Subproject commit 7c10c96ab3e221764a797442b0a04e8013584815 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_methods.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7c10c96ab3e221764a797442b0a04e8013584815 Author: Olivier Hallot AuthorDate: Wed Jul 7 12:33:06 2021 -0300 Commit: Olivier Hallot CommitDate: Wed Jul 7 17:53:59 2021 +0200 Fix typo on sf_methods.xhp Change-Id: I10ac058ca55a5fd7a5b606e0ad48f28399563b5f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118578 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03/sf_methods.xhp b/source/text/sbasic/shared/03/sf_methods.xhp index 0d91cedbd..a06b536bc 100644 --- a/source/text/sbasic/shared/03/sf_methods.xhp +++ b/source/text/sbasic/shared/03/sf_methods.xhp @@ -31,7 +31,7 @@ Basic only service method Typographical characters such as brackets, ellipsis or curly braces denote optional, repetitive or compulsory arguments: - + FSO.HashFile(FileName As String, _ @@ -193,4 +193,4 @@ svc.MsgBox( prompt: str, buttons = svc.MB_OK , opt title: str ): opt str svc.InputBox( prompt: str, default = "", [ title: str ], [ xpostwips: int, ypostwips: int ] ): str - \ 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: editeng/source include/editeng svx/source
editeng/source/accessibility/AccessibleParaManager.cxx | 11 ++
include/editeng/AccessibleParaManager.hxx |1
svx/source/accessibility/AccessibleTextHelper.cxx | 29 +++--
3 files changed, 18 insertions(+), 23 deletions(-)
New commits:
commit 4c76bcb5f35527283c6070fc8e3911a35734eba1
Author: Noel Grandin
AuthorDate: Tue Jul 6 20:53:06 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 7 17:51:52 2021 +0200
tdf#132740 avoid some WeakReference cost in accessibility
reduces time by 20% for me
Change-Id: Ife78248fd36099298eb2401b362f16a1ae3c0434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118534
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx
b/editeng/source/accessibility/AccessibleParaManager.cxx
index 2fb3006da7b7..12aff3e2df63 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -144,6 +144,17 @@ namespace accessibility
}
}
+bool AccessibleParaManager::HasCreatedChild( sal_Int32 nParagraphIndex )
const
+{
+if( 0 <= nParagraphIndex && maChildren.size() >
o3tl::make_unsigned(nParagraphIndex) )
+{
+auto const & rChild = maChildren[ nParagraphIndex ];
+return rChild.second.Width != 0 || rChild.second.Height != 0;
+}
+else
+return false;
+}
+
AccessibleParaManager::Child AccessibleParaManager::CreateChild( sal_Int32
nChild,
const
uno::Reference< XAccessible >& xFrontEnd,
SvxEditSourceAdapter& rEditSource,
diff --git a/include/editeng/AccessibleParaManager.hxx
b/include/editeng/AccessibleParaManager.hxx
index d496be8afb28..5330e1100893 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -138,6 +138,7 @@ namespace accessibility
sal_Int32
nParagraphIndex );
WeakChild GetChild( sal_Int32 nParagraphIndex ) const;
+bool HasCreatedChild( sal_Int32 nParagraphIndex ) const;
// forwarder to all paragraphs
/// Make all children active and editable (or off)
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index f8ff9013e929..9fbd897ea519 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -761,9 +761,7 @@ namespace accessibility
if (mxFrontEnd.is() && bBroadcastEvents)
{
// child not yet created?
-::accessibility::AccessibleParaManager::WeakChild aChild(
maParaManager.GetChild(nCurrPara) );
-if( aChild.second.Width == 0 &&
-aChild.second.Height == 0 )
+if (!maParaManager.HasCreatedChild(nCurrPara))
{
GotPropertyEvent( uno::makeAny(
maParaManager.CreateChild( nCurrPara - mnFirstVisibleChild,
mxFrontEnd, GetEditSource(), nCurrPara ).first ),
@@ -787,15 +785,12 @@ namespace accessibility
}
}
-namespace {
-
-// functor for checking changes in paragraph bounding boxes (no
stand-alone function, maybe not inlined)
-class AccessibleTextHelper_UpdateChildBounds
+void AccessibleTextHelper_Impl::UpdateBoundRect()
{
-public:
-explicit AccessibleTextHelper_UpdateChildBounds() {}
-::accessibility::AccessibleParaManager::WeakChild operator()( const
::accessibility::AccessibleParaManager::WeakChild& rChild )
+// send BOUNDRECT_CHANGED to affected children
+for(auto it = maParaManager.begin(); it != maParaManager.end(); ++it)
{
+::accessibility::AccessibleParaManager::WeakChild& rChild = *it;
// retrieve hard reference from weak one
auto aHardRef( rChild.first.get() );
@@ -813,22 +808,10 @@ namespace accessibility
aHardRef->FireEvent( AccessibleEventId::BOUNDRECT_CHANGED
);
// update internal bounds
-return ::accessibility::AccessibleParaManager::WeakChild(
rChild.first, aNewRect );
+rChild =
::accessibility::AccessibleParaManager::WeakChild( rChild.first, aNewRect );
}
}
-
-// identity transform
-return rChild;
}
-};
-
-}
-
-void AccessibleTextHelper_Impl::UpdateBoundRect()
-{
-// send BOUNDRECT_CHANGED to affe
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/queryentry.hxx|3
sc/inc/typedstrdata.hxx |9 +-
sc/qa/uitest/autofilter/autofilter.py| 70 ++-
sc/source/core/data/column3.cxx |9 +-
sc/source/core/data/table3.cxx | 32 +-
sc/source/core/tool/queryentry.cxx |2
sc/source/core/tool/typedstrdata.cxx | 37 +++-
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 34 +--
sc/source/filter/xml/xmlfilti.cxx| 21 +-
sc/source/ui/cctrl/checklistmenu.cxx |4 -
sc/source/ui/dbgui/filtdlg.cxx |1
sc/source/ui/inc/checklistmenu.hxx |6 -
sc/source/ui/unoobj/datauno.cxx |6 -
sc/source/ui/view/gridwin.cxx| 20 --
14 files changed, 119 insertions(+), 135 deletions(-)
New commits:
commit f6b143a57d9bd8f5d7b29febcb4e01ee1eb2ff1d
Author: Balazs Varga
AuthorDate: Fri Jul 2 09:40:32 2021 +0200
Commit: László Németh
CommitDate: Wed Jul 7 17:44:46 2021 +0200
tdf#142910 sc filter: fix "greater than" or "smaller than" etc
Filter "greater than" or "smaller than" (>, <, >=, <=)
conditions according to the cell number format.
Regression from commit: d5c2584bf36d21580db677b231c57f99f49aa2cb
(Related: tdf#140968 avoid duplicated filter values)
Follow-up to commit: 1f755525189884e4b2824889a6b9dea8933402db
(tdf#142402 sc UI: store formatted values in standard filter)
Clean-up for commit: d5c2584bf36d21580db677b231c57f99f49aa2cb
(Related: tdf#140968 avoid duplicated filter values)
Change-Id: I1284892398c9964ca5407b4d617a617f20341107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118272
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 1855744f78f7..94ea761c1239 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -48,10 +48,9 @@ struct SC_DLLPUBLIC ScQueryEntry
doublemfVal;
svl::SharedString maString;
bool mbMatchEmpty;
-bool mbFormattedValue;
Color maColor;
-Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false),
mbFormattedValue(false) {}
+Item() : meType(ByValue), mfVal(0.0), mbMatchEmpty(false) {}
bool operator== (const Item& r) const;
};
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 50a7effea87e..7c7b1c7e45d4 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -24,14 +24,14 @@ public:
Header = 4
};
-ScTypedStrData( const OUString& rStr, double nVal = 0.0, StringType eType
= Standard,
-bool bDate = false, bool mbIsFormatted = false, bool
bDuplicated = false );
+ScTypedStrData( const OUString& rStr, double fVal = 0.0, double fRVal =
0.0, StringType eType = Standard,
+bool bDate = false );
bool IsDate() const { return mbIsDate;}
const OUString& GetString() const { return maStrValue;}
StringType GetStringType() const { return meStrType;}
double GetValue() const { return mfValue; }
-bool IsDuplicated() const { return mbIsDuplicated; }
+double GetRoundedValue() const { return mfRoundedValue; }
struct LessCaseSensitive
{
@@ -58,10 +58,9 @@ public:
private:
OUString maStrValue;
double mfValue;
+double mfRoundedValue; // rounded value by format code
StringType meStrType;
bool mbIsDate;
-bool mbIsFormatted; // true if the cell value is a formatted filter value
-bool mbIsDuplicated; // true if the cell has a formatted filter value
and has at least one duplicate formatted value.
};
class FindTypedStrData
diff --git a/sc/qa/uitest/autofilter/autofilter.py
b/sc/qa/uitest/autofilter/autofilter.py
index 129add2703ec..4c1b8194fb06 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -442,20 +442,8 @@ class AutofilterTest(UITestCase):
xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
-xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER":
"", "COL": "0", "ROW": "0"}))
-xFloatWindow = self.xUITest.getFloatWindow()
-#Choose Standard Filter... button
-xMenu = xFloatWindow.getChild("menu")
-
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"KEYCODE":"DOWN"}))
-xMenu.executeAction("TYPE", mkPropertyValues({"
[Libreoffice-commits] core.git: include/svx
include/svx/svxids.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8ea9a8bc43ea054521a44dc8e3bc537110ca9e33 Author: Hossein AuthorDate: Tue Jul 6 06:58:03 2021 +0200 Commit: Mike Kaganski CommitDate: Wed Jul 7 17:42:19 2021 +0200 tdf#143204 svx: fix SID_ATTR_TEXTCOLUMNS_SPACING SID collision These two SIDs have the same ID, which is fixed now: * include/sfx2/sfxsids.hrc: #define SID_NOTEBOOKBAR (SID_SVX_START + 338) * include/svx/svxids.hrc: #define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 338 ) The symptom tdf#143204 is that the tabbed interface was hidden in Impress or Draw, which is now fixed. Looking at b66d87086804460c1986df1b832fd6b2ea075a90 (2014-04-01) we read: As commit 669ad519902e21e0cb3537fb7e203987f75a4077 (colliding SID_SVX_START based ids, 2013-06-24) suggests, new SID_SVX_START-based SID's shouldn't be added to include/editeng/editids.hrc. However, if it was done, at least add a comment about it to include/svx/svxids.hrc, so it becomes obvious that the two slots have the same ID. Also in include/sfx2/sfxsids.hrc:551 slot IDs from SVX (svxids.hrc) These SID_SVX_START entries came from include/svx/svxids.hrc, avoid accidentally colliding entries with include/svx/svxids.hrc and include/editeng/editids.hrc. Only add new SID_SVX_START entries to include/svx/svxids.hrc Change-Id: I5e8c14bdbaa72f1b030a686dd5fffc9ae8dd1306 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118459 Tested-by: Jenkins Reviewed-by: Michael Meeks Reviewed-by: Mike Kaganski diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 6b23b3176f17..ac0373e2ad97 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -438,8 +438,8 @@ class SdrAngleItem; //#define SID_SIDEBAR ( SID_SVX_START + 336 ) -> sfxsids.hrc -#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 337 ) -#define SID_ATTR_TEXTCOLUMNS_SPACING( SID_SVX_START + 338 ) +#define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 340) +#define SID_ATTR_TEXTCOLUMNS_SPACING( SID_SVX_START + 341 ) #define SID_SB_CONNECTIONPOOLING( SID_SVX_START + 348 ) #define SID_SB_DBREGISTEROPTIONS( SID_SVX_START + 349 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b55389c7c1bff6b555e14a3cef570fcb85091e4d
Author: Caolán McNamara
AuthorDate: Wed Jul 7 15:09:23 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 17:38:05 2021 +0200
gtk[3|4] give signal_item_activate an ident instead of a GtkMenuItem*
Change-Id: I9f762dea7f2a8daadfbe4ee693caf5a40442aabe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118573
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index e93d8e29e5bc..c5bc9657f309 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4789,10 +4789,10 @@ private:
{
MenuHelper* pThis = static_cast(widget);
SolarMutexGuard aGuard;
-pThis->signal_item_activate(pItem);
+pThis->signal_item_activate(::get_buildable_id(GTK_BUILDABLE(pItem)));
}
-virtual void signal_item_activate(GtkMenuItem* pItem) = 0;
+virtual void signal_item_activate(const OString& rIdent) = 0;
#else
static std::pair find_id(GMenuModel* pMenuModel, const
OString& rId)
{
@@ -9835,9 +9835,9 @@ public:
pThis->signal_selected(aStr);
}
#else
-virtual void signal_item_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(const OString& rIdent) override
{
-signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
+signal_selected(rIdent);
}
#endif
@@ -10200,9 +10200,9 @@ public:
MenuHelper::set_item_visible(rIdent, bVisible);
}
-virtual void signal_item_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(const OString& rIdent) override
{
-signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
+signal_selected(rIdent);
}
virtual void set_popover(weld::Widget* /*pPopover*/) override
@@ -10225,9 +10225,9 @@ protected:
private:
#if !GTK_CHECK_VERSION(4, 0, 0)
-virtual void signal_item_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(const OString& rIdent) override
{
-m_sActivated = ::get_buildable_id(GTK_BUILDABLE(pItem));
+m_sActivated = rIdent;
weld::Menu::signal_activate(m_sActivated);
}
@@ -17275,7 +17275,7 @@ public:
, m_pComboBox(pComboBox)
{
}
-virtual void signal_item_activate(GtkMenuItem*) override
+virtual void signal_item_activate(const OString& /*rIdent*/) override
{
gtk_toggle_button_set_active(m_pComboBox, false);
}
commit dc2abe4646cbf1c867a0ecc75bcb4e6c7d1fb806
Author: Caolán McNamara
AuthorDate: Wed Jul 7 15:02:11 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 17:37:49 2021 +0200
gtk[3|4] rename signal_activate to signal_item_activate
Change-Id: Ic90bd9f87bfdb8e7de6d5546ea1f8c33236e6469
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118572
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index fadfaab17d87..e93d8e29e5bc 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4789,10 +4789,10 @@ private:
{
MenuHelper* pThis = static_cast(widget);
SolarMutexGuard aGuard;
-pThis->signal_activate(pItem);
+pThis->signal_item_activate(pItem);
}
-virtual void signal_activate(GtkMenuItem* pItem) = 0;
+virtual void signal_item_activate(GtkMenuItem* pItem) = 0;
#else
static std::pair find_id(GMenuModel* pMenuModel, const
OString& rId)
{
@@ -9835,7 +9835,7 @@ public:
pThis->signal_selected(aStr);
}
#else
-virtual void signal_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(GtkMenuItem* pItem) override
{
signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
}
@@ -10200,7 +10200,7 @@ public:
MenuHelper::set_item_visible(rIdent, bVisible);
}
-virtual void signal_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(GtkMenuItem* pItem) override
{
signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
}
@@ -10225,7 +10225,7 @@ protected:
private:
#if !GTK_CHECK_VERSION(4, 0, 0)
-virtual void signal_activate(GtkMenuItem* pItem) override
+virtual void signal_item_activate(GtkMenuItem* pItem) override
{
m_sActivated = ::get_buildable_id(GTK_BUILDABLE(pItem));
weld::Menu::signal_activate(m_sActivated);
@@ -17275,7 +17275,7 @@ public:
, m_pComboBox(pComboBox)
{
}
-virtual void signal_activate(GtkMenuItem*) override
+virtual void signal_item_activate(GtkMenuItem*) override
{
gtk_toggle_button_set_active(m_pComboBox, false);
}
___
Libreoffice-commits mailing list
libreoffic
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 489 ++-
1 file changed, 239 insertions(+), 250 deletions(-)
New commits:
commit 60c89f3b2c6cdcf84274eafd345fc20ccd90d381
Author: Caolán McNamara
AuthorDate: Wed Jul 7 14:17:41 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 17:35:07 2021 +0200
gtk4: move new GMenuModel/GtkPopoverMenu handling into MenuHelper
Change-Id: I637dcc4bc8fe31e1c8832ada84f844976ee44da7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118571
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3a48fa2e3c02..fadfaab17d87 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4754,15 +4754,28 @@ namespace
}
-#if !GTK_CHECK_VERSION(4, 0, 0)
class MenuHelper
{
protected:
+#if !GTK_CHECK_VERSION(4, 0, 0)
GtkMenu* m_pMenu;
-bool m_bTakeOwnership;
+
std::map m_aMap;
+#else
+GtkPopoverMenu* m_pMenu;
+
+o3tl::sorted_vector m_aInsertedActions; // must outlive
m_aActionEntries
+std::map m_aIdToAction;
+std::set m_aHiddenIds;
+std::vector m_aActionEntries;
+GActionGroup* m_pActionGroup;
+// move 'invisible' entries to m_pHiddenActionGroup
+GActionGroup* m_pHiddenActionGroup;
+#endif
+bool m_bTakeOwnership;
private:
+#if !GTK_CHECK_VERSION(4, 0, 0)
static void collect(GtkWidget* pItem, gpointer widget)
{
GtkMenuItem* pMenuItem = GTK_MENU_ITEM(pItem);
@@ -4780,17 +4793,60 @@ private:
}
virtual void signal_activate(GtkMenuItem* pItem) = 0;
+#else
+static std::pair find_id(GMenuModel* pMenuModel, const
OString& rId)
+{
+for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i <
nCount; ++i)
+{
+OString sTarget;
+char *id;
+if (g_menu_model_get_item_attribute(pMenuModel, i, "target", "s",
&id))
+{
+sTarget = OString(id);
+g_free(id);
+}
+
+if (sTarget == rId)
+return std::make_pair(pMenuModel, i);
+
+if (GMenuModel* pSectionModel =
g_menu_model_get_item_link(pMenuModel, i, G_MENU_LINK_SECTION))
+{
+std::pair aRet = find_id(pSectionModel, rId);
+if (aRet.first)
+return aRet;
+}
+if (GMenuModel* pSubMenuModel =
g_menu_model_get_item_link(pMenuModel, i, G_MENU_LINK_SUBMENU))
+{
+std::pair aRet = find_id(pSubMenuModel, rId);
+if (aRet.first)
+return aRet;
+}
+}
+
+return std::make_pair(nullptr, -1);
+}
+#endif
public:
+#if !GTK_CHECK_VERSION(4, 0, 0)
MenuHelper(GtkMenu* pMenu, bool bTakeOwnership)
+#else
+MenuHelper(GtkPopoverMenu* pMenu, bool bTakeOwnership)
+#endif
: m_pMenu(pMenu)
, m_bTakeOwnership(bTakeOwnership)
{
+#if !GTK_CHECK_VERSION(4, 0, 0)
if (!m_pMenu)
return;
gtk_container_foreach(GTK_CONTAINER(m_pMenu), collect, this);
+#else
+m_pActionGroup = G_ACTION_GROUP(g_simple_action_group_new());
+m_pHiddenActionGroup = G_ACTION_GROUP(g_simple_action_group_new());
+#endif
}
+#if !GTK_CHECK_VERSION(4, 0, 0)
void add_to_map(GtkMenuItem* pMenuItem)
{
OString id = ::get_buildable_id(GTK_BUILDABLE(pMenuItem));
@@ -4817,7 +4873,41 @@ public:
for (auto& a : m_aMap)
g_signal_handlers_unblock_by_func(a.second,
reinterpret_cast(signalActivate), this);
}
+#endif
+
+#if GTK_CHECK_VERSION(4, 0, 0)
+/* LibreOffice likes to think of separators between menu entries, while
gtk likes
+ to think of sections of menus with separators drawn between sections.
We always
+ arrange to have a section in a menua so toplevel menumodels comprise of
+ sections and we move entries between sections on pretending to insert
separators */
+static std::pair get_section_and_pos_for(GMenuModel*
pMenuModel, int pos)
+{
+int nSectionCount = g_menu_model_get_n_items(pMenuModel);
+assert(nSectionCount);
+
+GMenuModel* pSectionModel = nullptr;
+int nIndexWithinSection = 0;
+int nExternalPos = 0;
+for (int nSection = 0; nSection < nSectionCount; ++nSection)
+{
+pSectionModel = g_menu_model_get_item_link(pMenuModel, nSection,
G_MENU_LINK_SECTION);
+assert(pSectionModel);
+int nCount = g_menu_model_get_n_items(pSectionModel);
+for (nIndexWithinSection = 0; nIndexWithinSection < nCount;
++nIndexWithinSection)
+{
+if (pos == nExternalPos)
+break;
+++nExternalPos;
+}
+++nExternalPos;
+}
+
+return std::make_pair(pSectionModel, nIndexWithinSection);
+}
+#endif
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b35b5e03b4ecc694d61a72bebb8621b9562f870f Author: Rafael Lima AuthorDate: Wed Jul 7 17:08:15 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 7 17:08:15 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b46d9178afe749e720ef1a3ba3666e153111fc32 - tdf#143229 Remove empty paragraphs Change-Id: I4dbb2eb2cfbb140a129c02290642a777c8f9f327 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118496 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 147ed04e1bff..b46d9178afe7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 147ed04e1bff695f9242d5991334d1c8ddd7435a +Subproject commit b46d9178afe749e720ef1a3ba3666e153111fc32 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/lib_ScriptForge.xhp |1 -
source/text/sbasic/shared/03/sf_basic.xhp |1 -
source/text/sbasic/shared/03/sf_dialogcontrol.xhp |6 --
source/text/scalc/01/04060104.xhp |1 -
source/text/scalc/01/04060110.xhp |1 -
source/text/simpress/main_slide.xhp |2 +-
6 files changed, 1 insertion(+), 11 deletions(-)
New commits:
commit b46d9178afe749e720ef1a3ba3666e153111fc32
Author: Rafael Lima
AuthorDate: Wed Jul 7 13:25:47 2021 +0200
Commit: Olivier Hallot
CommitDate: Wed Jul 7 17:08:15 2021 +0200
tdf#143229 Remove empty paragraphs
Change-Id: I4dbb2eb2cfbb140a129c02290642a777c8f9f327
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118496
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 86f12534c..7e6891169 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -36,7 +36,6 @@
from scriptforge import CreateScriptService
svc
= CreateScriptService('servicename'[, arg0, arg1, ...])
-
The ScriptForge Basic
library is available from %PRODUCTNAME 7.1 onwards.Python
scriptforge module is available from %PRODUCTNAME 7.2
onwards.
Services provided by the ScriptForge
library
diff --git a/source/text/sbasic/shared/03/sf_basic.xhp
b/source/text/sbasic/shared/03/sf_basic.xhp
index 76495dad1..aeaa82b06 100644
--- a/source/text/sbasic/shared/03/sf_basic.xhp
+++ b/source/text/sbasic/shared/03/sf_basic.xhp
@@ -584,7 +584,6 @@
Integer
-
YELLOW = svc.RGB(255,255,0)
diff --git a/source/text/sbasic/shared/03/sf_dialogcontrol.xhp
b/source/text/sbasic/shared/03/sf_dialogcontrol.xhp
index d0aa4c7fd..f21fcef6c 100644
--- a/source/text/sbasic/shared/03/sf_dialogcontrol.xhp
+++ b/source/text/sbasic/shared/03/sf_dialogcontrol.xhp
@@ -634,7 +634,6 @@
Numeric
-
@@ -645,7 +644,6 @@
Date
-
@@ -667,7 +665,6 @@
String or Numeric
-
@@ -689,7 +686,6 @@
Numeric
-
@@ -700,7 +696,6 @@
String
-
@@ -755,7 +750,6 @@
Date
-
diff --git a/source/text/scalc/01/04060104.xhp
b/source/text/scalc/01/04060104.xhp
index 27ae5b206..d247eace4 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -45,7 +45,6 @@
-
C
diff --git a/source/text/scalc/01/04060110.xhp
b/source/text/scalc/01/04060110.xhp
index b0f5778c7..7ca7d5cdf 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -322,7 +322,6 @@
FIXED
Returns a number as text with a specified number of decimal
places and optional thousands separators.
-
FIXED(Number;
[Decimals = 2 [; NoThousandsSeparators = FALSE]])
diff --git a/source/text/simpress/main_slide.xhp
b/source/text/simpress/main_slide.xhp
index 45f3f7c8e..a8e0855d4 100644
--- a/source/text/simpress/main_slide.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -46,7 +46,7 @@
Set Background Image
Opens a File Picker
to choose an image file to be set as the background of the current
slide.
Slide Properties
-
+
Change Slide Master
New Master
___
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' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 11
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 42 +--
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit ecf43d7fc72142d9eb4f45cc97a36efb0ed08dc5
Author: Michael Stahl
AuthorDate: Wed Jul 7 11:28:47 2021 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 7 16:43:35 2021 +0200
Revert "I suspect that we unlikely to use JRE older than 1.3.1_07"
This reverts commit b3541dea4889b9d0039554f87bd16e55189cf8b1.
Reason for revert: The code did not just deal with text encoding
differences, but also with properties whose value contains line breaks.
For example, OpenJ9 has line breaks in "java.vm.info" and
"java.fullversion", which now trigger asserts; also there is "line.separator"
but this one happened not to cause problems so far.
Change-Id: I3ded8e824e96b6fcf21677dd9ba72cbf58c1d261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118495
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 515b72fb9275c76ff9f26b0c3c47cac706d92af0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118500
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index d863c359a489..0d3503af385f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -25,6 +25,9 @@ import java.util.*;
unfortunately this works only with later update - versions (for example,
1.3.1_07). Therefore we use this scheme. The property string has this form:
name=value
+
+Every character is cast to an integer which value is printed, followed by a
+space. If all characters of the string are printed, then a new line is
printed.
*/
public class JREProperties
{
@@ -37,7 +40,13 @@ public class JREProperties
while (e.hasMoreElements()) {
String sProp = (String) e.nextElement();
String sCompleteProp = sProp + "=" + p.getProperty(sProp);
-System.out.println(sCompleteProp);
+char[] arChars = new char[sCompleteProp.length()];
+sCompleteProp.getChars(0, sCompleteProp.length(), arChars, 0);
+for (int c = 0; c < arChars.length; c++) {
+System.out.print(String.valueOf((int) arChars[c]));
+System.out.print(" ");
+}
+System.out.print("\n");
}
}
catch(Exception e)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 90911ee7d153..df14c0841bf9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -114,6 +114,9 @@ static bool getSDKInfoFromRegistry(vector &
vecHome);
static bool getJREInfoFromRegistry(vector& vecJavaHome);
#endif
+static bool decodeOutput(const OString& s, OUString* out);
+
+
namespace
{
@@ -382,11 +385,11 @@ bool getJavaProps(const OUString & exePath,
#endif
//prepare the arguments
-OUString arg0 = "-Dfile.encoding=UTF8";
+sal_Int32 const cArgs = 3;
OUString arg1 = "-classpath";// + sClassPath;
OUString arg2 = sClassPath;
OUString arg3("JREProperties");
-rtl_uString *args[] = {arg0.pData, arg1.pData, arg2.pData, arg3.pData};
+rtl_uString *args[cArgs] = {arg1.pData, arg2.pData, arg3.pData};
oslProcess javaProcess= nullptr;
oslFileHandle fileOut= nullptr;
@@ -399,7 +402,7 @@ bool getJavaProps(const OUString & exePath,
oslProcessError procErr =
osl_executeProcess_WithRedirectedIO( exePath.pData,//usExe.pData,
args,
- SAL_N_ELEMENTS(args),
//sal_uInt32 nArguments,
+ cArgs,
//sal_uInt32 nArguments,
osl_Process_HIDDEN,
//oslProcessOption Options,
nullptr, //oslSecurity Security,
usStartDir.pData,//usStartDir.pData,//usWorkDir.pData, //rtl_uString
*strWorkDir,
@@ -436,7 +439,9 @@ bool getJavaProps(const OUString & exePath,
rs = stdoutReader.readLine( & aLine);
if (rs != FileHandleReader::RESULT_OK)
break;
-OUString sLine = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
+OUString sLine;
+if (!decodeOutput(aLine, &sLine))
+continue;
JFW_TRACE2(" \"" << sLine << "\"");
sLine = sLine.trim();
if (sLine.isEmpty())
@@ -474,6 +479,35 @@ bool getJavaProps(const OUString & exePath,
return ret;
}
+/* converts the properties printed by JREProperties.class into
+readable strings. The strings are encoded as integer values
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/helper/unowrapper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit cdc752fd5e5b3bf97043b9542867d84827614f2c Author: Michael Weghorn AuthorDate: Wed Jul 7 13:24:37 2021 +0100 Commit: Michael Weghorn CommitDate: Wed Jul 7 15:56:50 2021 +0200 tdf#140594 Create proper window peer for FORMATTEDFIELD commit 2a694f9e0e7789b4b3b792a9eedd29366fa10c1c Date: Wed May 6 14:08:07 2020 -0400 lok: fix the window type of the formatted field control had introduced the new 'WindowType::FORMATTEDFIELD' and set it for the 'FormattedField' control (instead of using the previous default value set in the 'SpinField' ctor, which is 'WindowType::SPINFIELD'). So far, this type was not explicitly handled when creating the XWindow peer. Handle it just the same as 'WindowType::SPINFIELD' and return a new 'VCLXNumericField', which e.g. makes sure that a "proper" accessible is created and thus alues of a spin field are announced by the NVDA screen reader (again). (See also commit 33cac418db78f64f7fa84b8e65c01c2b02cf17a7 Date: Fri May 29 16:53:59 2020 +0200 tdf#133498 Make native drawing of FormattedField work (again) which had fixed a similar regression elsewhere.) Change-Id: Ie8a4d279a12a1b83a9cf97f1304d84214b3a2a2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118568 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index a83cd540ba5e..aa32d1b86aa6 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -56,6 +56,7 @@ static rtl::Reference CreateXWindow( vcl::Window const * pWindow ) case WindowType::METRICBOX: case WindowType::COMBOBOX: return new VCLXComboBox; case WindowType::SPINFIELD: +case WindowType::FORMATTEDFIELD: case WindowType::CURRENCYFIELD: return new VCLXNumericField; case WindowType::DATEFIELD: return new VCLXDateField; case WindowType::MULTILINEEDIT: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/ods/tdf142764.ods|binary
sc/qa/unit/subsequent_export-test2.cxx | 19 +++
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 12 +---
3 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 52beb3907dd3c7e6ae112e263def1005272cecd8
Author: Daniel Arato (NISZ)
AuthorDate: Thu Jun 24 15:01:54 2021 +0200
Commit: László Németh
CommitDate: Wed Jul 7 15:27:43 2021 +0200
tdf#142764 sc: import "Same content on first/left page"
Different header of the first page was never imported
(related to the missing UI support), despite its working
ODF export.
This commit sets the values of those options at ODS file load
according to the "display" attribute used to hide or show
a particular header/footer.
Follow-up to commit 19fa853ce12136b5c14e0c5a0aa906c296b75388
"tdf#121715 XLSX: support custom first page header/footer".
Change-Id: I3409ad94a4d3ff86fd7f6d8afede3e7603024515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117788
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/qa/unit/data/ods/tdf142764.ods
b/sc/qa/unit/data/ods/tdf142764.ods
new file mode 100644
index ..bbc4355dab32
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf142764.ods differ
diff --git a/sc/qa/unit/subsequent_export-test2.cxx
b/sc/qa/unit/subsequent_export-test2.cxx
index ad08aa2802d0..0a44090734ab 100644
--- a/sc/qa/unit/subsequent_export-test2.cxx
+++ b/sc/qa/unit/subsequent_export-test2.cxx
@@ -142,6 +142,7 @@ public:
void testPivotCacheAfterExportXLSX();
void testTdf114969XLSX();
void testTdf115192XLSX();
+void testTdf142764();
void testTdf91634XLSX();
void testTdf115159();
void testTdf112567();
@@ -240,6 +241,7 @@ public:
CPPUNIT_TEST(testPivotCacheAfterExportXLSX);
CPPUNIT_TEST(testTdf114969XLSX);
CPPUNIT_TEST(testTdf115192XLSX);
+CPPUNIT_TEST(testTdf142764);
CPPUNIT_TEST(testTdf91634XLSX);
CPPUNIT_TEST(testTdf115159);
CPPUNIT_TEST(testTdf112567);
@@ -1217,6 +1219,23 @@ void ScExportTest2::testTdf115192XLSX()
xDocSh->DoClose();
}
+void ScExportTest2::testTdf142764()
+{
+ScDocShellRef xShell = loadDoc(u"tdf142764.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell);
+
+auto pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+xmlDocUniquePtr pSheet
+= XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet);
+
+assertXPath(pSheet, "/x:worksheet/x:headerFooter", "differentOddEven",
"true");
+assertXPath(pSheet, "/x:worksheet/x:headerFooter", "differentFirst",
"true");
+
+xShell->DoClose();
+}
+
void ScExportTest2::testTdf91634XLSX()
{
ScDocShellRef xDocSh = loadDoc(u"image_hyperlink.", FORMAT_XLSX);
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index a34015a999cf..c0b5c6eb6cc1 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -53,6 +53,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
OUString sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) :
OUString(SC_UNO_PAGE_LEFTHDRCONT) );
OUString sContentFirst( bFooter ? OUString(SC_UNO_PAGE_FIRSTFTRCONT) :
OUString(SC_UNO_PAGE_FIRSTHDRCONT) );
OUString sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) :
OUString(SC_UNO_PAGE_HDRSHARED) );
+OUString sShareFirstContent( bFooter ?
OUString(SC_UNO_PAGE_FIRSTFTRSHARED) : OUString(SC_UNO_PAGE_FIRSTHDRSHARED) );
bool bDisplay( true );
for( auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ) )
{
@@ -61,10 +62,9 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
else
XMLOFF_WARN_UNKNOWN("sc", aIter);
}
+bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
if( bLeft )
{
-bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
-
if( bOn && bDisplay )
{
if( ::cppu::any2bool(xPropSet->getPropertyValue( sShareContent )) )
@@ -80,16 +80,22 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
}
else
{
-bool bOn(::cppu::any2bool(xPropSet->getPropertyValue( sOn )));
if ( bOn != bDisplay )
xPropSet->setPropertyValue( sOn, uno::makeAny(bDisplay) );
}
if (bLeft)
+{
sCont = sContentLeft;
+}
else if (bFirst)
+{
sCont = sContentFirst;
+xPropSet->setPropertyValue( sShareFirstContent,
uno::makeAny(!bDisplay) );
+}
else
+{
sCont = sContent;
+}
xPropSet->getPropertyValue( sCont ) >>= xHeaderFooterContent;
}
___
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - chart2/source
chart2/source/view/charttypes/Splines.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3280eb3b47472ab3fc6946d475a7b9c6c55c381 Author: Andreas Heinisch AuthorDate: Wed May 12 10:33:14 2021 +0200 Commit: Xisco Fauli CommitDate: Wed Jul 7 15:24:33 2021 +0200 tdf#110993 - Corrected spline calculation The algorithm in Numerical Recipies in C, 2nd edition in Section 3.3, page 166 states a division rather than a multiplication. Change-Id: I2530c506bc48726539e3de99016892e50d6bb87e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115465 Tested-by: Jenkins Reviewed-by: Andreas Heinisch (cherry picked from commit e6442b39836f9856aa7b87d1a840158f0cb7d9c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117974 Reviewed-by: Xisco Fauli diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 774d5fc1d7ac..338179b2827c 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -198,7 +198,7 @@ void lcl_SplineCalculation::Calculate() ( m_fYpN - ( m_aPoints[ n ].second - m_aPoints[ n - 1 ].second ) / xDiff ); } -m_aSecDerivY[ n ] = ( un - qn * u[ n - 1 ] ) * ( qn * m_aSecDerivY[ n - 1 ] + 1.0 ); +m_aSecDerivY[ n ] = ( un - qn * u[ n - 1 ] ) / ( qn * m_aSecDerivY[ n - 1 ] + 1.0 ); // note: the algorithm in [1] iterates from n-1 to 0, but as size_type // may be (usually is) an unsigned type, we can not write k >= 0, as this ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 11
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 42 +--
2 files changed, 48 insertions(+), 5 deletions(-)
New commits:
commit 515b72fb9275c76ff9f26b0c3c47cac706d92af0
Author: Michael Stahl
AuthorDate: Wed Jul 7 11:28:47 2021 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 7 15:07:32 2021 +0200
Revert "I suspect that we unlikely to use JRE older than 1.3.1_07"
This reverts commit b3541dea4889b9d0039554f87bd16e55189cf8b1.
Reason for revert: The code did not just deal with text encoding
differences, but also with properties whose value contains line breaks.
For example, OpenJ9 has line breaks in "java.vm.info" and
"java.fullversion", which now trigger asserts; also there is "line.separator"
but this one happened not to cause problems so far.
Change-Id: I3ded8e824e96b6fcf21677dd9ba72cbf58c1d261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118495
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index d863c359a489..0d3503af385f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -25,6 +25,9 @@ import java.util.*;
unfortunately this works only with later update - versions (for example,
1.3.1_07). Therefore we use this scheme. The property string has this form:
name=value
+
+Every character is cast to an integer which value is printed, followed by a
+space. If all characters of the string are printed, then a new line is
printed.
*/
public class JREProperties
{
@@ -37,7 +40,13 @@ public class JREProperties
while (e.hasMoreElements()) {
String sProp = (String) e.nextElement();
String sCompleteProp = sProp + "=" + p.getProperty(sProp);
-System.out.println(sCompleteProp);
+char[] arChars = new char[sCompleteProp.length()];
+sCompleteProp.getChars(0, sCompleteProp.length(), arChars, 0);
+for (int c = 0; c < arChars.length; c++) {
+System.out.print(String.valueOf((int) arChars[c]));
+System.out.print(" ");
+}
+System.out.print("\n");
}
}
catch(Exception e)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 90911ee7d153..df14c0841bf9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -114,6 +114,9 @@ static bool getSDKInfoFromRegistry(vector &
vecHome);
static bool getJREInfoFromRegistry(vector& vecJavaHome);
#endif
+static bool decodeOutput(const OString& s, OUString* out);
+
+
namespace
{
@@ -382,11 +385,11 @@ bool getJavaProps(const OUString & exePath,
#endif
//prepare the arguments
-OUString arg0 = "-Dfile.encoding=UTF8";
+sal_Int32 const cArgs = 3;
OUString arg1 = "-classpath";// + sClassPath;
OUString arg2 = sClassPath;
OUString arg3("JREProperties");
-rtl_uString *args[] = {arg0.pData, arg1.pData, arg2.pData, arg3.pData};
+rtl_uString *args[cArgs] = {arg1.pData, arg2.pData, arg3.pData};
oslProcess javaProcess= nullptr;
oslFileHandle fileOut= nullptr;
@@ -399,7 +402,7 @@ bool getJavaProps(const OUString & exePath,
oslProcessError procErr =
osl_executeProcess_WithRedirectedIO( exePath.pData,//usExe.pData,
args,
- SAL_N_ELEMENTS(args),
//sal_uInt32 nArguments,
+ cArgs,
//sal_uInt32 nArguments,
osl_Process_HIDDEN,
//oslProcessOption Options,
nullptr, //oslSecurity Security,
usStartDir.pData,//usStartDir.pData,//usWorkDir.pData, //rtl_uString
*strWorkDir,
@@ -436,7 +439,9 @@ bool getJavaProps(const OUString & exePath,
rs = stdoutReader.readLine( & aLine);
if (rs != FileHandleReader::RESULT_OK)
break;
-OUString sLine = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
+OUString sLine;
+if (!decodeOutput(aLine, &sLine))
+continue;
JFW_TRACE2(" \"" << sLine << "\"");
sLine = sLine.trim();
if (sLine.isEmpty())
@@ -474,6 +479,35 @@ bool getJavaProps(const OUString & exePath,
return ret;
}
+/* converts the properties printed by JREProperties.class into
+readable strings. The strings are encoded as integer values separated
+by spaces.
+ */
+bool decodeOutput(const OString& s, OUString* out)
+{
+OSL_ASSERT(out != nullptr);
+OUStringBuff
[Libreoffice-commits] core.git: include/vcl sw/source vcl/source vcl/unx
include/vcl/weld.hxx |2 --
sw/source/ui/misc/outline.cxx |6 --
vcl/source/app/salvtables.cxx | 12
vcl/unx/gtk3/gtkinst.cxx | 41 -
4 files changed, 61 deletions(-)
New commits:
commit 716c20460372e3f3543f4dc81a49368a5291cd34
Author: Caolán McNamara
AuthorDate: Wed Jul 7 11:30:12 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 14:44:23 2021 +0200
remove [g|s]et_item_help_id for menubutton menu items
a fairly obscure functionality that was used in just one menu that can
be dropped now that the help is changed to contain references to the
help ids the menu items already have
Change-Id: I4efa2f11e7d48b398152d7308341bd3e4308c377
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118561
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 4546da76b18e..3e085e0af6aa 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1536,9 +1536,7 @@ public:
virtual void set_item_active(const OString& rIdent, bool bActive) = 0;
virtual void set_item_label(const OString& rIdent, const OUString& rLabel)
= 0;
virtual OUString get_item_label(const OString& rIdent) const = 0;
-virtual void set_item_help_id(const OString& rIdent, const OString&
rHelpId) = 0;
virtual void set_item_visible(const OString& rIdent, bool bVisible) = 0;
-virtual OString get_item_help_id(const OString& rIdent) const = 0;
virtual void set_popover(weld::Widget* pPopover) = 0;
};
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index ebac78812a6c..506388528608 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -219,12 +219,6 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl,
weld::Toggleable&, void)
continue;
m_xMenuButton->set_item_label("form" + OString::number(i + 1),
pRules->GetName());
}
-
-OString sHelpId(m_xMenuButton->get_item_help_id("form1"));
-for (sal_Int32 i = 2; i <= 9; ++i)
-{
-m_xMenuButton->set_item_help_id("form" + OString::number(i), sHelpId);
-}
}
IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OString&, rIdent, void)
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 608baded3b4f..2a93a80711de 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2765,18 +2765,6 @@ public:
pMenu->ShowItem(pMenu->GetItemId(rIdent), bShow);
}
-virtual void set_item_help_id(const OString& rIdent, const OString&
rHelpId) override
-{
-PopupMenu* pMenu = m_xMenuButton->GetPopupMenu();
-pMenu->SetHelpId(pMenu->GetItemId(rIdent), rHelpId);
-}
-
-virtual OString get_item_help_id(const OString& rIdent) const override
-{
-PopupMenu* pMenu = m_xMenuButton->GetPopupMenu();
-return pMenu->GetHelpId(pMenu->GetItemId(rIdent));
-}
-
virtual void set_popover(weld::Widget* pPopover) override
{
SalInstanceWidget* pPopoverWidget =
dynamic_cast(pPopover);
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index d80e1a78fbd0..3a48fa2e3c02 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4916,16 +4916,6 @@ public:
return OUString(pText, pText ? strlen(pText) : 0,
RTL_TEXTENCODING_UTF8);
}
-void set_item_help_id(const OString& rIdent, const OString& rHelpId)
-{
-set_help_id(GTK_WIDGET(m_aMap[rIdent]), rHelpId);
-}
-
-OString get_item_help_id(const OString& rIdent) const
-{
-return get_help_id(GTK_WIDGET(m_aMap.find(rIdent)->second));
-}
-
void set_item_visible(const OString& rIdent, bool bShow)
{
GtkWidget* pWidget = GTK_WIDGET(m_aMap[rIdent]);
@@ -9809,27 +9799,6 @@ public:
#endif
}
-virtual void set_item_help_id(const OString& rIdent, const OString&
rHelpId) override
-{
-#if !GTK_CHECK_VERSION(4, 0, 0)
-MenuHelper::set_item_help_id(rIdent, rHelpId);
-#else
-(void)rIdent; (void)rHelpId;
-std::abort();
-#endif
-}
-
-virtual OString get_item_help_id(const OString& rIdent) const override
-{
-#if !GTK_CHECK_VERSION(4, 0, 0)
-return MenuHelper::get_item_help_id(rIdent);
-#else
-(void)rIdent;
-std::abort();
-return OString();
-#endif
-}
-
#if GTK_CHECK_VERSION(4, 0, 0)
static void action_activated(GSimpleAction*, GVariant* pParameter,
gpointer widget)
{
@@ -10208,16 +10177,6 @@ public:
MenuHelper::set_item_visible(rIdent, bVisible);
}
-virtual void set_item_help_id(const OString& rIdent, const OString&
rHelpId) override
-{
-MenuHelper::set_item_help_id(rIdent, rHelpId);
-}
-
-virtual OString get_item_help_id(const OString& rIdent) const override
-{
-return MenuHelper::get_item_help_id(rIdent);
-}
-
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/python/scriptforge.py | 16 ++-- wizards/source/sfdocuments/SF_Document.xba | 74 -- wizards/source/sfdocuments/SF_Writer.xba | 76 ++- 3 files changed, 83 insertions(+), 83 deletions(-) New commits: commit f3657a886d99a56366104335b0c4939ac0d0cb57 Author: Jean-Pierre Ledure AuthorDate: Wed Jul 7 13:09:43 2021 +0200 Commit: Jean-Pierre Ledure CommitDate: Wed Jul 7 14:31:04 2021 +0200 ScriptForge - (SF_Writer) move Forms() method from SF_Document The Forms() method was placed in the SF_Document service but was applicable only on Writer documents Now it is placed correctly in the recently created Writer service. Effective in Basic and Python. Additionally redundant parentheses have been removed in scriptforge.py Change-Id: I0d328b40577ddf81a188fdf72611f84751bcb506 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118559 Tested-by: Jean-Pierre Ledure Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/scriptforge/python/scriptforge.py b/wizards/source/scriptforge/python/scriptforge.py index 689d4a9276ec..55584406bef3 100644 --- a/wizards/source/scriptforge/python/scriptforge.py +++ b/wizards/source/scriptforge/python/scriptforge.py @@ -1557,7 +1557,7 @@ class SFDatabases: """ Transform positional and keyword arguments into positional only """ -return (filename, registrationname, readonly, user, password) +return filename, registrationname, readonly, user, password def CloseDatabase(self): return self.ExecMethod(self.vbMethod, 'CloseDatabase') @@ -1631,7 +1631,7 @@ class SFDialogs: Transform positional and keyword arguments into positional only Add the XComponentContext as last argument """ -return (container, library, dialogname, ScriptForge.componentcontext) +return container, library, dialogname, ScriptForge.componentcontext def Activate(self): return self.ExecMethod(self.vbMethod, 'Activate') @@ -1740,7 +1740,7 @@ class SFDocuments: """ Transform positional and keyword arguments into positional only """ -return (windowname,) +return windowname, def Activate(self): return self.ExecMethod(self.vbMethod, 'Activate') @@ -1748,9 +1748,6 @@ class SFDocuments: def CloseDocument(self, saveask = True): return self.ExecMethod(self.vbMethod, 'CloseDocument', saveask) -def Forms(self, form = ''): -return self.ExecMethod(self.vbMethod + self.flgArrayRet, 'Forms', form) - def RunCommand(self, command): return self.ExecMethod(self.vbMethod, 'RunCommand', command) @@ -1786,7 +1783,7 @@ class SFDocuments: """ Transform positional and keyword arguments into positional only """ -return (windowname,) +return windowname, def CloseDocument(self, saveask = True): return self.ExecMethod(self.vbMethod, 'CloseDocument', saveask) @@ -1832,7 +1829,7 @@ class SFDocuments: """ Transform positional and keyword arguments into positional only """ -return (windowname,) +return windowname, # Next functions are implemented in Basic as read-only properties with 1 argument def Height(self, rangename): @@ -2097,6 +2094,9 @@ class SFDocuments: """ return (windowname,) +def Forms(self, form = ''): +return self.ExecMethod(self.vbMethod + self.flgArrayRet, 'Forms', form) + # ##False## # CreateScriptService() ### diff --git a/wizards/source/sfdocuments/SF_Document.xba b/wizards/source/sfdocuments/SF_Document.xba index 3894d0fccb5b..849b357e643e 100644 --- a/wizards/source/sfdocuments/SF_Document.xba +++ b/wizards/source/sfdocuments/SF_Document.xba @@ -459,80 +459,6 @@ Catch: GoTo Finally End Function ' SFDocuments.SF_Document.CloseDocument -REM - -Public Function Forms(Optional ByVal Form As Variant) As Variant -''' APPLICABLE ONLY ON WRITER DOCUMENTS -''' Return either -''' - the list of the Forms contained in the form document -''' - a SFDocuments.Form object based on its name or its index -''' Args: -''' Form: a form stored in the document given by its name or its index -''' When absent, the list of ava
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/uicalc/data/tdf126685.ods |binary
sc/qa/unit/uicalc/uicalc.cxx | 18 ++
2 files changed, 18 insertions(+)
New commits:
commit d9d86730a6acbb7fe1c94d7bf8b58b81ab51b4a6
Author: shubham656
AuthorDate: Sun Jun 27 15:37:04 2021 +0530
Commit: Xisco Fauli
CommitDate: Wed Jul 7 13:54:58 2021 +0200
tdf#126685 Add UnitTest
Change-Id: I84feb90f63f947a20db06cc66dd0f610fa71e7ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117945
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/uicalc/data/tdf126685.ods
b/sc/qa/unit/uicalc/data/tdf126685.ods
new file mode 100644
index ..bb08e47635e2
Binary files /dev/null and b/sc/qa/unit/uicalc/data/tdf126685.ods differ
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index d133876f6d04..3b3bdadbd4e2 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -824,6 +824,24 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf133326)
CPPUNIT_ASSERT_EQUAL(static_cast(2), pDoc->GetTableCount());
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf126685)
+{
+ScModelObj* pModelObj = createDoc("tdf126685.ods");
+
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {}); // test should crash
here without the fix
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Control Height will change from 0.65 to 0.61 cm with 120dpi
..."),
+pDoc->GetString(ScAddress(3, 1, 1)));
+dispatchCommand(mxComponent, ".uno:Cut", {});
+
+CPPUNIT_ASSERT_EQUAL(OUString(""), pDoc->GetString(ScAddress(3, 1, 1)));
+}
+
CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf119793)
{
ScModelObj* pModelObj = createDoc("tdf119793.ods");
___
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' - officecfg/registry vcl/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |3 +++
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8
vcl/source/gdi/pdfwriter_impl.cxx |5 +++--
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 8c1a2c275b31cbdb3fbec10080851f43c87f7068
Author: Armin Le Grand (Allotropia)
AuthorDate: Wed Jul 7 11:27:55 2021 +0200
Commit: Armin Le Grand (Allotropia)
CommitDate: Wed Jul 7 11:27:55 2021 +0200
Disable PDF-to-PDF embedding on PDF export (hack), part II
Adapted 899a52b236b81a94367ec8bafdff891a67d818aa to use
officecfg::Office::Common::VCL::AllowPdfToPdfEmbedding
instead of LIBO_ALLOW_PDF_TO_PDF_EMBEDDING
Change-Id: I42e3d9a474400ec488352c081620a9b31cde3562
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 5f99ddc036bd..ab7986d388b5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -60,6 +60,9 @@
false
true
+
+ false
+
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index cc7fd9f2d85d..b0c738194f25 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -857,6 +857,14 @@
false
+
+
+ Specifies if at PDF export it is allowed to embed other PDFs
which are
+ part of the Document in their original form or use another form
of graphic
+ representation, e.g. pixel graphic.
+
+false
+
Specifies if OpenGL rendering should be used in VCL backends
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index eadd646cb5d1..9173a94ab0dd 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -80,6 +80,7 @@
#include
#include
#include
+#include
#include "pdfwriter_impl.hxx"
@@ -9338,7 +9339,7 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic&
rGraphic, ReferenceXObject
// no pdf data.
rEmit.m_nBitmapObject = nBitmapObject;
-static bool bAllowPdfToPdf(nullptr !=
getenv("LIBO_ALLOW_PDF_TO_PDF_EMBEDDING"));
+static bool
bAllowPdfToPdf(officecfg::Office::Common::VCL::AllowPdfToPdfEmbedding::get());
const bool bHasPdfDFata(bAllowPdfToPdf && rGraphic.hasPdfData());
if (!bHasPdfDFata)
return;
@@ -9408,7 +9409,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData,
bool bIsTrueColor, const
{
m_aJPGs.emplace( m_aJPGs.begin() );
JPGEmit& rEmit = m_aJPGs.front();
-static bool bAllowPdfToPdf(nullptr !=
getenv("LIBO_ALLOW_PDF_TO_PDF_EMBEDDING"));
+static bool
bAllowPdfToPdf(officecfg::Office::Common::VCL::AllowPdfToPdfEmbedding::get());
const bool bHasPdfDFata(bAllowPdfToPdf && rGraphic.hasPdfData());
if (!bHasPdfDFata || m_aContext.UseReferenceXObject)
rEmit.m_nObject = createObject();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c904eb726e7261a0fcb65d8637f73e5dbc27211f Author: Caolán McNamara AuthorDate: Wed Jul 7 12:21:06 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jul 7 13:21:06 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 147ed04e1bff695f9242d5991334d1c8ddd7435a - set the extended tooltip explicitly for each of the form 1-9 menu items in the load/save chapter (outline numbering) menubutton menu so the code for that can be simplified Change-Id: Id954bbe39b997b77cf5d17330a651712ea9d5fcb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118560 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 28d20be2d79c..147ed04e1bff 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 28d20be2d79c99bbfd5fedea5c4b2af9d22a29c0 +Subproject commit 147ed04e1bff695f9242d5991334d1c8ddd7435a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/0606.xhp | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 147ed04e1bff695f9242d5991334d1c8ddd7435a Author: Caolán McNamara AuthorDate: Wed Jul 7 12:15:57 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 7 13:21:06 2021 +0200 set the extended tooltip explicitly for each of the form 1-9 menu items in the load/save chapter (outline numbering) menubutton menu so the code for that can be simplified Change-Id: Id954bbe39b997b77cf5d17330a651712ea9d5fcb Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118560 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/source/text/swriter/01/0606.xhp b/source/text/swriter/01/0606.xhp index b67f9c8a5..94e796d6f 100644 --- a/source/text/swriter/01/0606.xhp +++ b/source/text/swriter/01/0606.xhp @@ -47,10 +47,18 @@ Load/Save Saves or loads a chapter numbering format. A saved chapter numbering format is available to load into other text documents. The Load/Save button is only available for chapter numbering. Use List styles to save formatting for ordered or unordered lists. - + + + + + + + + + Untitled 1 - 9 -Select a predefined numbering format. Save your own predefined numbering formats using Save As. +Select a predefined numbering format. Save your own predefined numbering formats using Save As. Save As ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 24
1 file changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 10b0bea130a18e1573f7cb5c997917442208f31a
Author: Caolán McNamara
AuthorDate: Wed Jul 7 11:18:19 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 13:20:24 2021 +0200
gtk4: implement get_item_label for GMenuModel
Change-Id: Ia8c893502c1546ae77b03a59ce2798b99340cf72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118556
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 535644fb528f..d80e1a78fbd0 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9370,7 +9370,7 @@ private:
}
}
-std::pair find_id(GMenuModel* pMenuModel, const OString&
rId)
+static std::pair find_id(GMenuModel* pMenuModel, const
OString& rId)
{
for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i <
nCount; ++i)
{
@@ -9402,7 +9402,7 @@ private:
return std::make_pair(nullptr, -1);
}
-bool remove_id(GMenuModel* pMenuModel, const OString& rId)
+static bool remove_id(GMenuModel* pMenuModel, const OString& rId)
{
std::pair aRes = find_id(pMenuModel, rId);
if (!aRes.first)
@@ -9761,8 +9761,24 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
return MenuHelper::get_item_label(rIdent);
#else
-(void)rIdent;
-std::abort();
+GtkPopover* pPopover = gtk_menu_button_get_popover(m_pMenuButton);
+if (GMenuModel* pMenuModel = GTK_IS_POPOVER_MENU(pPopover) ?
+
gtk_popover_menu_get_menu_model(GTK_POPOVER_MENU(pPopover)) :
+ nullptr)
+{
+std::pair aRes = find_id(pMenuModel, rIdent);
+if (!aRes.first)
+return OUString();
+
+// clone the original item to query its label
+GMenuItem* pMenuItem = g_menu_item_new_from_model(aRes.first,
aRes.second);
+char *pLabel = nullptr;
+g_menu_item_get_attribute(pMenuItem, G_MENU_ATTRIBUTE_LABEL, "&s",
&pLabel);
+OUString aRet(pLabel, pLabel ? strlen(pLabel) : 0,
RTL_TEXTENCODING_UTF8);
+g_free(pLabel);
+g_object_unref(pMenuItem);
+return aRet;
+}
return OUString();
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit bcd39bc1e36c06ce1221a9d981363c292b614938
Author: Caolán McNamara
AuthorDate: Wed Jul 7 11:08:28 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 13:20:10 2021 +0200
gtk4: implement set_item_label for GMenuModel
Change-Id: Iee721fa9f50b2884b2d0e726c36d6821e135a561
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118555
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8495612b3c82..535644fb528f 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9664,7 +9664,10 @@ public:
GMenuItem* pMenuItem =
g_menu_item_new_from_model(pSectionModel, i);
g_menu_prepend_item(pNewSection, pMenuItem);
g_menu_remove(G_MENU(pSectionModel), i);
+g_object_unref(pMenuItem);
}
+g_object_unref(pSectionItem);
+g_object_unref(pNewSection);
}
}
}
@@ -9734,8 +9737,22 @@ public:
MenuHelper::set_item_label(rIdent, rLabel);
#else
-(void)rIdent; (void)rLabel;
-std::abort();
+GtkPopover* pPopover = gtk_menu_button_get_popover(m_pMenuButton);
+if (GMenuModel* pMenuModel = GTK_IS_POPOVER_MENU(pPopover) ?
+
gtk_popover_menu_get_menu_model(GTK_POPOVER_MENU(pPopover)) :
+ nullptr)
+{
+std::pair aRes = find_id(pMenuModel, rIdent);
+if (!aRes.first)
+return;
+// clone the original item, remove the original, insert the
replacement at
+// the original location
+GMenuItem* pMenuItem = g_menu_item_new_from_model(aRes.first,
aRes.second);
+g_menu_remove(G_MENU(aRes.first), aRes.second);
+g_menu_item_set_label(pMenuItem,
MapToGtkAccelerator(rLabel).getStr());
+g_menu_insert_item(G_MENU(aRes.first), aRes.second, pMenuItem);
+g_object_unref(pMenuItem);
+}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 29 +++--
vcl/unx/gtk4/convert3to4.cxx |4
2 files changed, 23 insertions(+), 10 deletions(-)
New commits:
commit 5933071ec7cb34c064206c8e81998a5f99d9aa8b
Author: Caolán McNamara
AuthorDate: Wed Jul 7 10:56:09 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 13:19:55 2021 +0200
gtk4: rework remove_id to extract a standalone find_id
Change-Id: I08ce91b78a09ad2db1c8e1aa09abc50fd61e177d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118554
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 2f3c9f8da9bd..8495612b3c82 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9370,7 +9370,7 @@ private:
}
}
-bool remove_id(GMenuModel* pMenuModel, const OString& rId)
+std::pair find_id(GMenuModel* pMenuModel, const OString&
rId)
{
for (int i = 0, nCount = g_menu_model_get_n_items(pMenuModel); i <
nCount; ++i)
{
@@ -9383,23 +9383,32 @@ private:
}
if (sTarget == rId)
-{
-g_menu_remove(G_MENU(pMenuModel), i);
-return true;
-}
+return std::make_pair(pMenuModel, i);
if (GMenuModel* pSectionModel =
g_menu_model_get_item_link(pMenuModel, i, G_MENU_LINK_SECTION))
{
-if (remove_id(pSectionModel, rId))
-return true;
+std::pair aRet = find_id(pSectionModel, rId);
+if (aRet.first)
+return aRet;
}
if (GMenuModel* pSubMenuModel =
g_menu_model_get_item_link(pMenuModel, i, G_MENU_LINK_SUBMENU))
{
-if (remove_id(pSubMenuModel, rId))
-return true;
+std::pair aRet = find_id(pSubMenuModel, rId);
+if (aRet.first)
+return aRet;
}
}
-return false;
+
+return std::make_pair(nullptr, -1);
+}
+
+bool remove_id(GMenuModel* pMenuModel, const OString& rId)
+{
+std::pair aRes = find_id(pMenuModel, rId);
+if (!aRes.first)
+return false;
+g_menu_remove(G_MENU(aRes.first), aRes.second);
+return true;
}
#endif
commit 4c56e02c71cbd0aa374afb5b9f8e2540b0d1149e
Author: Caolán McNamara
AuthorDate: Wed Jul 7 10:33:24 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 13:19:42 2021 +0200
gtk4: convert GtkRadioToolButton to GtkCheckButton
Change-Id: If09508de92aba82ea414cd2fb7b7029e96aaf2f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118553
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index cf6ddef2e8a2..9d7fd36ae543 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1163,6 +1163,10 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
{
xClass->setNodeValue("GtkMenuButton");
}
+else if (sClass == "GtkRadioToolButton")
+{
+xClass->setNodeValue("GtkCheckButton");
+}
else if (sClass == "GtkToggleToolButton")
{
xClass->setNodeValue("GtkToggleButton");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2ca614be3eb65d852b2c811c853b754e5e5ecb36
Author: Noel Grandin
AuthorDate: Tue Jul 6 18:52:16 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 7 13:10:53 2021 +0200
tdf#132740 bypass work if selection has not changed
takes 10% of the time off
Change-Id: Ia0a2f4469088e103f162b7d85abb7fadc5f365cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118532
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 9fb5ce8d8897..22421c226234 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -241,6 +241,9 @@ const OutlinerViewShell* ImpEditView::GetViewShell() const
void ImpEditView::SetEditSelection( const EditSelection& rEditSelection )
{
+if (aEditSelection == rEditSelection)
+return;
+
// set state before notification
aEditSelection = rEditSelection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a32449722c38ab59845ce451c231d82dafb1b58 Author: Caolán McNamara AuthorDate: Wed Jul 7 12:10:15 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jul 7 13:10:15 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 28d20be2d79c99bbfd5fedea5c4b2af9d22a29c0 - the button in outline (chapter) numbering is now called 'format' not 'user' Change-Id: I330a8c1b179921724c9c6d427b700eafcafb7814 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118558 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 6be958e96182..28d20be2d79c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6be958e9618242079c2c674297670ca5797a21c2 +Subproject commit 28d20be2d79c99bbfd5fedea5c4b2af9d22a29c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/0606.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 28d20be2d79c99bbfd5fedea5c4b2af9d22a29c0 Author: Caolán McNamara AuthorDate: Wed Jul 7 12:06:05 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 7 13:10:15 2021 +0200 the button in outline (chapter) numbering is now called 'format' not 'user' Change-Id: I330a8c1b179921724c9c6d427b700eafcafb7814 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118558 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/source/text/swriter/01/0606.xhp b/source/text/swriter/01/0606.xhp index 0a73ad51f..b67f9c8a5 100644 --- a/source/text/swriter/01/0606.xhp +++ b/source/text/swriter/01/0606.xhp @@ -42,10 +42,10 @@ If you want numbered headings, choose Tools - Chapter Numbering. This command opens a dialog where numbering schemes can be assigned to paragraph styles used for headings. Do not use the Toggle Ordered List icon on the Formatting Bar or the Format - Bullets and Numbering dialog. - + Load/Save -Saves or loads a chapter numbering format. A saved chapter numbering format is available to load into other text documents. +Saves or loads a chapter numbering format. A saved chapter numbering format is available to load into other text documents. The Load/Save button is only available for chapter numbering. Use List styles to save formatting for ordered or unordered lists. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ecbc076b66988581962734e0f3571ae39cdf72b9
Author: Szymon Kłos
AuthorDate: Wed Jul 7 12:19:12 2021 +0200
Commit: Szymon Kłos
CommitDate: Wed Jul 7 13:08:46 2021 +0200
jsdialog: send type for popup messages
Change-Id: Ic0f189645dc9a1164cbbc528b3a5d30d72ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118552
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 474a0e1de3f5..c8c15f5b624e 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -253,6 +253,7 @@ JSDialogNotifyIdle::generateClosePopupMessage(OUString
sWindowId) const
return aJsonWriter;
aJsonWriter->put("jsontype", "dialog");
+aJsonWriter->put("type", "modalpopup");
aJsonWriter->put("action", "close");
aJsonWriter->put("id", sWindowId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/ct2n officecfg/registry postprocess/CustomTarget_registry.mk readlicense_oo/license sysui/desktop
external/ct2n/README |2 +-
external/ct2n/description-en-US.txt|2 +-
officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu |2 +-
postprocess/CustomTarget_registry.mk |4 ++--
readlicense_oo/license/license.xml |8
sysui/desktop/man/unopkg.1 |2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit c4b5cdd54d9eb70c6ae56d4148674fc07469f79d
Author: Stéphane Guillou
AuthorDate: Fri Jul 2 22:57:00 2021 +1000
Commit: Christian Lohmaier
CommitDate: Wed Jul 7 12:45:35 2021 +0200
tdf#133368: update extensions website URLs and use https
Change-Id: Idcdb5dbb4f0754425eeca4b137fa1626bba9ef6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118340
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/external/ct2n/README b/external/ct2n/README
index 7d5d278883ff..dd3c09bfbffd 100644
--- a/external/ct2n/README
+++ b/external/ct2n/README
@@ -1,4 +1,4 @@
-From
[http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates].
+From
[https://extensions.libreoffice.org/en/extensions/show/ct2n-convert-text-to-number-and-dates].
ConvertTextToNumber replaces numbers and dates, formatted
as text, with real numbers.
\ No newline at end of file
diff --git a/external/ct2n/description-en-US.txt
b/external/ct2n/description-en-US.txt
index a91393b5acf5..931d579dcee3 100644
--- a/external/ct2n/description-en-US.txt
+++ b/external/ct2n/description-en-US.txt
@@ -1,4 +1,4 @@
-From
[http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates].
+From
[https://extensions.libreoffice.org/en/extensions/show/ct2n-convert-text-to-number-and-dates].
ConvertTextToNumber replaces numbers and dates, formatted
as text, with real numbers.
diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index 77eda6f839d6..85a61821ada2 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -20,7 +20,7 @@
http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:install="http://openoffice.org/2004/installation";
oor:name="ExtensionManager" oor:package="org.openoffice.Office">
- http://extensions.libreoffice.org/
+ https://extensions.libreoffice.org/
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index 37de50bcbe56..bb4a1841962d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -573,9 +573,9 @@ postprocess_main_SED := \
-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \
-e
's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g'
\
- -e
's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \
+ -e
's,$${STARTCENTER_ADDFEATURE_URL},https://extensions.libreoffice.org/,g' \
-e 's,$${STARTCENTER_INFO_URL},https://www.libreoffice.org/,g' \
- -e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g'
\
+ -e
's,$${STARTCENTER_TEMPLREP_URL},https://extensions.libreoffice.org/template-center/,g'
\
-e 's,$${SYSTEM_LIBEXTTEXTCAT_DATA},$(SYSTEM_LIBEXTTEXTCAT_DATA),g' \
-e 's,$${SYSTEM_LIBNUMBERTEXT_DATA},$(SYSTEM_LIBNUMBERTEXT_DATA),g' \
-e 's,$${PRIVACY_POLICY_URL},$(PRIVACY_POLICY_URL),g' \
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index 02a91d7c1daf..2a27cab23b37 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -3716,9 +3716,9 @@
terms of the GNU Lesser General Public License version 3 (LGPLv3), as
published by the Free Software
Foundation, and Mozilla Public License as published by The Mozilla
Foundation. The credits are available at
http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico";>http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico/
+
"https://pt-br.libreoffice.org/projetos/vero";>https://pt-br.libreoffice.org/projetos/vero/
and you can find new releases at http://extensions.libreoffice.org/";>http://extensions.libreoffice.org
+
"https://extensions.libreoffice.org/";>https://extensions.libreoffice.org
Copyright (C) 2006 - 2013 by Raimundo Santos Moura
Jump to LGPL Version 3
Jump to MPL Version 1.1
@@ -3729,9 +3729,9 @@
under the terms of the GNU Lesser General Publ
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79fc07c10197fdbcdc1416d816a5a7c3c09c4d15 Author: Martin Srebotnjak AuthorDate: Wed Jul 7 12:27:55 2021 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 7 12:27:55 2021 +0200 Update git submodules * Update translations from branch 'libreoffice-7-2' to 28f0646cc41ef976de183d828061e73886887904 - Update Slovenian translation Change-Id: Id555bacc7a2931705b8cdc9d9221c86518e0a12c diff --git a/translations b/translations index 2da3ebadd851..28f0646cc41e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2da3ebadd8519e7c67fc9ea0d8d572f69047e332 +Subproject commit 28f0646cc41ef976de183d828061e73886887904 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2' - source/sl
source/sl/cui/messages.po | 104 +-- source/sl/helpcontent2/source/auxiliary.po|4 source/sl/helpcontent2/source/text/sbasic/shared.po | 12 source/sl/helpcontent2/source/text/sbasic/shared/03.po| 298 -- source/sl/helpcontent2/source/text/scalc/00.po| 12 source/sl/helpcontent2/source/text/scalc/01.po| 12 source/sl/helpcontent2/source/text/sdraw/01.po|4 source/sl/helpcontent2/source/text/shared/guide.po|4 source/sl/helpcontent2/source/text/simpress/01.po |4 source/sl/helpcontent2/source/text/swriter/01.po |6 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 17 source/sl/sc/messages.po |4 source/sl/sd/messages.po | 24 source/sl/svx/messages.po | 36 - source/sl/sw/messages.po |8 15 files changed, 168 insertions(+), 381 deletions(-) New commits: commit 28f0646cc41ef976de183d828061e73886887904 Author: Martin Srebotnjak AuthorDate: Wed Jul 7 12:27:43 2021 +0200 Commit: Andras Timar CommitDate: Wed Jul 7 12:27:43 2021 +0200 Update Slovenian translation Change-Id: Id555bacc7a2931705b8cdc9d9221c86518e0a12c diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index 23153768c08..f0a7465852d 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 7.2\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-18 10:44+0200\n" +"POT-Creation-Date: 2021-07-07 10:09+0200\n" "PO-Revision-Date: 2021-06-19 08:50+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -4931,252 +4931,252 @@ msgctxt "bulletandposition|DrawPRTLDialog" msgid "Bullets and Numbering" msgstr "Označevanje in oštevilčevanje" -#: cui/uiconfig/ui/bulletandposition.ui:220 +#: cui/uiconfig/ui/bulletandposition.ui:221 msgctxt "bulletandposition|label1" msgid "Level" msgstr "Raven" -#: cui/uiconfig/ui/bulletandposition.ui:263 +#: cui/uiconfig/ui/bulletandposition.ui:264 msgctxt "bulletandposition|label4" msgid "Type:" msgstr "Vrsta:" -#: cui/uiconfig/ui/bulletandposition.ui:279 +#: cui/uiconfig/ui/bulletandposition.ui:280 msgctxt "bulletandposition|extended_tip|numfmtlb" msgid "Select the level(s) that you want to modify. To apply the options to all the levels, select “1-10”." msgstr "Izberite raven oz. ravni, ki jih želite spremeniti. Če želite uporabiti možnosti oštevilčevanja za vse ravni, izberite »1-10«." -#: cui/uiconfig/ui/bulletandposition.ui:292 +#: cui/uiconfig/ui/bulletandposition.ui:293 msgctxt "bulletandposition|startatft" msgid "Start at:" msgstr "Začni z:" -#: cui/uiconfig/ui/bulletandposition.ui:308 +#: cui/uiconfig/ui/bulletandposition.ui:309 msgctxt "bulletandposition|startat" msgid "1" msgstr "1" -#: cui/uiconfig/ui/bulletandposition.ui:314 +#: cui/uiconfig/ui/bulletandposition.ui:315 msgctxt "bulletandposition|extended_tip|startat" msgid "For ordered lists, select the value of first item of the list." msgstr "Izberite številko prvega elementa na urejenem seznamu." -#: cui/uiconfig/ui/bulletandposition.ui:327 +#: cui/uiconfig/ui/bulletandposition.ui:328 msgctxt "bulletandposition|bulletft" msgid "Character:" msgstr "Znak:" -#: cui/uiconfig/ui/bulletandposition.ui:339 +#: cui/uiconfig/ui/bulletandposition.ui:340 msgctxt "bulletandposition|bullet" msgid "Select..." msgstr "Izberi ..." -#: cui/uiconfig/ui/bulletandposition.ui:345 +#: cui/uiconfig/ui/bulletandposition.ui:346 msgctxt "bulletandposition|extended_tip|bullet" msgid "Select the character for the unordered list." msgstr "Izberite znak za neurejeni seznam." -#: cui/uiconfig/ui/bulletandposition.ui:356 +#: cui/uiconfig/ui/bulletandposition.ui:357 msgctxt "bulletandposition|bitmap" msgid "Select image..." msgstr "Izberi sliko ..." -#: cui/uiconfig/ui/bulletandposition.ui:368 +#: cui/uiconfig/ui/bulletandposition.ui:369 msgctxt "bulletandposition|extended_tip|bitmap" msgid "Select a graphic bullet." msgstr "Izberite grafično oznako." -#: cui/uiconfig/ui/bulletandposition.ui:381 +#: cui/uiconfig/ui/bulletandposition.ui:382 msgctxt "bulletandposition|colorft" msgid "Color:" msgstr "Barva:" -#: cui/uiconfig/ui/bulletandposition.ui:403 +#: cui/uiconfig/ui/bulletandposition.ui:405
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/helper/tagwindowasmodified.hxx|8 +-
framework/source/helper/tagwindowasmodified.cxx | 96 +++-
2 files changed, 36 insertions(+), 68 deletions(-)
New commits:
commit 3e942e40a6c175e4e42a16be83191bc5e01f43b9
Author: Noel Grandin
AuthorDate: Tue Jul 6 18:53:35 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 7 12:08:47 2021 +0200
tdf#132740 improve TagWindowAsModified
makes a small difference
(*) Use strong ref instead of weak ref, because weak ref is expensive to
access
(*) to make that work, fix dispose()
(*) cache the vcl::Window to avoid expensive VCLUnoHelper::GetWindow
Change-Id: Ida7a060d729633a0feb326697509d90052bca1f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118533
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/helper/tagwindowasmodified.hxx
b/framework/inc/helper/tagwindowasmodified.hxx
index ee06ed6d6e44..1528c63c5b18 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -23,9 +23,11 @@
#include
#include
#include
+#include
#include
#include
+#include
namespace framework{
@@ -51,13 +53,13 @@ class TagWindowAsModified final : public
::cppu::WeakImplHelper<
private:
/// reference to the frame, where we listen for new loaded documents
for updating our own xModel reference
-css::uno::WeakReference< css::frame::XFrame > m_xFrame;
+css::uno::Reference< css::frame::XFrame > m_xFrame;
/// reference to the frame container window, where we must set the tag
-css::uno::WeakReference< css::awt::XWindow > m_xWindow;
+VclPtr m_xWindow;
/// we list on the model for modify events
-css::uno::WeakReference< css::frame::XModel > m_xModel;
+css::uno::Reference< css::util::XModifiable > m_xModel;
// interface
diff --git a/framework/source/helper/tagwindowasmodified.cxx
b/framework/source/helper/tagwindowasmodified.cxx
index 93f2ace64c99..33a722a725eb 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
#include
@@ -47,52 +46,31 @@ void SAL_CALL TagWindowAsModified::initialize(const
css::uno::Sequence< css::uno
if (lArguments.hasElements())
lArguments[0] >>= xFrame;
-if ( ! xFrame.is ())
+if (!xFrame)
return;
-{
-SolarMutexGuard g;
-m_xFrame = xFrame;
-}
-
+m_xFrame = xFrame;
xFrame->addFrameActionListener(this);
impl_update (xFrame);
}
void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject&
aEvent)
{
-css::uno::Reference< css::util::XModifiable > xModel;
-css::uno::Reference< css::awt::XWindow > xWindow;
-{
-SolarMutexGuard g;
-xModel.set(m_xModel.get (), css::uno::UNO_QUERY);
-xWindow.set(m_xWindow.get(), css::uno::UNO_QUERY);
-if (
-( ! xModel.is () ) ||
-( ! xWindow.is () ) ||
-(aEvent.Source != xModel)
-)
-return;
-}
+if (!m_xModel || !m_xWindow || aEvent.Source != m_xModel)
+return;
-bool bModified = xModel->isModified ();
+bool bModified = m_xModel->isModified ();
// SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
-VclPtr pWindow = VCLUnoHelper::GetWindow(xWindow);
-if ( ! pWindow)
-return;
-
-bool bSystemWindow = pWindow->IsSystemWindow();
-bool bWorkWindow = (pWindow->GetType() == WindowType::WORKWINDOW);
-if (!bSystemWindow && !bWorkWindow)
+if (m_xWindow->isDisposed())
return;
if (bModified)
-pWindow->SetExtendedStyle(WindowExtendedStyle::DocModified);
+m_xWindow->SetExtendedStyle(WindowExtendedStyle::DocModified);
else
-pWindow->SetExtendedStyle(WindowExtendedStyle::NONE);
+m_xWindow->SetExtendedStyle(WindowExtendedStyle::NONE);
// <- SYNCHRONIZED
}
@@ -104,43 +82,26 @@ void SAL_CALL TagWindowAsModified::frameAction(const
css::frame::FrameActionEven
)
return;
-css::uno::Reference< css::frame::XFrame > xFrame;
-{
-SolarMutexGuard g;
-xFrame.set(m_xFrame.get(), css::uno::UNO_QUERY);
-if (
-( ! xFrame.is ()) ||
-(aEvent.Source != xFrame)
-)
-return;
-}
+if ( aEvent.Source != m_xFrame )
+return;
-impl_update (xFrame);
+impl_update (m_xFrame);
}
void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject&
aEvent)
{
SolarMutexGuard g;
-css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(),
css::uno::UNO_QUERY);
-if (xFrame.is())
-xFrame->addFrameActionListener(this);
-
-if (
-(xFrame.is () ) &&
-(aEvent.Source
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 73c9ef661d9ef6237d3fd3c259fd040a545b44cf
Author: Noel Grandin
AuthorDate: Tue Jul 6 18:51:38 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 7 12:06:29 2021 +0200
tdf#132740 don't broadcast if modified status has not changed
take 10% of the time off
Change-Id: I75c8d5e1297de342df711d15260073db59946116
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118531
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 99a7e22fbdc9..adaff884bcae 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2199,6 +2199,8 @@ void EditDoc::ClearSpellErrors()
void EditDoc::SetModified( bool b )
{
+if (bModified == b)
+return;
bModified = b;
if ( bModified )
{
___
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' - include/svx svx/inc svx/source
include/svx/strings.hrc| 16 +---
svx/inc/strings.hxx| 16 +---
svx/source/unodraw/unoprov.cxx | 23 +--
3 files changed, 47 insertions(+), 8 deletions(-)
New commits:
commit 6cc32198fa9204cd31df206c1a65f388cf79dd1f
Author: Gabor Kelemen
AuthorDate: Thu Jun 10 23:10:34 2021 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 7 11:39:40 2021 +0200
tdf#139301 tdf#141933 (related) Translate new preset dash names
Change-Id: I9cd7ad0eca1a6fb471a284fb2828a7ad12816337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117024
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 8b3ff370ab0fe2e7593a69513c8ff3df35810c4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118107
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 4ac04ffb2fea..c1bbf42205f8 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -910,7 +910,7 @@
#define RID_SVXSTR_BMP78
NC_("RID_SVXSTR_BMP78", "Solid Dotted")
#define RID_SVXSTR_DASH0
NC_("RID_SVXSTR_DASH0", "Dot")
#define RID_SVXSTR_DASH1
NC_("RID_SVXSTR_DASH1", "Long Dot")
-#define RID_SVXSTR_DASH2
NC_("RID_SVXSTR_DASH2", "Double Dot")
+#define RID_SVXSTR_DASH2
NC_("RID_SVXSTR_DASH2", "Dot (Rounded)")
#define RID_SVXSTR_DASH3
NC_("RID_SVXSTR_DASH3", "Dash")
#define RID_SVXSTR_DASH4
NC_("RID_SVXSTR_DASH4", "Long Dash")
#define RID_SVXSTR_DASH5
NC_("RID_SVXSTR_DASH5", "Double Dash")
@@ -928,8 +928,18 @@
#define RID_SVXSTR_DASH17
NC_("RID_SVXSTR_DASH17", "Ultrafine 2 Dots 3 Dashes")
#define RID_SVXSTR_DASH18
NC_("RID_SVXSTR_DASH18", "2 Dots 1 Dash")
#define RID_SVXSTR_DASH19
NC_("RID_SVXSTR_DASH19", "Line with Fine Dots")
-#define RID_SVXSTR_DASH20
NC_("RID_SVXSTR_DASH20", "Dashed")
-#define RID_SVXSTR_DASH21
NC_("RID_SVXSTR_DASH21", "Line Style")
+#define RID_SVXSTR_DASH20
NC_("RID_SVXSTR_DASH20", "Dash Dot")
+#define RID_SVXSTR_DASH21
NC_("RID_SVXSTR_DASH21", "Long Dot (Rounded)")
+#define RID_SVXSTR_DASH22
NC_("RID_SVXSTR_DASH22", "Dash Dot Dot")
+#define RID_SVXSTR_DASH23
NC_("RID_SVXSTR_DASH23", "Dash (Rounded)")
+#define RID_SVXSTR_DASH24
NC_("RID_SVXSTR_DASH24", "Long Dash (Rounded)")
+#define RID_SVXSTR_DASH25
NC_("RID_SVXSTR_DASH25", "Double Dash (Rounded)")
+#define RID_SVXSTR_DASH26
NC_("RID_SVXSTR_DASH26", "Dash Dot (Rounded)")
+#define RID_SVXSTR_DASH27
NC_("RID_SVXSTR_DASH27", "Long Dash Dot (Rounded)")
+#define RID_SVXSTR_DASH28
NC_("RID_SVXSTR_DASH28", "Double Dash Dot (Rounded)")
+#define RID_SVXSTR_DASH29
NC_("RID_SVXSTR_DASH29", "Dash Dot Dot (Rounded)")
+#define RID_SVXSTR_DASH30
NC_("RID_SVXSTR_DASH30", "Double Dash Dot Dot (Rounded)")
+
#define RID_SVXSTR_IMAP_ALL_FILTER
NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats")
// To translators: this is an arrow head style
#define RID_SVXSTR_LEND0
NC_("RID_SVXSTR_LEND0", "Concave short")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index dddaf3126ae0..876ee86314d5 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -318,7 +318,7 @@
// Reference-strings for standard-dash-table
#define RID_SVXSTR_DASH0_DEF"Dot"
#define RID_SVXSTR_DASH1_DEF"Long Dot"
-#define RID_SVXSTR_DASH2_DEF"Double Dot"
+#define RID_SVXSTR_DASH2_DEF"Dot (Rounded)"
#define RID_SVXSTR_DASH3_DEF"Dash"
#define RID_SVXSTR_DASH4_DEF"Long Dash"
#define RID_SVXSTR_DASH5_DEF"Double Dash"
@@ -336,8 +336,18 @@
#define RID_SVXSTR_DASH17_DEF "Ultrafine 2 Dots 3 Dashes"
#define RID_SVXSTR_DASH18_DEF "2 Dots 1 Dash"
#define RID_SVXSTR_DASH19_DEF "Line with Fine Dots"
-#define RID_SVXSTR_DASH20_DEF "Dash"
-#define RID_SVXSTR_DASH21_DEF "Line Style"
+#define RID_SVXSTR_DASH20_DEF "Dash Dot"
+#defin
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/jsdialog
vcl/jsdialog/jsdialogbuilder.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 181e970ad2699a8337ede6cb0583d4032a872b8c
Author: Szymon Kłos
AuthorDate: Wed Jul 7 11:13:06 2021 +0200
Commit: Szymon Kłos
CommitDate: Wed Jul 7 11:33:12 2021 +0200
jsdialog: don't send unnecessary close message
Change-Id: I4077c0871c7e6faf4917ad22a1a3aae8eb972961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118549
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 4b19764d8031..474a0e1de3f5 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1358,6 +1358,7 @@ JSToolbar::JSToolbar(JSDialogSender* pSender, ::ToolBox*
pToolbox, SalInstanceBu
void JSToolbar::set_menu_item_active(const OString& rIdent, bool bActive)
{
+bool bWasActive = get_menu_item_active(rIdent);
SalInstanceToolbar::set_menu_item_active(rIdent, bActive);
sal_uInt16 nItemId = m_xToolBox->GetItemId(OUString::fromUtf8(rIdent));
@@ -1376,7 +1377,7 @@ void JSToolbar::set_menu_item_active(const OString&
rIdent, bool bActive)
if (bActive)
sendPopup(pPopupRoot, m_xToolBox->get_id(),
OStringToOUString(rIdent,
RTL_TEXTENCODING_ASCII_US));
-else
+else if (bWasActive)
sendClosePopup(pPopupRoot->GetLOKWindowId());
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/NumberingManager.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 786d4d32e139d9cab4a6b5e4a59c1cd64b4d1da9
Author: Caolán McNamara
AuthorDate: Wed Jul 7 09:01:42 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 11:26:21 2021 +0200
ofz#35878 Null-dereference
Change-Id: I21725931777ff4ce8963db3af345c574645336ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118547
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index b8a511f83a6c..98c634511124 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -488,6 +488,8 @@ sal_uInt16 ListDef::GetChapterNumberingWeight() const
for (sal_Int8 nLevel = 0; nLevel < nAbstLevels; ++nLevel)
{
const ListLevel::Pointer pAbsLevel = m_pAbstractDef->GetLevel(nLevel);
+if (!pAbsLevel)
+continue;
const StyleSheetEntryPtr pParaStyle = pAbsLevel->GetParaStyle();
if (!pParaStyle)
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field2.cxx | 74 +-
1 file changed, 3 insertions(+), 71 deletions(-)
New commits:
commit 0d3ffda9615ad48679e61d606004de65154cdbfb
Author: Eike Rathke
AuthorDate: Wed Jul 7 00:22:15 2021 +0200
Commit: Eike Rathke
CommitDate: Wed Jul 7 10:38:57 2021 +0200
DateFormatter: use Date::AddDays(), AddMonths(), AddYears()
... that do all the checks and normalize.
Change-Id: Id3ffcf5146b25020ec808aa70240953d39328a82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118540
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 64cc39dfb276..d73e2d8900c4 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -1594,87 +1594,19 @@ OUString DateFormatter::ImplGetDateAsText( const Date&
rDate ) const
static void ImplDateIncrementDay( Date& rDate, bool bUp )
{
DateFormatter::ExpandCentury( rDate );
-
-if ( bUp )
-{
-if ( (rDate.GetDay() != 31) || (rDate.GetMonth() != 12) ||
(rDate.GetYear() != SAL_MAX_INT16) )
-++rDate;
-}
-else
-{
-if ( (rDate.GetDay() != 1 ) || (rDate.GetMonth() != 1) ||
(rDate.GetYear() != SAL_MIN_INT16) )
---rDate;
-}
+rDate.AddDays( bUp ? 1 : -1 );
}
static void ImplDateIncrementMonth( Date& rDate, bool bUp )
{
DateFormatter::ExpandCentury( rDate );
-
-sal_uInt16 nMonth = rDate.GetMonth();
-sal_Int16 nYear = rDate.GetYear();
-if ( bUp )
-{
-if ( (nMonth == 12) && (nYear < SAL_MAX_INT16) )
-{
-rDate.SetMonth( 1 );
-rDate.SetYear( rDate.GetNextYear() );
-}
-else
-{
-if ( nMonth < 12 )
-rDate.SetMonth( nMonth + 1 );
-}
-}
-else
-{
-if ( (nMonth == 1) && (nYear > SAL_MIN_INT16) )
-{
-rDate.SetMonth( 12 );
-rDate.SetYear( rDate.GetPrevYear() );
-}
-else
-{
-if ( nMonth > 1 )
-rDate.SetMonth( nMonth - 1 );
-}
-}
-
-sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( rDate.GetMonth(),
rDate.GetYear());
-if ( rDate.GetDay() > nDaysInMonth )
-rDate.SetDay( nDaysInMonth );
+rDate.AddMonths( bUp ? 1 : -1 );
}
static void ImplDateIncrementYear( Date& rDate, bool bUp )
{
DateFormatter::ExpandCentury( rDate );
-
-sal_Int16 nYear = rDate.GetYear();
-sal_uInt16 nMonth = rDate.GetMonth();
-if ( bUp )
-{
-if ( nYear < SAL_MAX_INT16 )
-rDate.SetYear( rDate.GetNextYear() );
-}
-else
-{
-if ( nYear > SAL_MIN_INT16 )
-rDate.SetYear( rDate.GetPrevYear() );
-}
-if (nMonth != 2)
-return;
-
-// Handle February 29 from leap year to non-leap year.
-sal_uInt16 nDay = rDate.GetDay();
-if (nDay > 28)
-{
-// The check would not be necessary if it was guaranteed that the
-// date was valid before and actually was a leap year,
-// de-/incrementing a leap year with 29 always results in 28.
-sal_uInt16 nDaysInMonth = Date::GetDaysInMonth( nMonth,
rDate.GetYear());
-if (nDay > nDaysInMonth)
-rDate.SetDay( nDaysInMonth);
-}
+rDate.AddYears( bUp ? 1 : -1 );
}
bool DateFormatter::ImplAllowMalformedInput() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/dataprovider/datatransformation.cxx | 46 +++
sc/source/ui/inc/dataproviderdlg.hxx |2
sc/source/ui/inc/datatransformation.hxx | 18
sc/source/ui/miscdlgs/dataproviderdlg.cxx| 55 +
sc/uiconfig/scalc/ui/findreplaceentry.ui | 94 +++
6 files changed, 214 insertions(+), 2 deletions(-)
New commits:
commit 1f88af544ffe17c58806a6b947803e1a2b3db378
Author: tushar
AuthorDate: Sun Jul 4 01:08:21 2021 +0530
Commit: Markus Mohrhard
CommitDate: Wed Jul 7 10:07:33 2021 +0200
Added Find and Replace Transformation .
Change-Id: I6ba0cd27bfd8b90923fb35d019fe0223bc9f07f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118384
Reviewed-by: Heiko Tietze
Reviewed-by: Markus Mohrhard
Tested-by: Jenkins
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 705aee221cbf..e19172e49bd3 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -169,6 +169,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/numbertransformationentry \
sc/uiconfig/scalc/ui/replacenulltransformationentry \
sc/uiconfig/scalc/ui/datetimetransformationentry \
+ sc/uiconfig/scalc/ui/findreplaceentry \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \
sc/uiconfig/scalc/ui/multipleoperationsdialog \
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx
b/sc/source/ui/dataprovider/datatransformation.cxx
index dfdc72375cb1..7e9d51fdc004 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -1170,6 +1170,52 @@ const std::set&
DateTimeTransformation::getColumn() const
return mnCol;
}
+FindReplaceTransformation::FindReplaceTransformation(SCCOL nCol, const
OUString& aFindString, const OUString& aReplaceString)
+: mnCol(nCol)
+, maFindString(aFindString)
+, maReplaceString(aReplaceString)
+{
+}
+
+void FindReplaceTransformation::Transform(ScDocument& rDoc) const
+{
+if (mnCol == -1)
+return;
+
+SCROW nEndRow = getLastRow(rDoc, mnCol);
+for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
+{
+CellType eType;
+rDoc.GetCellType(mnCol, nRow, 0, eType);
+if (eType != CELLTYPE_NONE)
+{
+OUString aStr = rDoc.GetString(mnCol, nRow, 0);
+if (aStr == maFindString)
+rDoc.SetString(mnCol, nRow, 0, maReplaceString);
+}
+}
+}
+
+TransformationType FindReplaceTransformation::getTransformationType() const
+{
+return TransformationType::FINDREPLACE_TRANSFORMATION;
+}
+
+SCCOL FindReplaceTransformation::getColumn() const
+{
+return mnCol;
+}
+
+const OUString& FindReplaceTransformation::getFindString() const
+{
+return maFindString;
+}
+
+const OUString& FindReplaceTransformation::getReplaceString() const
+{
+return maReplaceString;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/dataproviderdlg.hxx
b/sc/source/ui/inc/dataproviderdlg.hxx
index 582df71e5c22..5f275eace855 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -85,6 +85,8 @@ public:
void deletefromList(sal_uInt32 nIndex);
void replaceNullTransformation();
void dateTimeTransformation();
+void findReplaceTransformation();
+
void updateApplyBtn(bool bValidConfig);
void isValid();
diff --git a/sc/source/ui/inc/datatransformation.hxx
b/sc/source/ui/inc/datatransformation.hxx
index d5b19912e328..5c0741553f64 100644
--- a/sc/source/ui/inc/datatransformation.hxx
+++ b/sc/source/ui/inc/datatransformation.hxx
@@ -30,7 +30,8 @@ enum class TransformationType
AGGREGATE_FUNCTION,
NUMBER_TRANSFORMATION,
REMOVE_NULL_TRANSFORMATION,
-DATETIME_TRANSFORMATION
+DATETIME_TRANSFORMATION,
+FINDREPLACE_TRANSFORMATION
};
enum class TEXT_TRANSFORM_TYPE { TO_LOWER, TO_UPPER, CAPITALIZE, TRIM };
@@ -181,6 +182,21 @@ class SC_DLLPUBLIC DateTimeTransformation : public
DataTransformation
const std::set& getColumn() const;
};
+class SC_DLLPUBLIC FindReplaceTransformation : public DataTransformation
+{
+SCCOL mnCol;
+OUString maFindString;
+OUString maReplaceString;
+
+public:
+FindReplaceTransformation(SCCOL nCol, const OUString& aFindString,
const OUString& aReplaceString);
+virtual void Transform(ScDocument& rDoc) const override;
+virtual TransformationType getTransformationType() const override;
+SCCOL getColumn() const;
+const OUString & getFindString() const;
+const OUString & getReplaceString() const;
+};
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 757ea7
[Libreoffice-commits] core.git: basic/qa
basic/qa/basic_coverage/da-DK/cdbl-2.bas | 10 ++ basic/qa/basic_coverage/da-DK/cdbl.bas | 10 ++ basic/qa/basic_coverage/dateadd.bas |2 ++ basic/qa/basic_coverage/string_left_01.bas |1 + basic/qa/basic_coverage/string_right_01.bas |2 ++ basic/qa/basic_coverage/test_Date.bas |2 ++ basic/qa/basic_coverage/test_Property.GetLet.bas |1 + basic/qa/basic_coverage/test_Property.GetSet.bas |1 + basic/qa/basic_coverage/test_abs_method.bas |2 ++ basic/qa/basic_coverage/test_array_method.bas |2 ++ basic/qa/basic_coverage/test_asc_method.bas |2 ++ basic/qa/basic_coverage/test_atn_method.bas |2 ++ basic/qa/basic_coverage/test_beep_method.bas |2 ++ basic/qa/basic_coverage/test_cbool_method.bas |2 ++ basic/qa/basic_coverage/test_cbyte_method.bas |2 ++ basic/qa/basic_coverage/test_ccur_method.bas |2 ++ basic/qa/basic_coverage/test_cdate_method.bas |2 ++ basic/qa/basic_coverage/test_cdatetofromiso_methods.bas |2 ++ basic/qa/basic_coverage/test_cdatetounodatecdatefromunodate_methods.bas |2 ++ basic/qa/basic_coverage/test_cdatetounodatetimecdatefromunodatetime_methods.bas |2 ++ basic/qa/basic_coverage/test_cdatetounotimecdatefromunotime_methods.bas |2 ++ basic/qa/basic_coverage/test_cdbl_method.bas |2 ++ basic/qa/basic_coverage/test_chdircurdir_methods.bas |2 ++ basic/qa/basic_coverage/test_choose_method.bas |2 ++ basic/qa/basic_coverage/test_chr_method.bas |2 ++ basic/qa/basic_coverage/test_cint_method.bas |2 ++ basic/qa/basic_coverage/test_compatibilitymode_method.bas |2 ++ basic/qa/basic_coverage/test_converttofromurl_methods.bas |2 ++ basic/qa/basic_coverage/test_cossin_methods.bas |2 ++ basic/qa/basic_coverage/test_createobject_method.bas |1 + basic/qa/basic_coverage/test_createunolistener_method.bas |2 ++ basic/qa/basic_coverage/test_createunoservice_method.bas |2 ++ basic/qa/basic_coverage/test_createunostruct_method.bas |2 ++ basic/qa/basic_coverage/test_createunovalue_method.bas |2 ++ basic/qa/basic_coverage/test_csng_method.bas |2 ++ basic/qa/basic_coverage/test_cstr_method.bas |2 ++ basic/qa/basic_coverage/test_cvar_method.bas |2 ++ basic/qa/basic_coverage/test_cverr_method.bas |2 ++ basic/qa/basic_coverage/test_date_literal.bas |1 + basic/qa/basic_coverage/test_datedateadddatediff_methods.bas |2 ++ basic/qa/basic_coverage/test_datedatepartday_methods.bas |2 ++ basic/qa/basic_coverage/test_dimarray_method.bas |2 ++ basic/qa/basic_coverage/test_environ_method.bas |2 ++ basic/qa/basic_coverage/test_err_method.bas |2 ++ basic/qa/basic_coverage/test_falsetrue_method.bas |2 ++ basic/qa/basic_coverage/test_filedatetime_nonexistent.bas |3 +++ basic/qa/basic_coverage/test_filedatetime_nonexistent2.bas |3 +++ basic/qa/basic_coverage/test_fix_method.bas |2 ++ basic/qa/basic_coverage/test_frac_method.bas |2 ++ basic/qa/basic_coverage/test_freefile_method.bas |2 ++ basic/qa/basic_coverage/test_freelibrary_method.bas |2 ++ basic/qa/basic_coverage/test_getdefaultcontext_method.bas |2 ++ basic/qa/basic_coverage/test_getdialogzoomfactorx_method.bas |2 ++ basic/qa/basic_coverage/test_getdialogzoomfactory_method.bas |2 ++ basic/qa/basic_c
[Libreoffice-commits] core.git: wizards/Package_sfdocuments.mk wizards/source
wizards/Package_sfdocuments.mk |1
wizards/source/scriptforge/SF_Services.xba |8
wizards/source/scriptforge/python/scriptforge.py | 26 +
wizards/source/sfdocuments/SF_Calc.xba |2
wizards/source/sfdocuments/SF_Register.xba | 10
wizards/source/sfdocuments/SF_Writer.xba | 446 +++
wizards/source/sfdocuments/script.xlb|1
7 files changed, 487 insertions(+), 7 deletions(-)
New commits:
commit c2d69eae17acc93775066e649a3e22d542306ef8
Author: Jean-Pierre Ledure
AuthorDate: Tue Jul 6 16:42:12 2021 +0200
Commit: Jean-Pierre Ledure
CommitDate: Wed Jul 7 09:55:20 2021 +0200
ScriptForge - (SFDocuments) New SF_Writer service
Addition of the skeleton of the new SF_Writer service
as a subclass of SF_Document.
Entry points in CreateScriptService are provided
both for Basic and Python user scripts.
Full compatibility with existing user scripts.
Specific properties and methods will be provided in later
commits.
Change-Id: Ib00a9ea52023707d1429e8ad9dcb4dca2ca63174
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118515
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/Package_sfdocuments.mk b/wizards/Package_sfdocuments.mk
index 6f9cbf7f5ae2..39211afa88cf 100644
--- a/wizards/Package_sfdocuments.mk
+++ b/wizards/Package_sfdocuments.mk
@@ -26,6 +26,7 @@ $(eval $(call
gb_Package_add_files,wizards_basicsrvsfdocuments,$(LIBO_SHARE_FOLD
SF_Form.xba \
SF_FormControl.xba \
SF_Register.xba \
+ SF_Writer.xba \
__License.xba \
dialog.xlb \
script.xlb \
diff --git a/wizards/source/scriptforge/SF_Services.xba
b/wizards/source/scriptforge/SF_Services.xba
index 2ae92b79bc2a..4bd57c9e1b64 100644
--- a/wizards/source/scriptforge/SF_Services.xba
+++ b/wizards/source/scriptforge/SF_Services.xba
@@ -125,11 +125,11 @@ Try:
sLibrary = "ScriptForge" ' Yes, the
default value !
sService = vSplit(0)
' Accept other default values for associated libraries
- Select Case sService
- Case "Document", "Calc",
"Base", "DocumentEvent", "FormEvent"
+ Select Case LCase(sService)
+ Case "document", "calc",
"writer", "base", "documentevent",
"formevent"
sLibrary = "SFDocuments"
- Case "Dialog", "DialogEvent"
: sLibrary = "SFDialogs"
- Case "Database"
: sLibrary = "SFDatabases"
+ Case "dialog", "dialogevent"
: sLibrary = "SFDialogs"
+ Case "database"
: sLibrary = "SFDatabases"
Case Else
End Select
Else
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index 0f16613d618f..689d4a9276ec 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -2071,6 +2071,32 @@ class SFDocuments:
def SetFocus(self):
return self.ExecMethod(self.vbMethod, 'SetFocus')
+# #
+# SF_Writer CLASS
+# #
+class SF_Writer(SF_Document, SFServices):
+"""
+The SF_Writer module is focused on :
+- TBD
+"""
+# Mandatory class properties for service registration
+serviceimplementation = 'basic'
+servicename = 'SFDocuments.Writer'
+servicesynonyms = ('writer', 'sfdocuments.writer')
+serviceproperties = dict(Description = True, DocumentType = False,
IsBase = False, IsCalc = False,
+ IsDraw = False, IsImpress = False, IsMath =
False, IsWriter = False,
+ Keywords = True, Readonly = False, Subject =
True, Title = True,
+ XComponent = False)
+# Force for each property to get its value from Basic - due to intense
interactivity with user
+forceGetProperty = True
+
+@classmethod
+def ReviewServiceArgs(cls, windowname = ''):
+"""
+Transform positional and keyword arguments into positional only
+"""
+return (windowname,)
+
#
##False##
# Cr
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par2.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a99fb22b48df4979191af1ff165a668fc4992d52
Author: Caolán McNamara
AuthorDate: Tue Jul 6 19:52:42 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 09:28:52 2021 +0200
ofz#35832 Timeout
Change-Id: I3cd37d3682cf1029e652eae2f38a3dc68b73ef59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118536
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ad56049a6e97..2c3a8b3483d9 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1813,6 +1813,8 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
wwSprmParser aSprmParser(m_pIo->GetFib());
+std::set> aPrevRes;
+
// process pPap until end of table found
do
{
@@ -2098,9 +2100,10 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
break;
}
-if (nStartCp == aRes.nEndPos)
+auto aBounds(std::make_pair(aRes.nStartPos, aRes.nEndPos));
+if (!aPrevRes.insert(aBounds).second) //already seen these bounds,
infinite loop
{
-SAL_WARN("sw.ww8", "WW8TabDesc End same as Start, abandoning to
avoid looping");
+SAL_WARN("sw.ww8", "WW8TabDesc, loop in paragraph property chain");
break;
}
nStartCp = aRes.nEndPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/optcomparison.ui |2 -- 1 file changed, 2 deletions(-) New commits: commit e9c2a63031353df8c96e4dcd32723090fa6503f7 Author: Caolán McNamara AuthorDate: Tue Jul 6 17:25:12 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 7 09:28:36 2021 +0200 remove stray unused image-position of 'right' Change-Id: I6ef038841a80084fcf74a71a0cdbc005c132b0b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118535 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/uiconfig/swriter/ui/optcomparison.ui b/sw/uiconfig/swriter/ui/optcomparison.ui index d11f96d9332f..7f52143f119b 100644 --- a/sw/uiconfig/swriter/ui/optcomparison.ui +++ b/sw/uiconfig/swriter/ui/optcomparison.ui @@ -129,7 +129,6 @@ True False True -right True @@ -157,7 +156,6 @@ True False True -right True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 106 ---
1 file changed, 74 insertions(+), 32 deletions(-)
New commits:
commit c1328995c100e61c940c4c848b1e4416a2931fe6
Author: Caolán McNamara
AuthorDate: Tue Jul 6 17:23:40 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 09:28:19 2021 +0200
gtk4: use state-flags-changed for toolbar GtkMenuButton toggling
Change-Id: I71b6a3e2e99b52be0c51987f097a3487bf83fac8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index ac36df0374ac..2f3c9f8da9bd 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10720,10 +10720,14 @@ private:
// left in the main document and not in the toolbar
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_button_set_focus_on_click(GTK_BUTTON(pMenuButton), false);
+g_signal_connect(pMenuButton, "toggled",
G_CALLBACK(signalItemToggled), this);
#else
gtk_widget_set_focus_on_click(GTK_WIDGET(pMenuButton), false);
+
+GtkWidget* pToggleButton =
gtk_widget_get_first_child(GTK_WIDGET(pMenuButton));
+assert(GTK_IS_TOGGLE_BUTTON(pToggleButton));
+g_signal_connect(pToggleButton, "state-flags-changed",
G_CALLBACK(signalItemFlagsChanged), this);
#endif
-g_signal_connect(pMenuButton, "toggled",
G_CALLBACK(signalItemToggled), this);
// by default the GtkMenuButton down arrow button is as wide as
// a normal button and LibreOffice's original ones are very
@@ -10779,6 +10783,7 @@ private:
signal_clicked(::get_buildable_id(GTK_BUILDABLE(pItem)));
}
+#if !GTK_CHECK_VERSION(4, 0, 0)
static void signalItemToggled(GtkToggleButton* pItem, gpointer widget)
{
GtkInstanceToolbar* pThis = static_cast(widget);
@@ -10797,6 +10802,30 @@ private:
}
}
}
+#else
+static void signalItemFlagsChanged(GtkToggleButton* pItem, GtkStateFlags
flags, gpointer widget)
+{
+GtkInstanceToolbar* pThis = static_cast(widget);
+bool bOldChecked = flags & GTK_STATE_FLAG_CHECKED;
+bool bNewChecked = gtk_widget_get_state_flags(GTK_WIDGET(pItem)) &
GTK_STATE_FLAG_CHECKED;
+if (bOldChecked == bNewChecked)
+return;
+SolarMutexGuard aGuard;
+pThis->signal_item_toggled(pItem);
+}
+
+void signal_item_toggled(GtkToggleButton* pItem)
+{
+for (auto& a : m_aMenuButtonMap)
+{
+if (a.second->getWidget() ==
gtk_widget_get_parent(GTK_WIDGET(pItem)))
+{
+signal_toggle_menu(a.first);
+break;
+}
+}
+}
+#endif
#if !GTK_CHECK_VERSION(4, 0, 0)
static void set_item_image(GtkToolButton* pItem, const
css::uno::Reference& rIcon)
@@ -10939,10 +10968,6 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton), bActive);
-#else
-if (GTK_IS_TOGGLE_BUTTON(pToolButton))
-gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pToolButton),
bActive);
-#endif
else
{
GtkButton* pButton = nullptr;
@@ -10957,6 +10982,20 @@ public:
gtk_widget_set_state_flags(GTK_WIDGET(pButton),
static_cast(eState), true);
}
}
+#else
+GtkWidget* pWidget;
+if (GTK_IS_MENU_BUTTON(pToolButton))
+{
+pWidget = gtk_widget_get_first_child(pToolButton);
+assert(GTK_IS_TOGGLE_BUTTON(pWidget));
+}
+else
+pWidget = pToolButton;
+auto eState = gtk_widget_get_state_flags(pWidget) &
~GTK_STATE_FLAG_CHECKED;
+if (bActive)
+eState |= GTK_STATE_FLAG_CHECKED;
+gtk_widget_set_state_flags(pWidget,
static_cast(eState), true);
+#endif
enable_item_notify_events();
}
@@ -10968,10 +11007,6 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
if (GTK_IS_TOGGLE_TOOL_BUTTON(pToolButton))
return
gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(pToolButton));
-#else
-if (GTK_IS_TOGGLE_BUTTON(pToolButton))
-return
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pToolButton));
-#endif
else
{
GtkButton* pButton = nullptr;
@@ -10983,6 +11018,17 @@ public:
return gtk_widget_get_state_flags(GTK_WIDGET(pButton)) &
GTK_STATE_FLAG_CHECKED;
}
}
+#else
+GtkWidget* pWidget;
+if (GTK_IS_MENU_BUTTON(pToolButton))
+{
+pWidget = gtk_widget_get_first_child(pToolButton);
+assert(GTK_IS_TOGGLE_BUTTON(pWidget));
+}
+else
+pWidget = pToolButton;
+return gtk_widget_get_state_flags(pWidget) & GTK_STATE
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/javastartparametersdialog.ui |2 -- 1 file changed, 2 deletions(-) New commits: commit 5d55a804fad870621fcf0e9b2d1a060dcbd179a5 Author: Caolán McNamara AuthorDate: Tue Jul 6 16:58:43 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 7 09:27:42 2021 +0200 xalign/yalign of 0.5 for GtkButton is already the default Change-Id: I1a428a7cc0ac1a07c39416802980d7c77265f093 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118523 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui b/cui/uiconfig/ui/javastartparametersdialog.ui index 3ff76b63b5c7..ec6b490b1f6a 100644 --- a/cui/uiconfig/ui/javastartparametersdialog.ui +++ b/cui/uiconfig/ui/javastartparametersdialog.ui @@ -206,8 +206,6 @@ True True True -0.5 -0.5 Adds the current JRE start parameter to the list. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk4/convert3to4.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ac31428d3f4a673e4876609632c41bc218be5e4f
Author: Caolán McNamara
AuthorDate: Tue Jul 6 16:57:09 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 09:27:21 2021 +0200
gtk4: replace GtkToolItem with GtkBox
Change-Id: I02067a4b22817518451daf5d93de8d89dc8e5027
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118522
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 5c8cc1dec71e..cf6ddef2e8a2 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1155,6 +1155,10 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
{
xClass->setNodeValue("GtkButton");
}
+else if (sClass == "GtkToolItem")
+{
+xClass->setNodeValue("GtkBox");
+}
else if (sClass == "GtkMenuToolButton")
{
xClass->setNodeValue("GtkMenuButton");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk4/convert3to4.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 91d971c6dc0ba4753ba3e1939b0b65b09469f739
Author: Caolán McNamara
AuthorDate: Tue Jul 6 16:46:36 2021 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 7 09:26:59 2021 +0200
gtk4: convert GtkMenuToolButton to GtkMenuButton
Change-Id: I5b11e49e5eab68926b76814a07718e761fc6beda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118521
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 00620439f39b..5c8cc1dec71e 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -441,8 +441,11 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
if (sName == "label")
{
OUString sParentClass = GetParentObjectType(xChild);
-if (sParentClass == "GtkToolButton" || sParentClass ==
"GtkToggleToolButton")
+if (sParentClass == "GtkToolButton" || sParentClass ==
"GtkMenuToolButton"
+|| sParentClass == "GtkToggleToolButton")
+{
xName->setNodeValue("tooltip-text");
+}
xPropertyLabel = xChild;
}
@@ -1152,6 +1155,10 @@ ConvertResult Convert3To4(const
css::uno::Reference& xNode
{
xClass->setNodeValue("GtkButton");
}
+else if (sClass == "GtkMenuToolButton")
+{
+xClass->setNodeValue("GtkMenuButton");
+}
else if (sClass == "GtkToggleToolButton")
{
xClass->setNodeValue("GtkToggleButton");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/dataproviderdlg.ui |2 ++ sc/uiconfig/scalc/ui/splitcolumnentry.ui |1 + 2 files changed, 3 insertions(+) New commits: commit ffe05ff05cecfa38390df9b2e218b37b34324b62 Author: Caolán McNamara AuthorDate: Tue Jul 6 16:39:04 2021 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 7 09:26:37 2021 +0200 add truncate-multiline to new GtkEntry widgets Change-Id: I02ad90061cf291571a2b424bd526384c97580c7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118518 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sc/uiconfig/scalc/ui/dataproviderdlg.ui b/sc/uiconfig/scalc/ui/dataproviderdlg.ui index f37cba462e37..a44be248e307 100644 --- a/sc/uiconfig/scalc/ui/dataproviderdlg.ui +++ b/sc/uiconfig/scalc/ui/dataproviderdlg.ui @@ -148,6 +148,7 @@ True +True True @@ -184,6 +185,7 @@ True +True True diff --git a/sc/uiconfig/scalc/ui/splitcolumnentry.ui b/sc/uiconfig/scalc/ui/splitcolumnentry.ui index 0e10e56bf270..ef839c8f8e22 100644 --- a/sc/uiconfig/scalc/ui/splitcolumnentry.ui +++ b/sc/uiconfig/scalc/ui/splitcolumnentry.ui @@ -56,6 +56,7 @@ True True 10 +True Column ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
4th Week Progress Report - GSoC Data Providers
Hello everyone. The new Data provider Dialog along with all the functionalities has been merged to master . The Data Providers was disabled because it was not ready for production . To check the new UI and its working please go to Tabbed UI -> Data -> Data Providers . I have also added two more patches this week 1) To resolve issues in Split , Sort and Delete Transformation . https://gerrit.libreoffice.org/c/core/+/118368 2) Add Find & Replace Transformation . https://gerrit.libreoffice.org/c/core/+/118384 Next step is to implement few more transformations . Regards Tushar Kumar Rai ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Are there ideas for client-server model.
Hi Stef, What you describe sounds a lot like the functionality that the LOK API exposes. Online builds a c++ server on top of that, and then clients connect to that via websockets. But core has a gtktiledviewer demo app that shows that that LOK API is not tied to web browsers. So either you could build something not-browser-based on top of the LOK API or build on top of Online's server piece, but your clients would be desktop apps, not browsers. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/uitest/data/tdf140506.odt |binary
sw/qa/uitest/table/tdf140506.py | 49
2 files changed, 49 insertions(+)
New commits:
commit eac5977bfc11797eda356560a5e45c51108ef5a1
Author: Xisco Fauli
AuthorDate: Tue Jul 6 22:16:29 2021 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 7 09:08:40 2021 +0200
tdf#140506: sw: Add UItest
Change-Id: I38edc066e0ace0ce7c3ce6273cd0908ef4a9e0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118537
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/uitest/data/tdf140506.odt b/sw/qa/uitest/data/tdf140506.odt
new file mode 100644
index ..585efeb5315c
Binary files /dev/null and b/sw/qa/uitest/data/tdf140506.odt differ
diff --git a/sw/qa/uitest/table/tdf140506.py b/sw/qa/uitest/table/tdf140506.py
new file mode 100644
index ..197539cfc6c0
--- /dev/null
+++ b/sw/qa/uitest/table/tdf140506.py
@@ -0,0 +1,49 @@
+# -*- 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.common import select_pos
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class tdf140506(UITestCase):
+
+def test_tdf140506(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf140506.odt")) as
writer_doc:
+
+xMainWindow = self.xUITest.getTopFocusWindow()
+xwriter_edit = xMainWindow.getChild("writer_edit")
+
+tables = writer_doc.getTextTables()
+self.assertEqual(len(tables[0].getRows()), 20)
+self.assertEqual(len(tables[0].getColumns()), 2)
+
+self.assertEqual(2, writer_doc.CurrentController.PageCount)
+
+with
self.ui_test.execute_dialog_through_command(".uno:TableDialog") as xDialog:
+tabcontrol = xDialog.getChild("tabcontrol")
+select_pos(tabcontrol, "1")
+
+headline = xDialog.getChild("headline")
+repeatheader = xDialog.getChild("repeatheadernf")
+self.assertEqual('false',
get_state_as_dict(headline)["Selected"])
+headline.executeAction("CLICK", tuple())
+self.assertEqual('true',
get_state_as_dict(headline)["Selected"])
+self.assertEqual('1', get_state_as_dict(repeatheader)["Value"])
+
+
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
+
+self.assertEqual(len(tables[0].getRows()), 20)
+self.assertEqual(len(tables[0].getColumns()), 2)
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 20 != 2
+self.assertEqual(20, writer_doc.CurrentController.PageCount)
+
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
