[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svtools svtools/source
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Tue Dec 10 04:15:39 UTC 2019
include/svtools/ruler.hxx | 2 ++
svtools/source/control/ruler.cxx | 5 +++++
2 files changed, 7 insertions(+)
New commits:
commit dd2c3914515166542b075873575095032dfa0566
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Dec 4 16:18:01 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Dec 10 05:14:49 2019 +0100
tdf#128468: Add Ruler::GetTabs()
Change-Id: I785f8af1eec54f36721a354c4d3f82d8b86ceb86
Reviewed-on: https://gerrit.libreoffice.org/84419
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/84519
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/84759
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 5a7c463aa3b5..597c4bf35494 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -22,6 +22,7 @@
#include <memory>
#include <map>
+#include <vector>
#include <svtools/svtdllapi.h>
#include <rtl/ref.hxx>
#include <tools/link.hxx>
@@ -784,6 +785,7 @@ public:
void SetIndents( sal_uInt32 n = 0, const RulerIndent* pIndentAry = nullptr );
void SetTabs( sal_uInt32 n = 0, const RulerTab* pTabAry = nullptr );
+ const std::vector<RulerTab>& GetTabs() const;
static void DrawTab(vcl::RenderContext& rRenderContext, const Color &rFillColor,
const Point& rPos, sal_uInt16 nStyle);
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 08ed80387231..a3ec691eea49 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2676,6 +2676,11 @@ void Ruler::SetTabs( sal_uInt32 aTabArraySize, const RulerTab* pTabArray )
ImplUpdate();
}
+const std::vector<RulerTab>& Ruler::GetTabs() const
+{
+ return mpData->pTabs;
+}
+
void Ruler::SetStyle( WinBits nStyle )
{
if ( mnWinStyle != nStyle )
More information about the Libreoffice-commits
mailing list