[Libreoffice-commits] .: 8 commits - offapi/com
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Sat Mar 19 10:19:41 PDT 2011
offapi/com/sun/star/style/FootnoteLineStyle.idl | 44 ++++++++++++++++
offapi/com/sun/star/style/PageProperties.idl | 7 ++
offapi/com/sun/star/style/makefile.mk | 1
offapi/com/sun/star/table/BorderLine2.idl | 10 +++
offapi/com/sun/star/table/BorderLineStyle.idl | 57 ++++++++++++++++++++--
offapi/com/sun/star/text/ColumnSeparatorStyle.idl | 46 +++++++++++++++++
offapi/com/sun/star/text/TextColumns.idl | 6 ++
7 files changed, 167 insertions(+), 4 deletions(-)
New commits:
commit 374cce46358edc4a65d5cff84fc511cc3524d8be
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Mar 17 17:40:07 2011 +0100
Fixed line style in footnote format GUI and saved it to ODF
diff --git a/offapi/com/sun/star/style/FootnoteLineStyle.idl b/offapi/com/sun/star/style/FootnoteLineStyle.idl
new file mode 100644
index 0000000..100e27f
--- /dev/null
+++ b/offapi/com/sun/star/style/FootnoteLineStyle.idl
@@ -0,0 +1,44 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * [ Novell Inc. ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Cedric Bosdonnat <cbosdonnat at novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __com_sun_star_text_FootnoteLineStyle_idl__
+#define __com_sun_star_text_FootnoteLineStyle_idl__
+
+module com { module sun { module star { module text {
+
+published constants FootnoteLineStyle
+{
+ const short NONE = 0;
+
+ const short SOLID = 1;
+
+ const short DOTTED = 2;
+
+ const short DASHED = 3;
+};
+
+}; }; }; };
+#endif
diff --git a/offapi/com/sun/star/style/PageProperties.idl b/offapi/com/sun/star/style/PageProperties.idl
index d09f0cc..dc5265e 100644
--- a/offapi/com/sun/star/style/PageProperties.idl
+++ b/offapi/com/sun/star/style/PageProperties.idl
@@ -424,6 +424,13 @@ of the current page is used as limit.
*/
[optional,property] short FootnoteLineWeight;
//-----------------------------------------------------------------------------
+/** contains the style of the separator line between the text and the footnote area.
+
+ @see com::sun::star::style::FootnoteLineStyle
+ for the possible values.
+ */
+[optional,property] short FootnoteLineStyle;
+//-----------------------------------------------------------------------------
/** contains the color of the separator line between the text and the footnote area..
*/
[optional,property] com::sun::star::util::Color FootnoteLineColor;
diff --git a/offapi/com/sun/star/style/makefile.mk b/offapi/com/sun/star/style/makefile.mk
index 969f058..b9077b1 100644
--- a/offapi/com/sun/star/style/makefile.mk
+++ b/offapi/com/sun/star/style/makefile.mk
@@ -46,6 +46,7 @@ IDLFILES=\
CharacterPropertiesComplex.idl\
CharacterStyle.idl\
DropCapFormat.idl\
+ FootnoteLineStyle.idl\
GraphicLocation.idl\
HorizontalAlignment.idl\
LineNumberPosition.idl\
commit 232e5dfb37f777f1d4a9df7e55266dd9befa56ed
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Mar 17 15:40:01 2011 +0100
Fixed documentation for the new ColumnSeparatorStyle property
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index 59911bc..0a1ea7b 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -31,8 +31,6 @@
#include <com/sun/star/text/XTextColumns.idl>
#endif
-#include <com/sun/star/text/ColumnSeparatorStyle.idl>
-
#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
#endif
@@ -87,6 +85,8 @@ published service TextColumns
[property] boolean SeparatorLineIsOn;
//------------------------------------------------------------------------
/** determines the style of the separator lines between the columns.
+ @see com::sun::star::text:ColumnSeparatorStyle
+ for the possible values.
*/
[property, optional] short SeparatorLineStyle;
//------------------------------------------------------------------------
commit 37ba9f96b2a2b34d09a069c556225ffc9f4c00ae
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Mar 16 16:06:46 2011 +0100
Added column separator style in ODF
diff --git a/offapi/com/sun/star/text/ColumnSeparatorStyle.idl b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
new file mode 100644
index 0000000..5aa40af
--- /dev/null
+++ b/offapi/com/sun/star/text/ColumnSeparatorStyle.idl
@@ -0,0 +1,46 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * [ Novell Inc. ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Cedric Bosdonnat <cbosdonnat at novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef __com_sun_star_text_ColumnSeparatorStyle_idl__
+#define __com_sun_star_text_ColumnSeparatorStyle_idl__
+
+module com { module sun { module star { module text {
+
+published constants ColumnSeparatorStyle
+{
+ const short NONE = 0;
+
+ const short SOLID = 1;
+
+ const short DOTTED = 2;
+
+ const short DASHED = 3;
+};
+
+}; }; }; };
+
+
+#endif
diff --git a/offapi/com/sun/star/text/TextColumns.idl b/offapi/com/sun/star/text/TextColumns.idl
index 0070af7..59911bc 100644
--- a/offapi/com/sun/star/text/TextColumns.idl
+++ b/offapi/com/sun/star/text/TextColumns.idl
@@ -31,6 +31,8 @@
#include <com/sun/star/text/XTextColumns.idl>
#endif
+#include <com/sun/star/text/ColumnSeparatorStyle.idl>
+
#ifndef __com_sun_star_style_VerticalAlignment_idl__
#include <com/sun/star/style/VerticalAlignment.idl>
#endif
@@ -84,6 +86,10 @@ published service TextColumns
*/
[property] boolean SeparatorLineIsOn;
//------------------------------------------------------------------------
+ /** determines the style of the separator lines between the columns.
+ */
+ [property, optional] short SeparatorLineStyle;
+ //------------------------------------------------------------------------
};
//=============================================================================
commit 2a699c786355d648a8e231a82b880643cf6a86e1
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Mar 14 15:22:13 2011 +0100
Fixed the NONE border line style API value
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl b/offapi/com/sun/star/table/BorderLineStyle.idl
index 94c0281..1d2408a 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -37,7 +37,7 @@ constants BorderLineStyle
{
/** No border line
*/
- const short NONE = -1;
+ const short NONE = 0x7FFF;
/** Solid border line.
*/
commit 3d500bc964a085d34d7a0613610f619c69726b51
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Feb 22 15:25:35 2011 +0100
Added a style entry for no lines
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl b/offapi/com/sun/star/table/BorderLineStyle.idl
index b6bbe79..94c0281 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -35,6 +35,10 @@ module com { module sun { module star { module table {
constants BorderLineStyle
{
+ /** No border line
+ */
+ const short NONE = -1;
+
/** Solid border line.
*/
const short SOLID = 0;
commit 5f482b8226f514a501a241eceec13c7b465481b3
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Jan 3 12:06:20 2011 +0100
Documented css::table::BorderLine2.LineWidth.
diff --git a/offapi/com/sun/star/table/BorderLine2.idl b/offapi/com/sun/star/table/BorderLine2.idl
index 65428b0..c1ae0f8 100644
--- a/offapi/com/sun/star/table/BorderLine2.idl
+++ b/offapi/com/sun/star/table/BorderLine2.idl
@@ -43,6 +43,16 @@ struct BorderLine2 : BorderLine
/** Style of the border. @see BorderLineStyle
*/
short LineStyle;
+
+ /** Width of the border, this is the base to compute all the lines
+ and gaps widths. These widths computations are based on the
+ LineStyle property
+
+ This property is prevailing on the old Out, In and Dist width
+ from BorderLine. If this property is set to 0, then the other
+ widths will be used to guess the border width.
+ */
+ unsigned long LineWidth;
};
//=============================================================================
commit 801dcfbe5321094117dd422cd14018191e4d59aa
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Dec 15 22:19:03 2010 +0100
Fixed copy-paste problem
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl b/offapi/com/sun/star/table/BorderLineStyle.idl
index 225e57f..b6bbe79 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -69,17 +69,17 @@ constants BorderLineStyle
/** Double border line with a thick line outside and a thin line
inside separated by a small gap.
*/
- const short THINTHICK_SMALLGAP = 7;
+ const short THICKTHIN_SMALLGAP = 7;
/** Double border line with a thick line outside and a thin line
inside separated by a medium gap.
*/
- const short THINTHICK_MEDIUMGAP = 8;
+ const short THICKTHIN_MEDIUMGAP = 8;
/** Double border line with a thick line outside and a thin line
inside separated by a large gap.
*/
- const short THINTHICK_LARGEGAP = 9;
+ const short THICKTHIN_LARGEGAP = 9;
/** 3D embossed border line.
*/
commit d1e2cf872455d0fc28cbc2bbd9ca9a70ef3a07bf
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Nov 8 16:23:17 2010 +0100
Borders: added some more types to the API
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl b/offapi/com/sun/star/table/BorderLineStyle.idl
index 0582230..225e57f 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -27,7 +27,6 @@
#ifndef __com_sun_star_table_BorderLineStyle_idl__
#define __com_sun_star_table_BorderLineStyle_idl__
-
//=============================================================================
module com { module sun { module star { module table {
@@ -36,21 +35,67 @@ module com { module sun { module star { module table {
constants BorderLineStyle
{
- //-------------------------------------------------------------------------
/** Solid border line.
*/
const short SOLID = 0;
- //-------------------------------------------------------------------------
/** Dotted border line.
*/
const short DOTTED = 1;
- //-------------------------------------------------------------------------
/** Dashed border line.
*/
const short DASHED = 2;
+ /** Double border line.
+ */
+ const short DOUBLE = 3;
+
+ /** Double border line with a thin line outside and a thick line
+ inside separated by a small gap.
+ */
+ const short THINTHICK_SMALLGAP = 4;
+
+ /** Double border line with a thin line outside and a thick line
+ inside separated by a medium gap.
+ */
+ const short THINTHICK_MEDIUMGAP = 5;
+
+ /** Double border line with a thin line outside and a thick line
+ inside separated by a large gap.
+ */
+ const short THINTHICK_LARGEGAP = 6;
+
+ /** Double border line with a thick line outside and a thin line
+ inside separated by a small gap.
+ */
+ const short THINTHICK_SMALLGAP = 7;
+
+ /** Double border line with a thick line outside and a thin line
+ inside separated by a medium gap.
+ */
+ const short THINTHICK_MEDIUMGAP = 8;
+
+ /** Double border line with a thick line outside and a thin line
+ inside separated by a large gap.
+ */
+ const short THINTHICK_LARGEGAP = 9;
+
+ /** 3D embossed border line.
+ */
+ const short EMBOSSED = 10;
+
+ /** 3D engraved border line.
+ */
+ const short ENGRAVED = 11;
+
+ /** Outset border line.
+ */
+ const short OUTSET = 12;
+
+ /** Inset border line.
+ */
+ const short INSET = 13;
};
//=============================================================================
More information about the Libreoffice-commits
mailing list