[Libreoffice-commits] core.git: 3 commits - translations wizards/com wizards/source
Andras Timar
andras.timar at collabora.com
Mon Nov 18 12:30:18 PST 2013
translations | 2
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 15 ++--
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 32 +++-------
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 3
wizards/source/formwizard/dbwizres.src | 5 -
5 files changed, 18 insertions(+), 39 deletions(-)
New commits:
commit 6877b8e8a29ce58143d596f9e5f1413d8152553c
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Nov 18 21:39:03 2013 +0100
Updated core
Project: translations 1e5e319682945255f7e519000c4a00fcefb5910f
diff --git a/translations b/translations
index 6655f2f..1e5e319 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 6655f2f0d0a0bc781fa6ed710e1141f7362e0697
+Subproject commit 1e5e319682945255f7e519000c4a00fcefb5910f
commit 1f7ddf3bbca4433089117ddddd1aaec838554ea3
Author: Xisco Fauli <anistenis at gmail.com>
Date: Sun Nov 17 19:17:12 2013 +0100
fdo#69025 Remove unused text
Change-Id: I9fc60d52e1bc4b38b79e3e29ed1b04b3e8a777a1
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index e73142a..3176abd 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -580,7 +580,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 22),
self.resources.reschkUseLogo_value,
- "chkUseLogo", 97, 54, 0, 3, 22, 212), self)
+ "chkUseLogo", 97, 34, 0, 3, 22, 212), self)
self.chkUseAddressReceiver = self.insertCheckBox(
"chkUseAddressReceiver",
LetterWizardDialogConst.CHKUSEADDRESSRECEIVER_ITEM_CHANGED,
@@ -596,7 +596,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 23),
self.resources.reschkUseAddressReceiver_value,
- "chkUseAddressReceiver", 97, 69, 0, 3, 23, 212), self)
+ "chkUseAddressReceiver", 97, 49, 0, 3, 23, 212), self)
self.chkUseSigns = self.insertCheckBox(
"chkUseSigns",
LetterWizardDialogConst.CHKUSESIGNS_ITEM_CHANGED,
@@ -612,7 +612,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 24),
self.resources.reschkUseSigns_value,
- "chkUseSigns", 97, 82, 0, 3, 24, 212), self)
+ "chkUseSigns", 97, 62, 0, 3, 24, 212), self)
self.chkUseSubject = self.insertCheckBox(
"chkUseSubject",
LetterWizardDialogConst.CHKUSESUBJECT_ITEM_CHANGED,
@@ -628,7 +628,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 25),
self.resources.reschkUseSubject_value,
- "chkUseSubject", 97, 98, 0, 3, 25, 212), self)
+ "chkUseSubject", 97, 78, 0, 3, 25, 212), self)
self.chkUseSalutation = self.insertCheckBox(
"chkUseSalutation",
LetterWizardDialogConst.CHKUSESALUTATION_ITEM_CHANGED,
@@ -644,7 +644,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 26),
self.resources.reschkUseSalutation_value,
- "chkUseSalutation", 97, 113, 0, 3, 26, 66), self)
+ "chkUseSalutation", 97, 93, 0, 3, 26, 66), self)
self.lstSalutation = self.insertComboBox(
"lstSalutation",
LetterWizardDialogConst.LSTSALUTATION_ACTION_PERFORMED,
@@ -660,7 +660,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, 12, HelpIds.getHelpIdString(HID + 27),
- "lstSalutation", 210, 110, 3, 27, 74), self)
+ "lstSalutation", 210, 90, 3, 27, 74), self)
self.chkUseBendMarks = self.insertCheckBox(
"chkUseBendMarks",
LetterWizardDialogConst.CHKUSEBENDMARKS_ITEM_CHANGED,
@@ -676,7 +676,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 28),
self.resources.reschkUseBendMarks_value,
- "chkUseBendMarks", 97, 127, 0, 3, 28, 212), self)
+ "chkUseBendMarks", 97, 107, 0, 3, 28, 212), self)
self.chkUseGreeting = self.insertCheckBox(
"chkUseGreeting",
LetterWizardDialogConst.CHKUSEGREETING_ITEM_CHANGED,
@@ -692,7 +692,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 29),
self.resources.reschkUseGreeting_value,
- "chkUseGreeting", 97, 142, 0, 3, 29, 66), self)
+ "chkUseGreeting", 97, 122, 0, 3, 29, 66), self)
self.lstGreeting = self.insertComboBox(
"lstGreeting",
LetterWizardDialogConst.LSTGREETING_ACTION_PERFORMED,
@@ -708,7 +708,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, 12, HelpIds.getHelpIdString(HID + 30),
- "lstGreeting", 210, 141, 3, 30, 74), self)
+ "lstGreeting", 210, 121, 3, 30, 74), self)
self.chkUseFooter = self.insertCheckBox(
"chkUseFooter",
LetterWizardDialogConst.CHKUSEFOOTER_ITEM_CHANGED,
@@ -724,19 +724,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_WIDTH),
(8, HelpIds.getHelpIdString(HID + 31),
self.resources.reschkUseFooter_value,
- "chkUseFooter", 97, 158, 0, 3, 31, 212), self)
- self.insertLabel("lblLetterNorm",
- (PropertyNames.PROPERTY_HEIGHT,
- PropertyNames.PROPERTY_LABEL,
- PropertyNames.PROPERTY_MULTILINE,
- PropertyNames.PROPERTY_NAME,
- PropertyNames.PROPERTY_POSITION_X,
- PropertyNames.PROPERTY_POSITION_Y,
- PropertyNames.PROPERTY_STEP,
- PropertyNames.PROPERTY_TABINDEX,
- PropertyNames.PROPERTY_WIDTH),
- (16, self.resources.reslblLetterNorm_value, True,
- "lblLetterNorm", 97, 28, 3, 50, 109))
+ "chkUseFooter", 97, 138, 0, 3, 31, 212), self)
self.insertLabel("lblTitle3",
(
"FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index b884246..a59ba71 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -154,9 +154,6 @@ class LetterWizardDialogResources(Resource):
self.reslblFooterHeight_value = \
self.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 40)
- self.reslblLetterNorm_value = \
- self.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 41)
self.reslblSenderAddress_value = \
self.getResText(
LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 42)
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index be86337..c68036c 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -2066,11 +2066,6 @@ String RID_LETTERWIZARDDIALOG_START + 40
Text [ en-US] = "Height:";
};
-String RID_LETTERWIZARDDIALOG_START + 41
-{
- Text [ en-US] = "Use a typical letter format for this country:";
-};
-
String RID_LETTERWIZARDDIALOG_START + 42
{
Text [ en-US] = "Sender's address";
commit 137244d9d4df6f0aeaa8ba81203b51bd3588b1e6
Author: Xisco <xisco at xisco-PC.(none)>
Date: Tue Sep 17 20:48:47 2013 +0200
pyagenda: Use for instead of while, same logic
Change-Id: I9a18e2178f89f887a1243db77297cee0dd9c2310
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index a8dcece..d9013ba 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -609,19 +609,18 @@ class ItemsTable(object):
and remove them from the list of all <*> items, so the next
search will be faster.
'''
- i = 0
- while i < len(self.agenda.allItems):
- workwith = self.agenda.allItems[i]
- t = workwith.TextTable
+ aux = []
+ for item in self.agenda.allItems:
+ t = item.TextTable
if t == ItemsTable.table:
- iText = workwith.String.lower().lstrip()
+ iText = item.String.lower().lstrip()
ai = self.agenda.itemsCache[iText]
if ai is not None:
self.items.append(ai)
- del self.agenda.allItems[i]
self.agenda.itemsMap[iText] = self
- i -= 1
- i += 1
+ else:
+ aux.append(item)
+ self.agenda.allItems = aux
'''
link the section to the template. this will restore the original table
More information about the Libreoffice-commits
mailing list