[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/Library_svxcore.mk svx/source
matteocam
matteo.campanelli at gmail.com
Tue Jun 16 08:37:36 PDT 2015
include/svx/textchain.hxx | 37 ++++++++++++++++++++++++++++
svx/Library_svxcore.mk | 1
svx/source/svdraw/svdotextdecomposition.cxx | 3 ++
svx/source/svdraw/textchain.cxx | 34 +++++++++++++++++++++++++
4 files changed, 75 insertions(+)
New commits:
commit f19f80e6fc3b15f2fe266fac827ffed75e1f02fe
Author: matteocam <matteo.campanelli at gmail.com>
Date: Tue Jun 16 11:36:39 2015 -0400
Added textchain.?xx files
Change-Id: Ib35e73b791c1e78b06e97e56ed6a210d129c632c
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
new file mode 100644
index 0000000..e094334
--- /dev/null
+++ b/include/svx/textchain.hxx
@@ -0,0 +1,37 @@
+/* -*- 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 .
+ */
+
+#ifndef INCLUDED_SVX_TEXTCHAIN_HXX
+#define INCLUDED_SVX_TEXTCHAIN_HXX
+
+class SdrTextObj;
+
+class TextChain {
+
+ public:
+ TextChain();
+ void AppendLink(SdrTextObj *);
+ SdrTextObj *GetNextLink(SdrTextObj *);
+
+};
+
+#endif // INCLUDED_SVX_TEXTCHAIN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 7ed776f..816bae4 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -325,6 +325,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/svdview \
svx/source/svdraw/svdviter \
svx/source/svdraw/svdxcgv \
+ svx/source/svdraw/textchain \
svx/source/table/cell \
svx/source/table/cellcursor \
svx/source/table/cellrange \
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 45edac2..a0d6823 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -23,6 +23,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdmodel.hxx>
+#include <svx/textchain.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <sdr/primitive2d/sdrtextprimitive2d.hxx>
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
@@ -1627,6 +1628,8 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
/* Begin overflow handling */
+ TextChain *aTxtChain = new TextChain;
+
// If overflow occurs we have to cut the text at the right point
// If in edit mode ImpEditEngine should have taken care of this
if ( rOutliner.IsPageOverflow() && !IsInEditMode()) {
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
new file mode 100644
index 0000000..194d4d4
--- /dev/null
+++ b/svx/source/svdraw/textchain.cxx
@@ -0,0 +1,34 @@
+/* -*- 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 .
+ */
+
+#include <svx/textchain.hxx>
+#include <svx/svdotext.hxx>
+
+TextChain::TextChain()
+{
+}
+
+void TextChain::AppendLink(SdrTextObj *)
+{
+}
+
+SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
+{
+ return NULL; // XXX
+}
More information about the Libreoffice-commits
mailing list