[Libreoffice-commits] .: 2 commits - cui/uiconfig offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 30 08:40:04 PST 2012
cui/uiconfig/ui/select_persona_dialog.ui | 121 ++++++++++----------
offapi/UnoApi_offapi.mk | 2
offapi/com/sun/star/text/AdvancedTextDocument.idl | 128 ----------------------
offapi/com/sun/star/text/HypertextDocument.idl | 64 -----------
offapi/type_reference/types.rdb |binary
5 files changed, 63 insertions(+), 252 deletions(-)
New commits:
commit 1b7d7f8e2f78de0b685ea6b43e4379ff067d9097
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 30 16:39:16 2012 +0000
tweak dialog to have a default button and fix up for current glade behaviour
Change-Id: I23b314890d8842bd368af69fa8bd2bcf71e592dd
diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui
index ed3c2a6..123dd35 100644
--- a/cui/uiconfig/ui/select_persona_dialog.ui
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -9,21 +9,8 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">First visit Firefox Personas (http://www.getpersonas.com) and find Persona you like, and want to choose for LibreOffice.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
@@ -35,6 +22,8 @@
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
@@ -86,11 +75,25 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">First visit Firefox Personas (http://www.getpersonas.com) and find Persona you like, and want to choose for LibreOffice.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">54</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton" id="visit_personas">
@@ -99,74 +102,76 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Then copy the URL of page that contains the Persona to clipboard, and paste it to the input field below, and confirm with OK.</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Persona URL:</property>
+ <property name="label" translatable="yes">Then copy the URL of page that contains the Persona to clipboard, and paste it to the input field below, and confirm with OK.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">54</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="persona_url">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â—</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Persona URL:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="persona_url">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
commit c581cb503c9f99cdd0079c120f4f143f4bfddd39
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 30 17:13:08 2012 +0100
API CHANGE: remove com.sun.star.text.HypertextDocument
... and derived com.sun.star.text.AdvancedTextDocument services, which
are deprecated since 2001 and actually unimplemented.
EXISTENCE: published key "/UCR/com/sun/star/text/HypertextDocument"
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/text/AdvancedTextDocument"
exists only in registry 1
Change-Id: I3f538951401f8696b18e94ad8b2cd07f9c0820b2
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4f5af08..608bfa0 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1217,7 +1217,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
AccessibleTextEmbeddedObject \
AccessibleTextFrameView \
AccessibleTextGraphicObject \
- AdvancedTextDocument \
AutoTextContainer \
AutoTextEntry \
AutoTextGroup \
@@ -1253,7 +1252,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
GenericTextDocument \
GlobalDocument \
GlobalSettings \
- HypertextDocument \
IllustrationsIndex \
InContentMetadata \
LineNumberingProperties \
diff --git a/offapi/com/sun/star/text/AdvancedTextDocument.idl b/offapi/com/sun/star/text/AdvancedTextDocument.idl
deleted file mode 100644
index 6211349..0000000
--- a/offapi/com/sun/star/text/AdvancedTextDocument.idl
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- 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 __com_sun_star_text_AdvancedTextDocument_idl__
-#define __com_sun_star_text_AdvancedTextDocument_idl__
-
-#include <com/sun/star/lang/Locale.idl>
-
-#include <com/sun/star/text/HypertextDocument.idl>
-
-#include <com/sun/star/text/XFootnotesSupplier.idl>
-
-#include <com/sun/star/text/XEndnotesSupplier.idl>
-
-#include <com/sun/star/util/XReplaceable.idl>
-
-#include <com/sun/star/text/XPagePrintable.idl>
-
-#include <com/sun/star/text/XReferenceMarksSupplier.idl>
-
-#include <com/sun/star/text/XLineNumberingSupplier.idl>
-
-#include <com/sun/star/text/XChapterNumberingSupplier.idl>
-
-#include <com/sun/star/beans/XPropertySet.idl>
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: service com::sun::star::text::AdvancedTextDocument
-/** An advanced text document is an extension of a hypertext document
- which can also contain text-frames, foot- and endnotes, and some
- other advanced contents.
-
- @deprecated
- use <type>TextDocument</type> instead.
- */
-published service AdvancedTextDocument
-{
- // DocMerge: empty anyway
- service com::sun::star::text::HypertextDocument;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XFootnotesSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XEndnotesSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::util::XReplaceable;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XPagePrintable;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XReferenceMarksSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XLineNumberingSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XChapterNumberingSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::beans::XPropertySet;
-
-
- // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::CharLocale
- /** contains the identifier of the default locale of the document.
- */
- [property] com::sun::star::lang::Locale CharLocale;
-
-
- // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::CharacterCount
- /** contains the count of all characters in the document.
- */
- [readonly, property] long CharacterCount;
-
-
- // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::ParagraphCount
- /** contains the count of all paragraphs in the document.
- */
- [readonly, property] long ParagraphCount;
-
-
- // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::WordCount
- /** contains the count of all words in the document. at see WordSeparator
- */
- [readonly, property] long WordCount;
-
-
- // DocMerge from xml: property com::sun::star::text::AdvancedTextDocument::WordSeparator
- /** contains a string that consists of characters that mark the
- separation of words in counting the words in a document.
-
-
-
- <p> I.e., slash and backslash. Whitespace (tab stop,
- space, paragraph break, or line break) always separate
- words.</p>@see WordCount
- */
- [property] string WordSeparator;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/text/HypertextDocument.idl b/offapi/com/sun/star/text/HypertextDocument.idl
deleted file mode 100644
index c3efde9..0000000
--- a/offapi/com/sun/star/text/HypertextDocument.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- 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 __com_sun_star_text_HypertextDocument_idl__
-#define __com_sun_star_text_HypertextDocument_idl__
-
-#include <com/sun/star/text/TextDocument.idl>
-
-#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
-
-#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
-
-#include <com/sun/star/text/XTextTablesSupplier.idl>
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: service com::sun::star::text::HypertextDocument
-/** is an extension of a text document which
- can also contain tables and certain kinds of embedded objects
- (e.g., graphics).
-
- @deprecated
- use <type>TextDocument</type> instead.
- */
-published service HypertextDocument
-{
- // DocMerge: empty anyway
- service com::sun::star::text::TextDocument;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XTextGraphicObjectsSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XTextEmbeddedObjectsSupplier;
-
- // DocMerge: empty anyway
- interface com::sun::star::text::XTextTablesSupplier;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 17a39be..db615c6 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
More information about the Libreoffice-commits
mailing list