summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2021-08-28 22:50:26 +1000
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-09-06 12:52:38 +0200
commitdb0a6e1bd98a9430e9ca4edfaabc3b11da986592 (patch)
treecd7b59825ade08a1455cbea979f321278c791ada /vcl/inc
parent8381242c2e0bfda1b37e7e82525926c0497c81d4 (diff)
vcl: migrate ImplLayoutRuns to own files
Wrote a set of unit tests for ImplLayoutRuns, and added ImplLayoutRuns to vcl::text namespace. Change-Id: Id6ae8882acb8e3d821bb38551e78019cbdcaa662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121204 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/ImplLayoutRuns.hxx53
-rw-r--r--vcl/inc/sallayout.hxx45
2 files changed, 65 insertions, 33 deletions
diff --git a/vcl/inc/ImplLayoutRuns.hxx b/vcl/inc/ImplLayoutRuns.hxx
new file mode 100644
index 000000000000..30ac642f3779
--- /dev/null
+++ b/vcl/inc/ImplLayoutRuns.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+
+#include <vector>
+
+// used for managing runs e.g. for BiDi, glyph and script fallback
+class VCL_DLLPUBLIC ImplLayoutRuns
+{
+private:
+ int mnRunIndex;
+ std::vector<int> maRuns;
+
+public:
+ ImplLayoutRuns()
+ {
+ mnRunIndex = 0;
+ maRuns.reserve(8);
+ }
+
+ void Clear() { maRuns.clear(); }
+ void AddPos(int nCharPos, bool bRTL);
+ void AddRun(int nMinRunPos, int nEndRunPos, bool bRTL);
+
+ bool IsEmpty() const { return maRuns.empty(); }
+ void ResetPos() { mnRunIndex = 0; }
+ void NextRun() { mnRunIndex += 2; }
+ bool GetRun(int* nMinRunPos, int* nEndRunPos, bool* bRTL) const;
+ bool GetNextPos(int* nCharPos, bool* bRTL);
+ bool PosIsInRun(int nCharPos) const;
+ bool PosIsInAnyRun(int nCharPos) const;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 594202b23239..b31aa202019c 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -20,25 +20,27 @@
#ifndef INCLUDED_VCL_INC_SALLAYOUT_HXX
#define INCLUDED_VCL_INC_SALLAYOUT_HXX
-#include <iostream>
-#include <memory>
-#include <vector>
-
-#include <hb.h>
-
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <i18nlangtag/languagetag.hxx>
#include <tools/gen.hxx>
#include <tools/degree.hxx>
+#include <i18nlangtag/languagetag.hxx>
+
#include <vcl/dllapi.h>
-#include <vcl/vclenum.hxx> // for typedef sal_UCS4
#include <vcl/devicecoordinate.hxx>
+#include <vcl/vclenum.hxx> // for typedef sal_UCS4
#include <vcl/vcllayout.hxx>
+#include "ImplLayoutRuns.hxx"
#include "impglyphitem.hxx"
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+
+#include <hb.h>
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
#define MAX_FALLBACK 16
@@ -50,29 +52,6 @@ namespace vcl::text {
class TextLayoutCache;
}
-// used for managing runs e.g. for BiDi, glyph and script fallback
-class ImplLayoutRuns
-{
-private:
- int mnRunIndex;
- std::vector<int> maRuns;
-
-public:
- ImplLayoutRuns() { mnRunIndex = 0; maRuns.reserve(8); }
-
- void Clear() { maRuns.clear(); }
- void AddPos( int nCharPos, bool bRTL );
- void AddRun( int nMinRunPos, int nEndRunPos, bool bRTL );
-
- bool IsEmpty() const { return maRuns.empty(); }
- void ResetPos() { mnRunIndex = 0; }
- void NextRun() { mnRunIndex += 2; }
- bool GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) const;
- bool GetNextPos( int* nCharPos, bool* bRTL );
- bool PosIsInRun( int nCharPos ) const;
- bool PosIsInAnyRun( int nCharPos ) const;
-};
-
class MultiSalLayout final : public SalLayout
{
public: