[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaDocument.py | 234 ++
wizards/com/sun/star/wizards/agenda/TemplateConsts.py |9
wizards/com/sun/star/wizards/agenda/TopicsControl.py | 10
3 files changed, 30 insertions(+), 223 deletions(-)
New commits:
commit a8eacaa870a4f39e096fb3801f457e1696815367
Author: Xisco Fauli
Date: Tue Jan 29 22:50:14 2013 +0100
pyagenda: simplify Topics code
Change-Id: Ie8417eafa70204accadff1c50d23c32fdda7bbb1
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index 8600778..b3d8806 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -69,7 +69,6 @@ table.self.xTextDocument
A note about threads:
Many methods here are synchronized, in order to avoid colission made by
events fired too often.
-@author rpiterman
'''
class AgendaDocument(TextDocument):
@@ -758,8 +757,6 @@ was done out of logic reasons and not design/functionality
reasons,
since there is anyway only one instance of this class at runtime
it could have also be implemented in the AgendaDocument class
but for clarity and separation I decided to make a sub class for it.
-
-@author rp143992
'''
class Topics(object):
@@ -781,26 +778,12 @@ class Topics(object):
'''
table = None
lastRowFormat = []
-numCell = -1
-topicCell = -1
-responsibleCell = -1
-timeCell = -1
rowsPerTopic = None
-topicCells = []
def __init__(self, agenda):
-self.topicItems = {}
self.firstRowFormat = []
self.agenda = agenda
-'''
-this is a list which traces which topics were written to the document
-and which not. When a cell needs to be actualized, it is checked that
the
-whole topic is already present in the document, using this vector.
-The vector contains nulls for topics which were not written, and
-empty strings for topics which were written (though any other
-object would also do - i check only if it is a null or not...);
-'''
-self.writtenTopics = []
+self.writtenTopics = -1
try:
Topics.table = self.agenda.getTable(
self.agenda.templateConsts.SECTION_TOPICS)
@@ -846,34 +829,10 @@ class Topics(object):
cell = Topics.table.getCellByName(cursor.RangeName)
# first I store the content and para style of the cell
ae = TextElement(cell, cell.String)
-# if the cell contains a relevant <...>
-# i add the text element to the hash,
-# so it's text can be updated later.
-try:
-if items[cell.CellName] is not None:
-self.topicItems[cell.String.lower().lstrip()] = ae
-except KeyError:
-pass
+ae.write()
-Topics.topicCells.append(ae)
# goto next cell.
cursor.goRight(1, False)
-'''
-now - in which cell is every fillin?
-'''
-
-Topics.numCell = Topics.topicCells.index(
-self.topicItems[
-self.agenda.templateConsts.FILLIN_TOPIC_NUMBER])
-Topics.topicCell = Topics.topicCells.index(
-self.topicItems[
-self.agenda.templateConsts.FILLIN_TOPIC_TOPIC])
-Topics.responsibleCell = Topics.topicCells.index(
-self.topicItems[
-self.agenda.templateConsts.FILLIN_TOPIC_RESPONSIBLE])
-Topics.timeCell = Topics.topicCells.index(
-self.topicItems[
-self.agenda.templateConsts.FILLIN_TOPIC_TIME])
except Exception:
traceback.print_exc()
@@ -883,117 +842,42 @@ class Topics(object):
to the table. 0 or a negative number: no rows added.
'''
-def write2(self, topic, data):
-if topic >= len(self.writtenTopics):
-size = topic - len(self.writtenTopics)
-self.writtenTopics += [None] * size
-self.writtenTopics.insert(topic, "")
-# make sure three are enough rows for me...
-rows = self.agenda.getRowCount(Topics.table)
-reqRows = 1 + (topic + 1) * Topics.rowsPerTopic
-firstRow = reqRows - Topics.rowsPerTopic + 1
-diff = reqRows - rows
-if diff > 0:
-# set the item's text...
-self.agenda.insertTableRows(Topics.table, rows, diff)
-
-self.setItemText(Topics.numCell, data[0].Value)
-self.setItemText(Topics.topicCell, data[1].Value)
-self.setItemText(Topics.responsibleCell, data[2].Value)
-self.setItemText(Topics.timeCell, data[3].Value)
-# now write !
-cursor = Topics.table.createCursorByCellName("A" + str(firstRow))
-for i in Topic
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit a6f5e5238ca4536eff6c52cf10e52bd116723d72
Author: Stephan Bergmann
Date: Mon Jan 14 14:27:58 2013 +0100
Fix one more use of removed ViewHandler.py
...in the style of d6308705133ccde121dcd40f94a1d4367356630b "pywizards: get
rid
of ViewHandler" and 155600869800a0b51f9787b8a1879d3c680342c3 "fdo#59248:
Remove
remaining dangling view of ViewHandler.py," though the Python version of the
Agenda wizard appers not be used yet, anyway.
Change-Id: I993306d6ffa87d0938763706d41e12b2ffdf57e6
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 2dbcea7..bf6b777 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -31,7 +31,6 @@ from ..common.Desktop import Desktop
from ..common.HelpIds import HelpIds
from ..common.Configuration import Configuration
from ..document.OfficeDocument import OfficeDocument
-from ..text.ViewHandler import ViewHandler
from com.sun.star.view.DocumentZoomType import OPTIMAL
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
@@ -384,8 +383,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
oDoc = OfficeDocument.load(
Desktop.getDesktop(self.xMSF),
self.sPath, "_default", loadValues)
-myViewHandler = ViewHandler(self.xMSF, oDoc)
-myViewHandler.setViewSetting("ZoomType", OPTIMAL)
+oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL
else:
pass
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextDocument.py |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 155600869800a0b51f9787b8a1879d3c680342c3 Author: Stephan Bergmann Date: Mon Jan 14 14:03:40 2013 +0100 fdo#59248: Remove remaining dangling view of ViewHandler.py ...that had been left behind by d6308705133ccde121dcd40f94a1d4367356630b "pywizards: get rid of ViewHandler" and caused "from .LetterWizardDialogImpl import LetterWizardDialogImpl" in CallWizard.py to fail. Change-Id: I51dcb2812863f502bc06e3e3b07285f6c31714ca diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 150b0bf..5502978 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -19,7 +19,6 @@ import uno import traceback import time from datetime import date as dateTimeObject -from .ViewHandler import ViewHandler from .TextFieldHandler import TextFieldHandler from ..document.OfficeDocument import OfficeDocument from ..common.Desktop import Desktop @@ -142,10 +141,8 @@ class TextDocument(object): self.DocSize = self.getPageSize() -myViewHandler = ViewHandler(self.xTextDocument, self.xTextDocument) try: -myViewHandler.setViewSetting( -"ZoomType", ENTIRE_PAGE) +self.xTextDocument.CurrentController.ViewSettings.ZoomType = ENTIRE_PAGE except Exception: traceback.print_exc() myFieldHandler = TextFieldHandler(self.xMSF, self.xTextDocument) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/ConfigSet.java |1 -
1 file changed, 1 deletion(-)
New commits:
commit f848a9007dd7c06a06903b32f51ecbff8fa14b94
Author: Xisco Fauli
Date: Thu Dec 20 19:26:26 2012 +0100
This println shouldn't be here
Change-Id: I38ee1e764d562a951095c558333414c5afd12100
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java
b/wizards/com/sun/star/wizards/common/ConfigSet.java
index 64e15f7..0d8a767 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.java
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.java
@@ -135,7 +135,6 @@ public class ConfigSet implements ConfigNode, XMLProvider,
ListModel
public void readConfiguration(Object configurationView, Object param)
{
String[] names = Configuration.getChildrenNames(configurationView);
-System.out.println(names.length);
if (ConfigNode.class.isAssignableFrom(childClass))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com wizards/Pyuno_commonwizards.mk
wizards/Pyuno_commonwizards.mk|1
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |4
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |4
wizards/com/sun/star/wizards/text/ViewHandler.py | 54 --
4 files changed, 2 insertions(+), 61 deletions(-)
New commits:
commit d6308705133ccde121dcd40f94a1d4367356630b
Author: Xisco Fauli
Date: Wed Dec 19 19:21:31 2012 +0100
pywizards: get rid of ViewHandler
Change-Id: Ie0098f0342a5863ffeb9dec96104efb7d94d7ae2
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index 18141dc..abc6040 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Pyuno_add_files,wizards,\
text/TextDocument.py \
text/TextFieldHandler.py \
text/TextSectionHandler.py \
-text/ViewHandler.py \
ui/__init__.py \
ui/ControlScroller.py \
ui/ImageList.py \
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 9aa2d72..0c5ed84 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -24,7 +24,6 @@ from ..ui.PathSelection import PathSelection
from ..ui.event.UnoDataAware import UnoDataAware
from ..ui.event.RadioDataAware import RadioDataAware
from ..text.TextFieldHandler import TextFieldHandler
-from ..text.ViewHandler import ViewHandler
from ..text.TextElement import TextElement
from ..common.Configuration import Configuration
from ..common.SystemDialog import SystemDialog
@@ -206,8 +205,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
oDoc = OfficeDocument.load(Desktop.getDesktop(self.xMSF),
self.sPath, "_default", loadValues)
-myViewHandler = ViewHandler(self.xMSF, oDoc)
-myViewHandler.setViewSetting("ZoomType", OPTIMAL)
+oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL
else:
pass
#TODO: Error Handling
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 7d50619..a7ff8f6 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -29,7 +29,6 @@ from ..ui.PathSelection import PathSelection
from ..ui.event.UnoDataAware import UnoDataAware
from ..ui.event.RadioDataAware import RadioDataAware
from ..text.TextElement import TextElement
-from ..text.ViewHandler import ViewHandler
from ..text.TextFieldHandler import TextFieldHandler
from ..document.OfficeDocument import OfficeDocument
@@ -240,8 +239,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
oDoc = OfficeDocument.load(
Desktop.getDesktop(self.xMSF),
self.sPath, "_default", loadValues)
-myViewHandler = ViewHandler(self.xMSF, oDoc)
-myViewHandler.setViewSetting("ZoomType", OPTIMAL)
+oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL
else:
pass
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.py
b/wizards/com/sun/star/wizards/text/ViewHandler.py
deleted file mode 100644
index 1609acb..000
--- a/wizards/com/sun/star/wizards/text/ViewHandler.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# 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 .
-#
-class ViewHandler(object):
-'''Creates a new instance of View '''
-
-def __init__ (self, xMSF, xTextDocument):
-self.xMSFDoc = xMSF
-self.xTextDocument = xTextDocument
-self.xTextViewCursorSupplier = xTextDocument.CurrentController
-
-def selectFirstPage(self, oTextTableHandler):
-try:
-xPageCursor = self.xTextViewCursorSupplier.ViewCursor
-xPageCursor.jumpToFirstPage()
-xPageCursor.jumpToStartOfPage()
-Helper.setUnoPropertyValue(
-xPageCursor, "PageDescName", "First Page")
-oPageStyles = self.xT
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextFieldHandler.py | 20 -- 1 file changed, 9 insertions(+), 11 deletions(-) New commits: commit 8347fa7f8ed75a341e22733e53e7d64e7a930db2 Author: Xisco Fauli Date: Tue Dec 18 20:06:51 2012 +0100 pywizards: Delete all empty TextFields after finishing Change-Id: Ic1c0c6e6f6174d4337abf06f32d9fd8072c2511d diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py index 379abb1..0037f2b 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py @@ -154,14 +154,12 @@ class TextFieldHandler(object): def removeUserFieldByContent(self): #Remove userfield when its text is empty -try: -xDependentTextFields = TextFieldHandler.dictTextFields.values() -for i in xDependentTextFields: -try: -if not i.TextFieldMaster.Content: -i.dispose() -except UnknownPropertyException: -pass - -except Exception: -traceback.print_exc() +xDependentTextFields = TextFieldHandler.arrayTextFields +for i in xDependentTextFields: +try: +if not i.TextFieldMaster.Content: +i.dispose() +except Exception: +#TextField doesn't even have the attribute Content, +#so it's empty +i.dispose() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 7431458606db21d695b0b891f25d3617030bf0f4
Author: Xisco Fauli
Date: Tue Dec 18 19:07:55 2012 +0100
pywizards: Fix finish in Windows one and for all
Change-Id: I450e2f32a3579778163655b65cd112f952f0456f
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 75d7d72..97197ab 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -16,9 +16,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import uno
-import os.path
import traceback
-from unohelper import systemPathToFileUrl
+from unohelper import systemPathToFileUrl, absolutize
from ..ui.event.CommonListener import TerminateListenerProcAdapter
from ..common.Desktop import Desktop
@@ -210,9 +209,11 @@ class OfficeDocument(object):
else:
oStoreProperties = list(range(0))
+StorePath = systemPathToFileUrl(StorePath)
+sPath = StorePath[:(StorePath.rfind("/") + 1)]
+sFile = StorePath[(StorePath.rfind("/") + 1):]
xComponent.storeToURL(
-os.path.abspath(systemPathToFileUrl(StorePath)),
-tuple(oStoreProperties))
+absolutize(sPath, sFile), tuple(oStoreProperties))
return True
except ErrorCodeIOException:
#Throw this exception when trying to save a file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 355c30789e311aa13d7421ce653dc80a9030c2e2
Author: Xisco Fauli
Date: Mon Dec 17 19:53:03 2012 +0100
pywizards: absolutize fails in Windows with backslash
I don't have a way to test it in Windows, so I hope it fixed now
Change-Id: I0f24aadb26c0d091fa95d9fcc655fa876c4b18db
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 85c49bc..75d7d72 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -16,8 +16,9 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
import uno
+import os.path
import traceback
-from unohelper import absolutize, systemPathToFileUrl
+from unohelper import systemPathToFileUrl
from ..ui.event.CommonListener import TerminateListenerProcAdapter
from ..common.Desktop import Desktop
@@ -209,10 +210,8 @@ class OfficeDocument(object):
else:
oStoreProperties = list(range(0))
-sPath = StorePath[:(StorePath.rfind("/") + 1)]
-sFile = StorePath[(StorePath.rfind("/") + 1):]
xComponent.storeToURL(
-absolutize(systemPathToFileUrl(sPath), sFile),
+os.path.abspath(systemPathToFileUrl(StorePath)),
tuple(oStoreProperties))
return True
except ErrorCodeIOException:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/web/BackgroundsDialog.py |4 ++--
wizards/com/sun/star/wizards/web/IconsDialog.py |4 ++--
wizards/com/sun/star/wizards/web/WWD_Events.py| 10 +-
wizards/com/sun/star/wizards/web/WebWizardDialog.py |2 +-
wizards/com/sun/star/wizards/web/data/CGDocument.py | 10 +-
5 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 50bdce1a194d8a9ba5c1e2bc4fb622023d3009a3
Author: Julien Nabet
Date: Sun Dec 9 23:36:34 2012 +0100
Python/pep8: fix E711 in wizards/../web module
Change-Id: I1efbf6ed09cefb5d69ac615d77cfee7eff6383f2
diff --git a/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
b/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
index 9d100b0..640daee 100644
--- a/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
+++ b/wizards/com/sun/star/wizards/web/BackgroundsDialog.py
@@ -56,7 +56,7 @@ class BackgroundsDialog(ImageListDialog):
def other(self):
filename = self.sd.callOpenDialog(
False, self.settings.cp_DefaultSession.cp_InDirectory)
-if filename != None and filename.length > 0 and filename[0] != None:
+if filename is not None and filename.length > 0 and filename[0] is not
None:
self.settings.cp_DefaultSession.cp_InDirectory = \
FileAccess.getParentDir(filename[0])
i = add(filename[0])
@@ -107,7 +107,7 @@ class BackgroundsDialog(ImageListDialog):
self.cut = cut_
def getImageUrls(self, listItem):
-if listItem != None:
+if listItem is not None:
sRetUrls = range(1)
sRetUrls[0] = listItem
return sRetUrls
diff --git a/wizards/com/sun/star/wizards/web/IconsDialog.py
b/wizards/com/sun/star/wizards/web/IconsDialog.py
index efac585..ee83a77 100644
--- a/wizards/com/sun/star/wizards/web/IconsDialog.py
+++ b/wizards/com/sun/star/wizards/web/IconsDialog.py
@@ -61,7 +61,7 @@ class IconsDialog(ImageListDialog):
self.build()
def getIconset(self):
-if getSelected() == None:
+if getSelected() is None:
return None
else:
return self.set.getKey((getSelected()) / len(self.icons))
@@ -91,7 +91,7 @@ class IconsDialog(ImageListDialog):
return sRetUrls
def render(self, object):
-if object == None:
+if object is None:
return ""
i = (object).intValue()
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 9b48ceb..427b428 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -340,7 +340,7 @@ class WWD_Events(WWD_Startup):
'''
def setBackground(self, background):
-if background == None:
+if background is None:
background = ""
WWD_Startup.settings.cp_DefaultSession.cp_Design.cp_BackgroundImage \
@@ -390,7 +390,7 @@ class WWD_Events(WWD_Startup):
updates the ui
'''
def setPublishUrl(self, publisher, url, number):
-if url == None:
+if url is None:
return None
p = getPublisher(publisher)
@@ -465,7 +465,7 @@ class WWD_Events(WWD_Startup):
def documentPreview(self):
try:
-if self.docPreview == None:
+if self.docPreview is None:
self.docPreview = TOCPreview(
self.xMSF, settings, resources,
stylePreview.tempDir, myFrame)
@@ -653,7 +653,7 @@ class WWD_Events(WWD_Startup):
# first I check if a session with the given name exists
try:
node = Configuration.getNode(name, conf)
-if node != None:
+if node is not None:
if not AbstractErrorHandler.showMessage(
self.xMSF, self.xUnoDialog.Peer,
resources.resSessionExists.replace("${NAME}",
name),
@@ -755,7 +755,7 @@ class WWD_Events(WWD_Startup):
'''
p = getPublisher(FTP_PUBLISHER)
# if ftp is checked, and no proxies are set, and password is empty...
-if p.cp_Publish and not proxies and p.password == None or \
+if p.cp_Publish and not proxies and p.password is None or \
p.password == "":
if showFTPDialog(p):
updatePublishUI(2)
diff --git a/wizards/com/sun/star/wizards/web/WebWizardDialog.py
b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
index 0fd86c4..f6fbc39 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardDialog.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardDialog.py
@@ -721,7 +721,7 @@ class WebWizardDialog(WizardDialog):
def getImageUrls(self, listItem):
oResIds = None
-if listItem != None:
+if listItem is not None:
oRes
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/ui/ImageList.py |4 ++--
wizards/com/sun/star/wizards/ui/UnoDialog.py |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit c9bce39210b51e537b7eacd05e6af796a510f52b
Author: Julien Nabet
Date: Sun Dec 9 23:31:47 2012 +0100
Python/pep8: fix E711 in wizards/../ui module
Change-Id: Ia54399c218e9d402ce09fe652908c584bf0d02b1
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py
b/wizards/com/sun/star/wizards/ui/ImageList.py
index b743afa..10e3ff4 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.py
+++ b/wizards/com/sun/star/wizards/ui/ImageList.py
@@ -327,7 +327,7 @@ class ImageList(object):
@synchronized(lock)
def addItemListener(self, listener):
-if self.itemListenerList == None:
+if self.itemListenerList is None:
self.itemListenerList = java.util.ArrayList.ArrayList()
self.itemListenerList.append(listener)
@@ -339,7 +339,7 @@ class ImageList(object):
@synchronized(lock)
def removeItemListener(self, listener):
-if self.itemListenerList != None:
+if self.itemListenerList is not None:
self.itemListenerList.remove(listener)
'''
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py
b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 9671367..a5b1d18 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -180,19 +180,19 @@ class UnoDialog(object):
'''
def executeDialog(self, FramePosSize):
-if self.xUnoDialog.getPeer() == None:
+if self.xUnoDialog.getPeer() is None:
raise AttributeError(
"Please create a peer, using your own frame")
self.calculateDialogPosition(FramePosSize)
-if self.xWindowPeer == None:
+if self.xWindowPeer is None:
self.createWindowPeer()
return self.xUnoDialog.execute()
def setVisible(self, parent):
self.calculateDialogPosition(parent.xWindow.getPosSize())
-if self.xWindowPeer == None:
+if self.xWindowPeer is None:
self.createWindowPeer()
self.xUnoDialog.setVisible(True)
@@ -237,7 +237,7 @@ class UnoDialog(object):
def createWindowPeer(self, parentPeer=None):
self.xUnoDialog.setVisible(False)
xToolkit = self.xMSF.createInstance("com.sun.star.awt.Toolkit")
-if parentPeer == None:
+if parentPeer is None:
parentPeer = xToolkit.getDesktopWindow()
self.xUnoDialog.createPeer(xToolkit, parentPeer)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/document/OfficeDocument.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fbfda39d26da6747edb3a4c6d593be7e6b2b0f1d Author: Julien Nabet Date: Sun Dec 9 23:28:58 2012 +0100 Python/pep8: fix E711 in document module Change-Id: I76efd29101d191fae6560d177a79710329ac2596 diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py b/wizards/com/sun/star/wizards/document/OfficeDocument.py index 69391bb..8abc1e1 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.py +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py @@ -64,7 +64,7 @@ class OfficeDocument(object): def dispose(self, xMSF, xComponent): try: -if xComponent != None: +if xComponent is not None: xFrame = xComponent.CurrentController.Frame if xComponent.isModified(): xComponent.setModified(False) @@ -228,7 +228,7 @@ class OfficeDocument(object): def close(self, xComponent): bState = False -if xComponent != None: +if xComponent is not None: try: xComponent.close(True) bState = True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/ConfigSet.py |2 - wizards/com/sun/star/wizards/common/PropertySetHelper.py | 28 +++ 2 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 5020526b6e04fe21c0d7027e2e3070dad08dd6d9 Author: Julien Nabet Date: Sun Dec 9 23:27:39 2012 +0100 Python/pep8: fix E711 (is or is not None instead of = or !=) in common module Change-Id: I98fc203e5820475cb6849c3708266face92f9403 diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index e1a899b..f9b3856 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -192,7 +192,7 @@ class ConfigSet(ConfigNode): i = 0 while i < v.size(): member = v.get(i) -if member != None: +if member is not None: Configuration.set((index + 1), indexPropertyName, member) i += 1 diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py index c7d75a5..3736972 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py @@ -47,7 +47,7 @@ class PropertySetHelper(object): ''' def setPropertyValue(self, _sName, _aValue): -if self.m_xPropertySet != None: +if self.m_xPropertySet is not None: try: self.m_xPropertySet.setPropertyValue(_sName, _aValue) except com.sun.star.beans.UnknownPropertyException, e: @@ -76,7 +76,7 @@ class PropertySetHelper(object): def getPropertyValueAsInteger(self, _sName, _nDefault): aObject = None nValue = _nDefault -if self.m_xPropertySet != None: +if self.m_xPropertySet is not None: try: aObject = self.m_xPropertySet.getPropertyValue(_sName) except com.sun.star.beans.UnknownPropertyException, e: @@ -84,7 +84,7 @@ class PropertySetHelper(object): except com.sun.star.lang.WrappedTargetException, e: DebugHelper.writeInfo(e.getMessage()) -if aObject != None: +if aObject is not None: try: nValue = NumericalHelper.toInt(aObject) except ValueError, e: @@ -103,7 +103,7 @@ class PropertySetHelper(object): def getPropertyValueAsShort(self, _sName, _nDefault): aObject = None nValue = _nDefault -if self.m_xPropertySet != None: +if self.m_xPropertySet is not None: try: aObject = self.m_xPropertySet.getPropertyValue(_sName) except com.sun.star.beans.UnknownPropertyException, e: @@ -111,7 +111,7 @@ class PropertySetHelper(object): except com.sun.star.lang.WrappedTargetException, e: DebugHelper.writeInfo(e.getMessage()) -if aObject != None: +if aObject is not None: try: nValue = NumericalHelper.toShort(aObject) except ValueError, e: @@ -129,7 +129,7 @@ class PropertySetHelper(object): def getPropertyValueAsDouble(self, _sName, _nDefault): aObject = None nValue = _nDefault -if self.m_xPropertySet != None: +if self.m_xPropertySet is not None: try: aObject = self.m_xPropertySet.getPropertyValue(_sName) except com.sun.star.beans.UnknownPropertyException, e: @@ -139,11 +139,11 @@ class PropertySetHelper(object): # TODO: I wonder why the same thing is not done in the rest of the # getPropertyValueAs* functions... -if aObject == None: +if aObject is None: if _sName in self.m_aHashMap: aObject = self.m_aHashMap[_sName] -if aObject != None: +if aObject is not None: try: nValue = NumericalHelper.toDouble(aObject) except ValueError, e: @@ -161,7 +161,7 @@ class PropertySetHelper(object): def getPropertyValueAsBoolean(self, _sName, _bDefault): aObject = None bValue = _bDefault -if self.m_xPropertySet != None: +if self.m_xPropertySet is not None: try: aObject = self.m_xPropertySet.getPropertyValue(_sName) except com.sun.star.beans.UnknownPropertyException, e: @@ -171,7 +171,7 @@ class PropertySetHelper(object): except com.sun.star.lang.WrappedTargetException, e: DebugHelper.writeInfo(e.getMessage()) -if aObject != None: +if aObject is not None: try: bValue = NumericalHelper.toBoolean(aObject) except ValueError, e: @@ -189,7 +189,7 @@ class PropertySetHelper(object): def getPropertyValueAsString(self, _sName, _sDefault): aObject = None sValue = _sDef
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaTemplate.py |4 +- wizards/com/sun/star/wizards/letter/LetterDocument.py | 14 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py | 14 +- 3 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 36638e6a876fbeb6217e7ea4ee00fbc022a013c8 Author: Julien Nabet Date: Sun Dec 9 23:23:27 2012 +0100 Python/pep8: fix E711 (is or is not None instead of = or !=) in letter module Change-Id: Ic6ff028008aea87d1bf2126dccd2afb1bf3733d2 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py index c16dd7c..54be369 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py @@ -560,8 +560,8 @@ class AgendaTemplate(TextDocument): paraStyle = Range.ParaStyleName Range.setString(text) Range.ParaStyleName = paraStyle -if text == None or text == "": -if placeholder != None and not placeholder == "": +if text is None or text == "": +if placeholder is not None and not placeholder == "": placeHolder = createPlaceHolder( self.xTextDocument, placeholder, self.resources.resPlaceHolderHint) diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py index 75025a2..dd04842 100644 --- a/wizards/com/sun/star/wizards/letter/LetterDocument.py +++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py @@ -60,7 +60,7 @@ class LetterDocument(TextDocument): FH.updateDateFields() def switchFooter(self, sPageStyle, bState, bPageNumber, sText): -if self.xTextDocument != None: +if self.xTextDocument is not None: try: self.xTextDocument.lockControllers() xNameAccess = self.xTextDocument.StyleFamilies @@ -94,7 +94,7 @@ class LetterDocument(TextDocument): traceback.print_exc() def hasElement(self, sElement): -if self.xTextDocument != None: +if self.xTextDocument is not None: SH = TextSectionHandler(self.xMSF, self.xTextDocument) return SH.hasTextSectionByName(sElement) else: @@ -137,31 +137,31 @@ class LetterDocument(TextDocument): if not self.keepLogoFrame: xTF = self.getFrameByName( "Company Logo", self.xTextDocument) -if xTF != None: +if xTF is not None: xTF.dispose() if not self.keepBendMarksFrame: xTF = self.getFrameByName( "Bend Marks", self.xTextDocument) -if xTF != None: +if xTF is not None: xTF.dispose() if not self.keepLetterSignsFrame: xTF = self.getFrameByName( "Letter Signs", self.xTextDocument) -if xTF != None: +if xTF is not None: xTF.dispose() if not self.keepSenderAddressRepeatedFrame: xTF = self.getFrameByName( "Sender Address Repeated", self.xTextDocument) -if xTF != None: +if xTF is not None: xTF.dispose() if not self.keepAddressFrame: xTF = self.getFrameByName( "Sender Address", self.xTextDocument) -if xTF != None: +if xTF is not None: xTF.dispose() except Exception: diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py index 29b802f..e9ace51 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py @@ -427,7 +427,7 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.xDialogModel.numLogoY.Enabled = True self.setPossibleLogo(False) else: -if self.BusCompanyLogo != None: +if self.BusCompanyLogo is not None: self.BusCompanyLogo.removeFrame() self.xDialogModel.numLogoHeight.Enabled = False @@ -501,7 +501,7 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.setPossibleSenderData(False) else: -if self.BusCompanyAddressReceiver != None: +if self.BusCompanyAddressReceiver is not None: self.BusCompanyAddressReceiver.removeFrame() self.setPossibleAddressReceiver(True) @@ -527,7 +527,7 @@ class LetterWizardDialogImpl(LetterWizardDialog): self.xDialogModel.lblFooterHeight.Enabled = True self.setPossibleFooter(False) else: -
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextFieldHandler.py |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 7236370a4f0228878ecb2b7dd160f009f8ddefd1 Author: Xisco Fauli Date: Mon Dec 3 21:56:59 2012 +0100 pywizards: handle exception Change-Id: Ia53cf4e2ab8f2e2905b1dc24ac7d6b17e9330154 diff --git a/wizards/com/sun/star/wizards/text/TextFieldHandler.py b/wizards/com/sun/star/wizards/text/TextFieldHandler.py index ce00db8..9af08be 100644 --- a/wizards/com/sun/star/wizards/text/TextFieldHandler.py +++ b/wizards/com/sun/star/wizards/text/TextFieldHandler.py @@ -102,9 +102,12 @@ class TextFieldHandler(object): TextFieldHandler.dictTextFields[_FieldName] except KeyError: return None -if hasattr(DependentTextFields, "TextFieldMaster"): -DependentTextFields.TextFieldMaster.Content = _FieldContent -self.refreshTextFields() +try: +if hasattr(DependentTextFields, "TextFieldMaster"): +DependentTextFields.TextFieldMaster.Content = _FieldContent +self.refreshTextFields() +except UnknownPropertyException: +pass def updateDocInfoFields(self): try: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/text/TextDocument.py |7 --- 1 file changed, 7 deletions(-) New commits: commit c043062913167ef2dece0fc243a90bb86c32868e Author: Xisco Fauli Date: Thu Oct 11 21:36:00 2012 +0200 pywizards: This code does nothing but an exception. Delete it Change-Id: If35b68073210d7da368a96623853c3d68d8425b5 diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py index 2dea2ce..6570aa4 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.py +++ b/wizards/com/sun/star/wizards/text/TextDocument.py @@ -139,13 +139,6 @@ class TextDocument(object): 'com.sun.star.beans.PropertyValue') loadValues[2].Name = "Preview" loadValues[2].Value = True -'''set the preview document to non-modified -mode in order to avoid the 'do u want to save' box''' -if TextDocument.xTextDocument is not None: -try: -TextDocument.xTextDocument.Modified = False -except PropertyVetoException, e1: -traceback.print_exc() TextDocument.xTextDocument = OfficeDocument.load( self.xFrame, sDefaultTemplate, "_self", loadValues) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 42
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 4073a5b91605163cda9d3bdcb3c048c70b23b0ff
Author: Xisco Fauli
Date: Wed Oct 10 23:40:40 2012 +0200
pyfax: Make toggle buttons work again
Change-Id: Ie408274ffea5539568fb98c44fa993d3de14a2d6
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 3185736..58fa46f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -180,9 +180,9 @@ class FaxWizardDialogImpl(FaxWizardDialog):
self.resources.resFaxWizardDialog_title,
self.resources.resTemplateDescription)
self.myFaxDoc.killEmptyUserFields()
-self.myFaxDoc.keepLogoFrame = (self.chkUseLogo.State is not 0)
+self.myFaxDoc.keepLogoFrame = bool(self.chkUseLogo.State)
self.myFaxDoc.keepTypeFrame = \
-(self.chkUseCommunicationType.State is not 0)
+bool(self.chkUseCommunicationType.State)
self.myFaxDoc.killEmptyFrames()
self.bSaveSuccess = OfficeDocument.store(self.xMSF,
TextDocument.xTextDocument, self.sPath, "writer8_template")
@@ -601,36 +601,36 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def chkUseLogoItemChanged(self):
if self.myFaxDoc.hasElement("Company Logo"):
self.myFaxDoc.switchElement("Company Logo",
-(self.chkUseLogo.State is not 0))
+bool(self.chkUseLogo.State))
def chkUseSubjectItemChanged(self):
if self.myFaxDoc.hasElement("Subject Line"):
self.myFaxDoc.switchElement("Subject Line",
-(self.chkUseSubject.State is not 0))
+bool(self.chkUseSubject.State))
def chkUseDateItemChanged(self):
if self.myFaxDoc.hasElement("Date"):
self.myFaxDoc.switchElement("Date",
-(self.chkUseDate.State is not 0))
+bool(self.chkUseDate.State))
def chkUseFooterItemChanged(self):
try:
-bFooterPossible = (self.chkUseFooter.State is not 0) \
+bFooterPossible = bool(self.chkUseFooter.State) \
and bool(self.getControlProperty("chkUseFooter",
PropertyNames.PROPERTY_ENABLED))
-if self.chkFooterNextPages.State is not 0:
+if bool(self.chkFooterNextPages.State):
self.myFaxDoc.switchFooter("First Page", False,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
self.txtFooter.Text)
self.myFaxDoc.switchFooter("Standard", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
self.txtFooter.Text)
else:
self.myFaxDoc.switchFooter("First Page", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
self.txtFooter.Text)
self.myFaxDoc.switchFooter("Standard", bFooterPossible,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
self.txtFooter.Text)
#enable/disable roadmap item for footer page
@@ -649,43 +649,43 @@ class FaxWizardDialogImpl(FaxWizardDialog):
def txtFooterTextChanged(self):
self.myFaxDoc.switchFooter("First Page", True,
-(self.chkFooterPageNumbers.State is not 0),
+bool(self.chkFooterPageNumbers.State),
self.txtFooter.Text)
def chkUseSalutationItemChanged(self):
self.myFaxDoc.switchUserField("Salutation",
-self.lstSalutation.Text, (self.chkUseSalutation.State is not 0))
+self.lstSalutation.Text, bool(self.chkUseSalutation.State))
self.setControlProperty("lstSalutation",
PropertyNames.PROPERTY_ENABLED,
-self.chkUseSalutation.State is not 0)
+bool(self.chkUseSalutation.State))
def lstSalutationItemChanged(self):
self.myFaxDoc.switchUserField("Salutation",
-self.lstSalutation.Text, (self.chkUseSalutation.State is not 0))
+self.lstSalutation.Text, bool(self.chkUseSalutation.State))
def chkUseCommunicationItemChanged(self):
self.myFaxDoc.switchUserField("CommunicationType",
self.lstCommunicationType.Text,
-(self.chkUseCommunicationType.State is not 0))
+bool(self.chkUseCommunicationType.State))
self.setControlProperty("lstCommunicationType",
PropertyNames.PROP
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit aebe36aa52e51fd5ce22e445e6ca82c544149c1b Author: Xisco Fauli Date: Mon Oct 8 22:38:43 2012 +0200 pyfax: Unused import Change-Id: I46b01dcf734580aa8baca1125e0bc48867f9 diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 0547ea1..3185736 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -16,8 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno, \ -WizardDialog +from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno from .CGFaxWizard import CGFaxWizard from .FaxDocument import FaxDocument from .FaxWizardDialogConst import HID ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 15 +--- wizards/com/sun/star/wizards/ui/PathSelection.py |6 +-- wizards/com/sun/star/wizards/ui/WizardDialog.py |9 - wizards/com/sun/star/wizards/ui/XPathSelectionListener.py | 24 -- 4 files changed, 13 insertions(+), 41 deletions(-) New commits: commit 4d9ab30c7dbe944d5bf268d64b493ced957bb9f3 Author: Xisco Fauli Date: Mon Oct 8 22:28:55 2012 +0200 pyfax: Don't show "the file already exists" when it doesn't do Change-Id: Iab496836b692d47be75bb617b0b28835acf01713 diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index ae73800..0547ea1 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -16,7 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno +from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno, \ +WizardDialog from .CGFaxWizard import CGFaxWizard from .FaxDocument import FaxDocument from .FaxWizardDialogConst import HID @@ -103,7 +104,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.initializeCommunication() self.__initializePaths() -#special Control fFrameor setting the save Path: +#special Control for setting the save Path: self.insertPathSelectionControl() self.initializeTemplates(xMSF) @@ -157,7 +158,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): try: fileAccess = FileAccess(self.xMSF) self.sPath = self.myPathSelection.getSelectedPath() -if self.sPath == "": +if not self.sPath: self.myPathSelection.triggerPathPicker() self.sPath = self.myPathSelection.getSelectedPath() @@ -279,8 +280,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myPathSelection.sDefaultDirectory = self.UserTemplatePath self.myPathSelection.sDefaultName = "myFaxTemplate.ott" self.myPathSelection.sDefaultFilter = "writer8_template" -self.myPathSelection.addSelectionListener( \ -self.myPathSelectionListener()) +self.myPathSelection.addSelectionListener(self) def __initializePaths(self): try: @@ -708,3 +708,8 @@ class FaxWizardDialogImpl(FaxWizardDialog): Helper.setUnoPropertyValue(BPaperItem, PropertyNames.PROPERTY_ENABLED, False) + +def validatePath(self): +if self.myPathSelection.usedPathPicker: +self.filenameChanged = True +self.myPathSelection.usedPathPicker = False diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.py b/wizards/com/sun/star/wizards/ui/PathSelection.py index 6d5762d..b468004 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.py +++ b/wizards/com/sun/star/wizards/ui/PathSelection.py @@ -117,7 +117,7 @@ class PathSelection(object): self.sDefaultName, self.sDefaultFilter) sStorePath = myFilePickerDialog.sStorePath if sStorePath is not None: -myFA = FileAccess(self.xMSF); +myFA = FileAccess(self.xMSF) self.xSaveTextBox.Text = myFA.getPath(sStorePath, None) self.sDefaultDirectory = \ FileAccess.getParentDir(sStorePath) @@ -134,5 +134,5 @@ class PathSelection(object): traceback.print_exc() def callXPathSelectionListener(self): -if self.xAction != None: -self.xAction.validatePath() +if self.xAction is not None: +self.xAction.validatePath() diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py index ebc401e..ea7cab8 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.py +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py @@ -20,7 +20,6 @@ import traceback from abc import ABCMeta, abstractmethod from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \ ItemListenerProcAdapter -from .XPathSelectionListener import XPathSelectionListener from .event.CommonListener import TerminateListenerProcAdapter from ..common.Helper import Helper from ..common.Resource import Resource @@ -501,11 +500,3 @@ class WizardDialog(UnoDialog2): OfficeDocument.attachEventCall( TextDocument.xTextDocument, "OnNew", "StarBasic", "macro:///Template.Correspondence.Database()") - -class myPathSelectionListener(XPathSelectionListener): - -def validatePath(self): -if self.myPathSelection.usedPathPicker: -self.filenameChanged = True - -self.myPathSelection.u
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/TextElement.py | 41 +++
wizards/com/sun/star/wizards/fax/CallWizard.py |1
wizards/com/sun/star/wizards/fax/FaxDocument.py |9 +-
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 34 -
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py | 31 +++-
5 files changed, 106 insertions(+), 10 deletions(-)
New commits:
commit 74e4137cf89d3e1e8b73853702636e3ff70a3b4e
Author: Xisco Fauli
Date: Thu Sep 27 22:12:21 2012 +0200
pyfax: Translate the template at run-time
Change-Id: Ied94eaeb33dcfab582ac1d4702b736cf81c5d7ca
diff --git a/wizards/com/sun/star/wizards/common/TextElement.py
b/wizards/com/sun/star/wizards/common/TextElement.py
new file mode 100644
index 000..f035808
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/TextElement.py
@@ -0,0 +1,41 @@
+#
+# 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 .
+#
+import traceback
+from .Helper import Helper
+from com.sun.star.text.PlaceholderType import TEXT
+
+class TextElement(object):
+
+def __init__(self, item, placeHolderText, hint, xmsf):
+self.item = item
+self.placeHolderText = placeHolderText
+self.xmsf = xmsf
+self.paraStyle = Helper.getUnoPropertyValue(
+item.Start, "ParaStyleName")
+
+def write(self):
+try:
+if self.item is not None:
+self.item.String = ""
+cursor = self.item.Text.createTextCursorByRange(
+self.item.Start)
+cursor.String = self.placeHolderText
+Helper.setUnoPropertyValue(
+cursor, "ParaStyleName", self.paraStyle)
+except Exception, e:
+traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py
b/wizards/com/sun/star/wizards/fax/CallWizard.py
index 427a703..8ef1d24 100644
--- a/wizards/com/sun/star/wizards/fax/CallWizard.py
+++ b/wizards/com/sun/star/wizards/fax/CallWizard.py
@@ -30,7 +30,6 @@ class CallWizard(unohelper.Base, XJobExecutor):
self.ctx = ctx
def trigger(self, args):
- print "hello"
try:
fw = FaxWizardDialogImpl(self.ctx.ServiceManager)
fw.startWizard(self.ctx.ServiceManager)
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py
b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index 95072de..f86a3f5 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -15,9 +15,9 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-
-from ..text.TextDocument import TextDocument, traceback, Helper,\
- TextFieldHandler, Configuration
+from ..text.TextDocument import *
+#TextDocument, traceback, Helper,\
+#TextFieldHandler, Configuration
from ..text.TextSectionHandler import TextSectionHandler
from ..common.PropertyNames import PropertyNames
@@ -51,8 +51,8 @@ class FaxDocument(TextDocument):
def switchFooter(self, sPageStyle, bState, bPageNumber, sText):
if TextDocument.xTextDocument is not None:
-TextDocument.xTextDocument.lockControllers()
try:
+TextDocument.xTextDocument.lockControllers()
xPageStyleCollection = \
TextDocument.xTextDocument.StyleFamilies.getByName("PageStyles")
xPageStyle = xPageStyleCollection.getByName(sPageStyle)
@@ -84,6 +84,7 @@ class FaxDocument(TextDocument):
TextDocument.xTextDocument.unlockControllers()
except Exception:
+TextDocument.xTextDocument.lockControllers()
traceback.print_exc()
def hasElement(self, sElement):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index e008aeb..249c249 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -32,6 +32,7 @@ from ..common.NoValidPathExcep
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/ConfigSet.py |2 +- wizards/com/sun/star/wizards/common/Configuration.py |3 ++- wizards/com/sun/star/wizards/common/FileAccess.py|2 +- wizards/com/sun/star/wizards/common/NumberFormatter.py |4 ++-- wizards/com/sun/star/wizards/common/PropertySetHelper.py |3 +-- wizards/com/sun/star/wizards/common/Resource.py |6 -- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |2 +- wizards/com/sun/star/wizards/ui/ControlScroller.py |1 - wizards/com/sun/star/wizards/ui/ImageList.py |2 +- wizards/com/sun/star/wizards/ui/PathSelection.py |4 ++-- 10 files changed, 11 insertions(+), 18 deletions(-) New commits: commit 9351d0e4181924c3f72be24081fc7af027aa41f7 Author: Xisco Fauli Date: Mon Sep 24 22:15:09 2012 +0200 pywizards: get rid of import * (3) Change-Id: Ibf7c6fc7863b6eccb28e5396587f2ec00ffcbe43 diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index b5ff836..00b3331 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -16,7 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from .ConfigNode import * +from .ConfigNode import ConfigNode from .Configuration import Configuration class ConfigSet(ConfigNode): diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index d76cad4..8f50558 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -15,9 +15,10 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +import uno import traceback from .PropertyNames import PropertyNames -from .Helper import * +from .Helper import Helper ''' This class gives access to the OO configuration api. diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index 6fa8493..6b91bc4 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -18,7 +18,7 @@ import traceback import types from os import path as osPath -from .NoValidPathException import * +from .NoValidPathException import NoValidPathException from com.sun.star.ucb import CommandAbortedException from com.sun.star.awt.VclWindowPeerAttribute import OK, YES_NO diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.py b/wizards/com/sun/star/wizards/common/NumberFormatter.py index 1a8d3a6..67d9d98 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.py +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.py @@ -16,9 +16,9 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -import uno from com.sun.star.lang import Locale -from com.sun.star.util.NumberFormat import DATE, LOGICAL, DATETIME, TEXT, NUMBER +from com.sun.star.util.NumberFormat import \ + DATE, LOGICAL, DATETIME, TEXT, NUMBER class NumberFormatter(object): diff --git a/wizards/com/sun/star/wizards/common/PropertySetHelper.py b/wizards/com/sun/star/wizards/common/PropertySetHelper.py index 3a2be35..c7d75a5 100644 --- a/wizards/com/sun/star/wizards/common/PropertySetHelper.py +++ b/wizards/com/sun/star/wizards/common/PropertySetHelper.py @@ -15,8 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from .DebugHelper import * -from .DebugHelper import * +from .DebugHelper import DebugHelper class PropertySetHelper(object): diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py index 8d6837a..68f60a7 100644 --- a/wizards/com/sun/star/wizards/common/Resource.py +++ b/wizards/com/sun/star/wizards/common/Resource.py @@ -22,12 +22,6 @@ from .SystemDialog import SystemDialog from com.sun.star.awt.VclWindowPeerAttribute import OK class Resource(object): -''' -Creates a new instance of Resource -@param _xMSF -@param _Unit -@param _Module -''' @classmethod def __init__(self, _xMSF, _Module): diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index e55f01a..e008aeb 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -182,7 +182,7 @@ class FaxWizardDialogImpl(FaxWizardDialog): (self.chkUseCommunicationType.State is not 0) self.myFaxDoc.killEmptyFrames() self.bSaveSuccess = OfficeDocument.store(self.xMSF, - TextDocument.xTextDocument, self.sPath, "
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/Desktop.py | 79 -
1 file changed, 79 deletions(-)
New commits:
commit 46325e3a2ea376ea2d8b641051a5cbde20596aeb
Author: Xisco Fauli
Date: Sun Sep 23 17:39:48 2012 +0200
pywizards: remove unused methods
Change-Id: I1803b7b4bbfed1e3509a8561ba82fae9ccf4412e
Reviewed-on: https://gerrit.libreoffice.org/687
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/wizards/com/sun/star/wizards/common/Desktop.py
b/wizards/com/sun/star/wizards/common/Desktop.py
index 8f38f99..914be17 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.py
+++ b/wizards/com/sun/star/wizards/common/Desktop.py
@@ -50,16 +50,6 @@ class Desktop(object):
return xFrame.getController().getModel()
@classmethod
-def getActiveTextDocument(self, _xMSF):
-xComponent = getActiveComponent(_xMSF)
-return xComponent #Text
-
-@classmethod
-def getActiveSpreadsheetDocument(self, _xMSF):
-xComponent = getActiveComponent(_xMSF)
-return xComponent
-
-@classmethod
def getDispatcher(self, xMSF, xFrame, _stargetframe, oURL):
try:
oURLArray = range(1)
@@ -167,16 +157,6 @@ class OfficePathRetriever:
return sTemplatePath
@classmethod
-def getUserTemplatePath(self, _xMSF):
-sUserTemplatePath = ""
-try:
-sUserTemplatePath = FileAccess.getOfficePath(_xMSF,
-"Template", "user", "")
-except NoValidPathException, nopathexception:
-pass
-return sUserTemplatePath
-
-@classmethod
def getBitmapPath(self, _xMSF):
sBitmapPath = ""
try:
@@ -186,62 +166,3 @@ class OfficePathRetriever:
pass
return sBitmapPath
-
-@classmethod
-def getWorkPath(self, _xMSF):
-sWorkPath = ""
-try:
-sWorkPath = FileAccess.getOfficePath(_xMSF, "Work", "", "")
-
-except NoValidPathException, nopathexception:
-pass
-
-return sWorkPath
-
-@classmethod
-def createStringSubstitution(self, xMSF):
-xPathSubst = None
-try:
-xPathSubst = xMSF.createInstance(
-"com.sun.star.util.PathSubstitution")
-except Exception, e:
-traceback.print_exc()
-
-if xPathSubst != None:
-return xPathSubst
-else:
-return None
-
-'''This method searches (and hopefully finds...) a frame
-with a componentWindow.
-It does it in three phases:
-1. Check if the given desktop argument has a componentWindow.
-If it is null, the myFrame argument is taken.
-2. Go up the tree of frames and search a frame with a component window.
-3. Get from the desktop all the components, and give the first one
-which has a frame.
-@param xMSF
-@param myFrame
-@param desktop
-@return
-@throws NoSuchElementException
-@throws WrappedTargetException
-'''
-
-@classmethod
-def findAFrame(self, xMSF, myFrame, desktop):
-if desktop == None:
-desktop = myFrame
-#we go up in the tree...
-
-while desktop != None and desktop.getComponentWindow() == None:
-desktop = desktop.findFrame("_parent", FrameSearchFlag.PARENT)
-if desktop == None:
-e = Desktop.getDesktop(xMSF).getComponents().createEnumeration()
-while e.hasMoreElements():
-xModel = (e.nextElement()).getObject()
-xFrame = xModel.getCurrentController().getFrame()
-if xFrame != None and xFrame.getComponentWindow() != None:
-return xFrame
-
-return desktop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/ConfigGroup.py |3 -- wizards/com/sun/star/wizards/common/Desktop.py | 12 +-- wizards/com/sun/star/wizards/fax/CGFax.py |3 -- wizards/com/sun/star/wizards/fax/CGFaxWizard.py |3 -- wizards/com/sun/star/wizards/fax/CallWizard.py |1 wizards/com/sun/star/wizards/fax/FaxDocument.py |4 ++- wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 17 ++-- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 12 --- wizards/com/sun/star/wizards/ui/UnoDialog.py|1 wizards/com/sun/star/wizards/ui/UnoDialog2.py |8 --- wizards/com/sun/star/wizards/ui/WizardDialog.py |9 ++-- 11 files changed, 40 insertions(+), 33 deletions(-) New commits: commit 90c128e090da5ed0047a3d43bafc33f32d8b27b7 Author: Xisco Fauli Date: Sun Sep 23 15:58:45 2012 +0200 pyfax: get rid of import * (2) Change-Id: Ibd988812d96f7f539c1e888be9ee25c0c895f358 Reviewed-on: https://gerrit.libreoffice.org/686 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py index 0491c81..44fc675 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.py +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py @@ -15,9 +15,8 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -import traceback import inspect -from .ConfigNode import * +from .ConfigNode import ConfigNode from .Configuration import Configuration class ConfigGroup(ConfigNode): diff --git a/wizards/com/sun/star/wizards/common/Desktop.py b/wizards/com/sun/star/wizards/common/Desktop.py index 86f76e9..8f38f99 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.py +++ b/wizards/com/sun/star/wizards/common/Desktop.py @@ -17,7 +17,7 @@ # import uno import traceback -from .NoValidPathException import * +from .NoValidPathException import NoValidPathException from com.sun.star.frame.FrameSearchFlag import ALL, PARENT from com.sun.star.util import URL @@ -67,7 +67,7 @@ class Desktop(object): xDispatch = xFrame.queryDispatch(oURLArray[0], _stargetframe, ALL) return xDispatch except Exception, e: -e.printStackTrace(System.out) +traceback.print_exc() return None @@ -75,7 +75,7 @@ class Desktop(object): def connect(self, connectStr): localContext = uno.getComponentContext() resolver = localContext.ServiceManager.createInstanceWithContext( - "com.sun.star.bridge.UnoUrlResolver", localContext) +"com.sun.star.bridge.UnoUrlResolver", localContext) ctx = resolver.resolve( connectStr ) orb = ctx.ServiceManager return orb @@ -111,7 +111,7 @@ class Desktop(object): _sString, 0, _aLocale, nStartFlags, "", nStartFlags, " ") return aResult.EndPos except Exception, e: -e.printStackTrace(System.out) +traceback.print_exc() return -1 @classmethod @@ -204,8 +204,8 @@ class OfficePathRetriever: try: xPathSubst = xMSF.createInstance( "com.sun.star.util.PathSubstitution") -except com.sun.star.uno.Exception, e: -e.printStackTrace() +except Exception, e: +traceback.print_exc() if xPathSubst != None: return xPathSubst diff --git a/wizards/com/sun/star/wizards/fax/CGFax.py b/wizards/com/sun/star/wizards/fax/CGFax.py index 868aa8b..ff69cf1 100644 --- a/wizards/com/sun/star/wizards/fax/CGFax.py +++ b/wizards/com/sun/star/wizards/fax/CGFax.py @@ -15,8 +15,7 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -from ..common.ConfigGroup import * -from ..common.ConfigGroup import * +from ..common.ConfigGroup import ConfigGroup class CGFax(ConfigGroup): diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py index 0cfbeb3..30f211a 100644 --- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.py +++ b/wizards/com/sun/star/wizards/fax/CGFaxWizard.py @@ -16,8 +16,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # from .CGFax import CGFax -from ..common.ConfigGroup import * -from ..common.ConfigGroup import * +from ..common.ConfigGroup import ConfigGroup class CGFaxWizard(ConfigGroup): diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.py b/wizards/com/sun/star/wizards/fax/CallWizard.py index 3fbbac1..427a703 100644 --- a/wizards/com/sun/star/wizards/fax/CallWizard.py +++ b/wizards/com/sun/star/wizards/fax/CallWizard.py @@ -15,7 +15,6 @@ # except i
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py | 219 ---
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py | 154 +-
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |4
3 files changed, 203 insertions(+), 174 deletions(-)
New commits:
commit dbdca385fcdb53d14677e2db40debeb26420da63
Author: Xisco Fauli
Date: Sun Sep 23 14:45:40 2012 +0200
Pyfax: Get rid of import * (1)
Change-Id: Ifeb2fca16ef572a7cb1d1aabb651b3cea87ecbea
Reviewed-on: https://gerrit.libreoffice.org/685
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 4da2c4c..c28d1e8 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -15,9 +15,13 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+import uno
from .FaxWizardDialogResources import FaxWizardDialogResources
-from .FaxWizardDialogConst import *
-from ..ui.WizardDialog import *
+from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN
+from ..ui.WizardDialog import WizardDialog
+from ..ui.UIConsts import UIConsts
+from ..common.Helper import Helper
+from ..common.PropertyNames import PropertyNames
from com.sun.star.awt.FontUnderline import SINGLE
@@ -59,7 +63,7 @@ class FaxWizardDialog(WizardDialog):
'''
def buildStep1(self):
self.optBusinessFax = self.insertRadioButton("optBusinessFax",
-OPTBUSINESSFAX_ITEM_CHANGED,
+FaxWizardDialogConst.OPTBUSINESSFAX_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -68,10 +72,12 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-(8, OPTBUSINESSFAX_HID, self.resources.resoptBusinessFax_value,
-97, 28, 1, 1, 184), self)
+(8, FaxWizardDialogConst.OPTBUSINESSFAX_HID,
+ self.resources.resoptBusinessFax_value, 97, 28,
1, 1, 184),
+ self)
self.lstBusinessStyle = self.insertListBox("lstBusinessStyle",
-LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
+FaxWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED,
+FaxWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED,
("Dropdown", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_POSITION_X,
@@ -79,9 +85,10 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-(True, 12, LSTBUSINESSSTYLE_HID, 180, 40, 1, 3, 74), self)
+(True, 12, FaxWizardDialogConst.LSTBUSINESSSTYLE_HID,
+ 180, 40, 1, 3, 74), self)
self.optPrivateFax = self.insertRadioButton("optPrivateFax",
-OPTPRIVATEFAX_ITEM_CHANGED,
+FaxWizardDialogConst.OPTPRIVATEFAX_ITEM_CHANGED,
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_LABEL,
@@ -90,11 +97,11 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-(8, OPTPRIVATEFAX_HID, self.resources.resoptPrivateFax_value,
-97, 81, 1, 2, 184), self)
+(8, FaxWizardDialogConst.OPTPRIVATEFAX_HID,
+ self.resources.resoptPrivateFax_value,97, 81,
1, 2, 184), self)
self.lstPrivateStyle = self.insertListBox("lstPrivateStyle",
-LSTPRIVATESTYLE_ACTION_PERFORMED,
-LSTPRIVATESTYLE_ITEM_CHANGED,
+FaxWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED,
+FaxWizardDialogConst.LSTPRIVATESTYLE_ITEM_CHANGED,
("Dropdown", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL,
PropertyNames.PROPERTY_POSITION_X,
@@ -102,8 +109,8 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
-(True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
-4, 74), self)
+(True, 12, FaxWizardDialogConst.LSTPRIVATESTYLE_HID,
+ 180, 95, 1, 4, 74), self)
self.insertLabel("lblBusinessStyle",
(PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERT
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/SystemDialog.py | 27 +--- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py |4 +- 2 files changed, 12 insertions(+), 19 deletions(-) New commits: commit ad895bc43aafc1589ed0ca239fb0c966dd0589eb Author: Xisco Date: Sun Sep 23 23:07:09 2012 +0200 pywizards: add a name textbox to the filepicker Now it's possible to change the name of the file that is going to be saved Change-Id: I482466e7c006a38a1eab543872101c029d5e2d65 Reviewed-on: https://gerrit.libreoffice.org/688 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py index 21756fc..3a89f98 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.py +++ b/wizards/com/sun/star/wizards/common/SystemDialog.py @@ -15,14 +15,15 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -import uno import traceback from .Configuration import Configuration from .Desktop import Desktop from .Helper import Helper -from com.sun.star.ui.dialogs.TemplateDescription import FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE -from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import CHECKBOX_AUTOEXTENSION +from com.sun.star.ui.dialogs.TemplateDescription import \ +FILESAVE_AUTOEXTENSION, FILEOPEN_SIMPLE +from com.sun.star.ui.dialogs.ExtendedFilePickerElementIds import \ +CHECKBOX_AUTOEXTENSION from com.sun.star.awt import WindowDescriptor from com.sun.star.awt.WindowClass import MODALTOP from com.sun.star.lang import IllegalArgumentException @@ -30,25 +31,24 @@ from com.sun.star.awt.VclWindowPeerAttribute import OK class SystemDialog(object): -''' -@param xMSF -@param ServiceName -@param type according to com.sun.star.ui.dialogs.TemplateDescription -''' - def __init__(self, xMSF, ServiceName, Type): try: self.xMSF = xMSF self.systemDialog = xMSF.createInstance(ServiceName) self.xStringSubstitution = self.createStringSubstitution(xMSF) + # Add a name textbox to the filepicker +if self.systemDialog is not None: + self.systemDialog.initialize((Type,)) + except Exception, exception: traceback.print_exc() @classmethod def createStoreDialog(self, xmsf): return SystemDialog( -xmsf, "com.sun.star.ui.dialogs.FilePicker",FILESAVE_AUTOEXTENSION) +xmsf, "com.sun.star.ui.dialogs.FilePicker", +FILESAVE_AUTOEXTENSION) @classmethod def createOpenDialog(self, xmsf): @@ -73,13 +73,6 @@ class SystemDialog(object): traceback.print_exc() return path -''' -@param displayDir -@param defaultName -given url to a local path. -@return -''' - def callStoreDialog(self, displayDir, defaultName, sDocuType=None): if sDocuType is not None: self.addFilterToDialog(defaultName[-3:], sDocuType, True) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py index 980a28f..a475fa5 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py @@ -173,8 +173,8 @@ class FaxWizardDialogImpl(FaxWizardDialog): self.myFaxDoc.keepTypeFrame = \ (self.chkUseCommunicationType.State is not 0) self.myFaxDoc.killEmptyFrames() -self.bSaveSuccess = OfficeDocument.store(self.xMSF, TextDocument.xTextDocument, -self.sPath, "writer8_template") +self.bSaveSuccess = OfficeDocument.store(self.xMSF, + TextDocument.xTextDocument, self.sPath, "writer8_template") if self.bSaveSuccess: self.saveConfiguration() xIH = self.xMSF.createInstance( \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/RemoteWebWizard | 15 wizards/com/sun/star/wizards/common/ConfigGroup.py |4 - wizards/com/sun/star/wizards/common/ConfigSet.py |4 - wizards/com/sun/star/wizards/common/Configuration.py |5 - wizards/com/sun/star/wizards/common/Desktop.py |2 wizards/com/sun/star/wizards/common/FileAccess.py|2 wizards/com/sun/star/wizards/common/Helper.py|2 wizards/com/sun/star/wizards/common/NumberFormatter.py |2 wizards/com/sun/star/wizards/common/PropertySetHelper.py |4 - wizards/com/sun/star/wizards/common/Resource.py |4 - wizards/com/sun/star/wizards/common/SystemDialog.py |6 - wizards/com/sun/star/wizards/document/OfficeDocument.py |4 - wizards/com/sun/star/wizards/fax/CGFax.py|4 - wizards/com/sun/star/wizards/fax/CGFaxWizard.py |6 - wizards/com/sun/star/wizards/fax/CallWizard.py | 37 +-- wizards/com/sun/star/wizards/fax/FaxDocument.py |7 -- wizards/com/sun/star/wizards/fax/FaxWizardDialog.py |7 -- wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py |3 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py | 27 +++- wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py |2 wizards/com/sun/star/wizards/fax/__init__.py |3 wizards/com/sun/star/wizards/remote.py |8 ++ wizards/com/sun/star/wizards/text/TextDocument.py| 12 +-- wizards/com/sun/star/wizards/text/TextFieldHandler.py|2 wizards/com/sun/star/wizards/text/TextSectionHandler.py |2 wizards/com/sun/star/wizards/ui/ImageList.py |8 +- wizards/com/sun/star/wizards/ui/PathSelection.py |6 - wizards/com/sun/star/wizards/ui/PeerConfig.py|2 wizards/com/sun/star/wizards/ui/UnoDialog.py |7 -- wizards/com/sun/star/wizards/ui/UnoDialog2.py|9 +- wizards/com/sun/star/wizards/ui/WizardDialog.py | 13 +-- wizards/com/sun/star/wizards/ui/event/CommonListener.py |4 - wizards/com/sun/star/wizards/ui/event/DataAware.py |4 - wizards/com/sun/star/wizards/ui/event/ListModelBinder.py |2 wizards/com/sun/star/wizards/ui/event/RadioDataAware.py | 11 --- wizards/com/sun/star/wizards/ui/event/UnoDataAware.py|6 - 36 files changed, 109 insertions(+), 137 deletions(-) New commits: commit 293a144126b13a78aef01bd72586432056b8ca80 Author: Xisco Fauli Date: Sat Sep 22 19:16:38 2012 +0200 pyfax: Use relative imports so we can call the wizard remotely Change-Id: I8ed98ff5125caf28680f94865ab2fe122f124182 Reviewed-on: https://gerrit.libreoffice.org/683 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/wizards/com/sun/star/wizards/RemoteWebWizard b/wizards/com/sun/star/wizards/RemoteWebWizard deleted file mode 100755 index d9916a0..000 --- a/wizards/com/sun/star/wizards/RemoteWebWizard +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python -# -# 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/. -# - -from web.WWD_Events import WWD_Events -import sys - -if __name__ == "__main__": - -WWD_Events.main(sys.argv) diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py index bb5d95f..0491c81 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.py +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py @@ -17,8 +17,8 @@ # import traceback import inspect -from wizards.common.ConfigNode import * -from wizards.common.Configuration import Configuration +from .ConfigNode import * +from .Configuration import Configuration class ConfigGroup(ConfigNode): diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index 8ba6635..b5ff836 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -16,8 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -from wizards.common.ConfigNode import * -from wizards.common.Configuration import Configuration +from .ConfigNode import * +from .Configuration import Configuration class ConfigSet(ConfigNode): ''' diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index cd8a018..d76cad4 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -15,10 +
[Libreoffice-commits] .: wizards/com wizards/source
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java |9
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java| 52 ++
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java | 16
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 79
+++-
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 22 +
wizards/com/sun/star/wizards/report/ReportLayouter.java | 18
wizards/com/sun/star/wizards/report/ReportTextImplementation.java| 132
++
wizards/com/sun/star/wizards/report/ReportWizard.java|4
wizards/source/formwizard/dbwizres.src | 191
+-
9 files changed, 505 insertions(+), 18 deletions(-)
New commits:
commit 5eb16c1cf277a8a3514e81e64b211a2e4f4c7a8f
Author: Istvan Turi
Date: Tue Aug 28 13:38:40 2012 +0200
fixes to new template localization code
* Crash when launching the Report Builder is now fixed.
* Added listbox localized templates to fax, report and letter wizard.
* Made some optimalization with the template path search.
Change-Id: Ie3f91fea301427b15891411c0192f9217b39ecae
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index 6cdcde5..5374f58 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -50,6 +50,9 @@ import com.sun.star.wizards.ui.event.DataAware;
import com.sun.star.wizards.ui.event.RadioDataAware;
import com.sun.star.wizards.ui.event.UnoDataAware;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.uno.XInterface;
+
/**
* This class is the dialog implementation class -
* there is not much business logic here - but mostley
@@ -202,10 +205,8 @@ public class AgendaWizardDialogImpl extends
AgendaWizardDialog
private void initializePaths() {
try {
-sTemplatePath = FileAccess.getOfficePath(xMSF, "Template",
"share", "/wizard");
sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template",
"user", PropertyNames.EMPTY_STRING);
sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath,
"/../wizard/bitmap");
-sTemplatePath = FileAccess.combinePaths(xMSF, sTemplatePath,
"/../common");
} catch (NoValidPathException e) {
e.printStackTrace();
}
@@ -305,7 +306,9 @@ public class AgendaWizardDialogImpl extends
AgendaWizardDialog
*/
public boolean initializeTemplates() {
try {
-String sTemplatePath = FileAccess.getOfficePath(xMSF, "Template",
"share", "/wizard");
+XInterface xPathInterface = (XInterface)
xMSF.createInstance("com.sun.star.util.PathSettings");
+XPropertySet xPropertySet =
UnoRuntime.queryInterface(XPropertySet.class, xPathInterface);
+sTemplatePath = ((String[])
xPropertySet.getPropertyValue("Template_user"))[0];
//sCurrentNorm = Norms[getCurrentLetter().cp_Norm];
String sAgendaPath = FileAccess.combinePaths(xMSF, sTemplatePath,
"/../common/wizard/agenda" );
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index 88b8283..43e9c5a 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -65,6 +65,8 @@ import com.sun.star.wizards.common.TextElement;
import com.sun.star.wizards.common.PlaceholderTextElement;
import java.util.List;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.uno.XInterface;
public class FaxWizardDialogImpl extends FaxWizardDialog
{
@@ -461,6 +463,45 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
}
+private void exchangeTitlesToLocalizedOnes()
+{
+ for(int i = 0; i < BusinessFiles[0].length; ++i)
+ {
+if( BusinessFiles[0][i].equals("Classic Fax") )
+{
+ BusinessFiles[0][i] = resources.resBusinessFaxClassic;
+}
+else if( BusinessFiles[0][i].equals("Classic Fax from Private") )
+{
+ BusinessFiles[0][i] = resources.resBusinessFaxClassicPrivate;
+}
+else if( BusinessFiles[0][i].equals("Modern Fax") )
+{
+ BusinessFiles[0][i] = resources.resBusinessFaxModern;
+}
+else if( BusinessFiles[0][i].equals("Modern Fax from Private") )
+{
+ BusinessFiles[0][i] = resources.resBusinessFaxModernPrivate;
+}
+ }
+
+ for(int i = 0; i < PrivateFiles[0].length; ++i)
+ {
+if( PrivateFiles[0][i].equals("Bottle") )
+{
+ PrivateFiles[0][i] = resources.resPrivateFaxBottle;
+}
+else if( PrivateFiles[0][i].equals("Lines") )
+{
+ PrivateFiles[0][i] = resources.r
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java |4 ++--
wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c13c0c7d76d9ef7fa475590f5ec9fae185752f79
Author: Andras Timar
Date: Thu Aug 16 20:33:52 2012 +0200
make buttons wider
Change-Id: I7af919450f6c75f87f0877e32ad6945ec392dbef
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
index 5b84ce9..755651f 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java
@@ -321,11 +321,11 @@ public abstract class AgendaWizardDialog extends
WizardDialog implements Agenda
);
btnUp = insertButton("btnUp", BTNUP_ACTION_PERFORMED,
PROPS_BUTTON,
-new Object[] {
INTEGER_14,BTNUP_HID,resources.resButtonUp,222,136,INTEGERS[5],new
Short((short)582),INTEGER_40}
+new Object[] {
INTEGER_14,BTNUP_HID,resources.resButtonUp,202,136,INTEGERS[5],new
Short((short)582),INTEGER_50}
);
btnDown = insertButton("btnDown", BTNDOWN_ACTION_PERFORMED,
PROPS_BUTTON,
-new Object[] {
INTEGER_14,BTNDOWN_HID,resources.resButtonDown,264,136,INTEGERS[5],new
Short((short)583),INTEGER_40}
+new Object[] {
INTEGER_14,BTNDOWN_HID,resources.resButtonDown,254,136,INTEGERS[5],new
Short((short)583),INTEGER_50}
);
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index 0f39eed..82b29b5 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -278,10 +278,10 @@ class AgendaWizardDialog(WizardDialog):
self.resources.resButtonRemove, 134, 136, 5, 581, 40),
self)
self.btnUp = self.insertButton("btnUp", BTNUP_ACTION_PERFORMED,
self.PROPS_BUTTON, (14, BTNUP_HID,
-self.resources.resButtonUp, 222, 136, 5, 582, 40), self)
+self.resources.resButtonUp, 202, 136, 5, 582, 50), self)
self.btnDown = self.insertButton("btnDown", BTNDOWN_ACTION_PERFORMED,
self.PROPS_BUTTON, (14, BTNDOWN_HID,
-self.resources.resButtonDown, 264, 136, 5, 583, 40), self)
+self.resources.resButtonDown, 254, 136, 5, 583, 50), self)
def buildStep6(self):
self.insertLabel("lblTitle6", self.PROPS_LABEL_B,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaTemplate.java |1 -
1 file changed, 1 deletion(-)
New commits:
commit b57ebd8c1f6a3b4261a97198aaf38f8ffe46198c
Author: Andras Timar
Date: Thu Aug 16 19:48:15 2012 +0200
Don't say "yeeep"
Change-Id: I239be1b35103c53e9ace3a7e2917bd24a24497a3
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
index 9df88a0..860d413 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
@@ -652,7 +652,6 @@ public class AgendaTemplate extends TextDocument implements
TemplateConsts, Data
private void writeTitle(TextElement te, XTextRange tr, String text)
{
-System.out.println("yeeep");
te.text = (text == null ? PropertyNames.EMPTY_STRING : text);
te.write(tr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/agenda/AgendaTemplate.py |1 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py |1 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py |1 - wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py |1 - wizards/com/sun/star/wizards/agenda/CGAgenda.py|1 - wizards/com/sun/star/wizards/agenda/TopicsControl.py |1 - wizards/com/sun/star/wizards/document/OfficeDocument.py|1 - wizards/com/sun/star/wizards/fax/FaxWizardDialog.py|1 - wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py |1 - wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py |1 - wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py |1 - wizards/com/sun/star/wizards/letter/LocaleCodes.py |1 - wizards/com/sun/star/wizards/text/TextDocument.py |1 - wizards/com/sun/star/wizards/text/TextFieldHandler.py |1 - wizards/com/sun/star/wizards/text/TextSectionHandler.py|1 - wizards/com/sun/star/wizards/text/ViewHandler.py |1 - wizards/com/sun/star/wizards/ui/ControlScroller.py |1 - wizards/com/sun/star/wizards/ui/DocumentPreview.py |1 - wizards/com/sun/star/wizards/ui/ImageList.py |1 - wizards/com/sun/star/wizards/ui/PathSelection.py |1 - wizards/com/sun/star/wizards/ui/PeerConfig.py |1 - wizards/com/sun/star/wizards/ui/UIConsts.py|1 - wizards/com/sun/star/wizards/ui/UnoDialog.py |1 - wizards/com/sun/star/wizards/ui/WizardDialog.py|1 - wizards/com/sun/star/wizards/ui/XPathSelectionListener.py |1 - wizards/com/sun/star/wizards/ui/event/DataAware.py |1 - wizards/com/sun/star/wizards/ui/event/ListModelBinder.py |1 - wizards/com/sun/star/wizards/web/StylePreview.py |1 - wizards/com/sun/star/wizards/web/WWD_Events.py |1 - wizards/com/sun/star/wizards/web/WebWizardDialogResources.py |1 - wizards/com/sun/star/wizards/web/data/CGArgument.py|1 - wizards/com/sun/star/wizards/web/data/CGContent.py |1 - wizards/com/sun/star/wizards/web/data/CGDesign.py |1 - wizards/com/sun/star/wizards/web/data/CGDocument.py|1 - wizards/com/sun/star/wizards/web/data/CGExporter.py|1 - wizards/com/sun/star/wizards/web/data/CGFilter.py |1 - wizards/com/sun/star/wizards/web/data/CGGeneralInfo.py |1 - wizards/com/sun/star/wizards/web/data/CGIconSet.py |1 - wizards/com/sun/star/wizards/web/data/CGImage.py |1 - wizards/com/sun/star/wizards/web/data/CGLayout.py |1 - wizards/com/sun/star/wizards/web/data/CGPublish.py |1 - wizards/com/sun/star/wizards/web/data/CGSession.py |1 - wizards/com/sun/star/wizards/web/data/CGSessionName.py |1 - wizards/com/sun/star/wizards/web/data/CGSettings.py|1 - wizards/com/sun/star/wizards/web/data/CGStyle.py |1 - wizards/com/sun/star/wizards/web/data/TypeDetection.py |1 - 46 files changed, 46 deletions(-) New commits: commit 8b13238c453f05f1d862cf570dff0110295fbe3b Author: Julien Nabet Date: Thu Aug 9 12:56:40 2012 +0200 Fix last duplicated lines for Python files Change-Id: I22cbba9c574835c3e47dadb70d3c293b79e57325 diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py index a95dfc9..56b8523 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import uno from TemplateConsts import * from threading import RLock from wizards.text.TextDocument import * diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py index 2faf846..d97ddf9 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogConst.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # from wizards.common.HelpIds import HelpIds -from wizards.common.HelpIds import HelpIds TXTTITLE_TEXT_CHANGED = "txtTitleTextChanged" TXTDATE_TEXT_CHANGED = "txtDateTextChanged" diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardD
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/ConfigGroup.py |1 - wizards/com/sun/star/wizards/common/ConfigNode.py |1 - wizards/com/sun/star/wizards/common/ConfigSet.py|1 - wizards/com/sun/star/wizards/common/Configuration.py|1 - wizards/com/sun/star/wizards/common/DebugHelper.py |1 - wizards/com/sun/star/wizards/common/Desktop.py |1 - wizards/com/sun/star/wizards/common/FileAccess.py |1 - wizards/com/sun/star/wizards/common/Helper.py |1 - wizards/com/sun/star/wizards/common/NoValidPathException.py |1 - wizards/com/sun/star/wizards/common/NumberFormatter.py |1 - wizards/com/sun/star/wizards/common/Properties.py |1 - wizards/com/sun/star/wizards/common/PropertyNames.py|1 - wizards/com/sun/star/wizards/common/Resource.py |1 - wizards/com/sun/star/wizards/common/SystemDialog.py |1 - 14 files changed, 14 deletions(-) New commits: commit 28b3a290ce3dfe4156d810d73140fed9decbb12c Author: Julien Nabet Date: Thu Aug 9 11:50:43 2012 +0200 Others duplicated lines Change-Id: Ief9589bd3ab0d4fd359dc18f85063dece29f4833 diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.py b/wizards/com/sun/star/wizards/common/ConfigGroup.py index c5d406b..bb5d95f 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.py +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -import traceback import inspect from wizards.common.ConfigNode import * from wizards.common.Configuration import Configuration diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.py b/wizards/com/sun/star/wizards/common/ConfigNode.py index cac0348..c2cd231 100644 --- a/wizards/com/sun/star/wizards/common/ConfigNode.py +++ b/wizards/com/sun/star/wizards/common/ConfigNode.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # from abc import ABCMeta, abstractmethod -from abc import ABCMeta, abstractmethod class ConfigNode(object): diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py b/wizards/com/sun/star/wizards/common/ConfigSet.py index da6fcb4..8ba6635 100644 --- a/wizards/com/sun/star/wizards/common/ConfigSet.py +++ b/wizards/com/sun/star/wizards/common/ConfigSet.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -import traceback from wizards.common.ConfigNode import * from wizards.common.Configuration import Configuration diff --git a/wizards/com/sun/star/wizards/common/Configuration.py b/wizards/com/sun/star/wizards/common/Configuration.py index c5b25fa..cd8a018 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.py +++ b/wizards/com/sun/star/wizards/common/Configuration.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import uno import traceback from wizards.common.PropertyNames import PropertyNames from wizards.common.Helper import * diff --git a/wizards/com/sun/star/wizards/common/DebugHelper.py b/wizards/com/sun/star/wizards/common/DebugHelper.py index 44bc5a1..b0dba77 100644 --- a/wizards/com/sun/star/wizards/common/DebugHelper.py +++ b/wizards/com/sun/star/wizards/common/DebugHelper.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # class DebugHelper(object): -class DebugHelper(object): @classmethod def exception(self, ex): diff --git a/wizards/com/sun/star/wizards/common/Desktop.py b/wizards/com/sun/star/wizards/common/Desktop.py index 5492379..408edf1 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.py +++ b/wizards/com/sun/star/wizards/common/Desktop.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import uno import traceback from wizards.common.NoValidPathException import * diff --git a/wizards/com/sun/star/wizards/common/FileAccess.py b/wizards/com/sun/star/wizards/common/FileAccess.py index cb7bae3..2019632 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.py +++ b/wizards/com/sun/star/wizards/common/FileAccess.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import traceback -import traceback import types from os import path as osPath from wizards.common.NoValidPathException import * diff --git a/wizards/com/sun/star/wizards/common/Helper.py b/wizards/com/sun/star/wizards/common/Helper.py index a20ed7d..cd63ef8 100644 --- a/wizards/com/sun/star/wizards/common/Helper.py +++ b/wizards/com/sun/star/wizards/common/Helper.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # import uno -import uno import traceback from datetime import date as DateTime from wizards.common.NumberFormatter import NumberFormatter diff --git a/wizards/com
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/HelpIds.py |1 - 1 file changed, 1 deletion(-) New commits: commit 45a3e4dd7941e3cf5c1be5e966872338c3be1110 Author: Julien Nabet Date: Wed Aug 8 23:34:00 2012 +0200 "class HelpIds:" duplicated Change-Id: I1395df60a5864c7f35c27274ddab631a5243a27f diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py b/wizards/com/sun/star/wizards/common/HelpIds.py index c5fdd61..67a5958 100644 --- a/wizards/com/sun/star/wizards/common/HelpIds.py +++ b/wizards/com/sun/star/wizards/common/HelpIds.py @@ -16,7 +16,6 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # class HelpIds: -class HelpIds: array1 = [ "HID:WIZARDS_HID0_WEBWIZARD", # HID:34200 "HID:WIZARDS_HID0_HELP", # HID:34201 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com wizards/source
0 files changed New commits: commit 456dd17399883d4ade4c863a5c37268a8aa51fce Author: Michael Meeks Date: Wed Jul 18 09:40:09 2012 +0100 remove obsolete delzip files from wizards diff --git a/wizards/com/sun/star/wizards/common/delzip b/wizards/com/sun/star/wizards/common/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/com/sun/star/wizards/report/delzip b/wizards/com/sun/star/wizards/report/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/config/delzip b/wizards/source/config/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/configshare/delzip b/wizards/source/configshare/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/euro/delzip b/wizards/source/euro/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/formwizard/delzip b/wizards/source/formwizard/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/gimmicks/delzip b/wizards/source/gimmicks/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/importwizard/delzip b/wizards/source/importwizard/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/launcher/delzip b/wizards/source/launcher/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/standard/delzip b/wizards/source/standard/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/template/delzip b/wizards/source/template/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/tools/delzip b/wizards/source/tools/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/tutorials/delzip b/wizards/source/tutorials/delzip deleted file mode 100644 index e69de29..000 diff --git a/wizards/source/webwizard/delzip b/wizards/source/webwizard/delzip deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/db/SQLQueryComposer.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a201316b839c00fe5f8305150cf2ccba548a2868 Author: Lionel Elie Mamane Date: Mon Jul 16 16:09:07 2012 +0200 reuse computed curFieldName Change-Id: I4ca9942b3abd343b75336e68bfe669ce5d3a38de diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index c443840..464c6c0 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -345,7 +345,7 @@ public class SQLQueryComposer if ( curCommandName.length() > 0 ) return quoteName(curCommandName) + "." + quoteName(curFieldName); else -return quoteName(CurFieldColumn.getFieldName()); +return quoteName(curFieldName); } String curAliasName = curComposedCommandName.getAliasName(); return quoteName(curAliasName) + "." + quoteName(curFieldName); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/ui/event/AbstractListener.java |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b0f84807ed7cca69a1e7aba18efe9f1917b96274
Author: Lionel Elie Mamane
Date: Fri Jul 13 00:39:56 2012 +0200
openoffice.org -> libreoffice.org
Change-Id: I7e6f495eb56c0d6004c2e427b7fe9c3c09c7206f
diff --git a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
index 5aad67a..5c9bec2 100644
--- a/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
+++ b/wizards/com/sun/star/wizards/ui/event/AbstractListener.java
@@ -91,7 +91,7 @@ public class AbstractListener
System.out.println("===");
System.out.println("=== Note: An Exception was thrown which should
have ===");
System.out.println("=== caused a crash. I caught it. Please report
this ===");
-System.out.println("=== to openoffice.org
===");
+System.out.println("=== to
https://www.libreoffice.org/get-help/bug/===");
System.out.println("===");
ite.printStackTrace();
@@ -105,8 +105,8 @@ public class AbstractListener
{
System.out.println("===");
System.out.println("=== Note: An Exception was thrown which should
have ===");
-System.out.println("=== caused a crash. I Catched it. Please
report this ==");
-System.out.println("=== to openoffice.org
==");
+System.out.println("=== caused a crash. I caught it. Please report
this ===");
+System.out.println("=== to
https://www.libreoffice.org/get-help/bug/===");
System.out.println("===");
ex.printStackTrace();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/form/StyleApplier.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8d39b71f35e088f9e153e2462158ce2962cf3a8a
Author: Lionel Elie Mamane
Date: Thu Nov 24 19:37:46 2011 +0100
fdo#37626: form wizard recognise "#" also at beginning of line
This was keeping the Base form wizard from applying styles
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 1dedca3..433384c 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -343,7 +343,7 @@ public class StyleApplier
String[] sPropList =
JavaTools.ArrayoutofString(scurline, ":");
String sPropValue = sPropList[1];
sPropValue = sPropValue.trim();
-if (sPropValue.indexOf("#") > 0)
+if (sPropValue.indexOf("#") > -1)
{
sPropValue =
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING,
PropertyNames.SEMI_COLON);
sPropValue =
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING,
PropertyNames.SPACE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/common/NumberFormatter.java |5 +++-
wizards/com/sun/star/wizards/db/FieldColumn.java | 16 +++
2 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit b86f2147e496e3b7ca5a085b302f6144f338aa82
Author: Lionel Elie Mamane
Date: Mon Jun 18 16:28:14 2012 +0200
fdo#43967 legacy report designer wizard formats dates improperly
1) Set FormatsSupplier property only if underlying object has one.
Else, exception is thrown and the format is not set
2) getTyperelatedFieldData uses the format keys, so initialize them
before call, not after.
Change-Id: I68c4c96a9da9a6afdc3ab8964e973588f53ee814
diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java
b/wizards/com/sun/star/wizards/common/NumberFormatter.java
index 9c0feb5..bbf6385 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.java
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java
@@ -201,7 +201,10 @@ public class NumberFormatter
Locale oLocale = (Locale)
Helper.getUnoPropertyValue(xNumberFormat, "Locale");
int NewFormatKey = defineNumberFormat(FormatString, oLocale);
XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class,
_xFormatObject);
-xPSet.setPropertyValue("FormatsSupplier",
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+if
(xPSet.getPropertySetInfo().hasPropertyByName("FormatsSupplier"))
+{
+xPSet.setPropertyValue("FormatsSupplier",
_oNumberFormatter.xNumberFormatter.getNumberFormatsSupplier());
+}
if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat"))
{
xPSet.setPropertyValue("NumberFormat", new
Integer(NewFormatKey));
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index ebedd22..47b37df 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -154,13 +154,8 @@ public class FieldColumn
{
try
{
-m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class,
_xColumns.getByName(m_sFieldName));
-ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(),
m_sFieldName) + 1;
-m_nFieldType =
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
-getTyperelatedFieldData();
-
- if (!bFormatKeysInitialized)
- {
+if (!bFormatKeysInitialized)
+{
final NumberFormatter aNumberFormatter =
oCommandMetaData.getNumberFormatter();
iDateFormatKey = aNumberFormatter.getDateFormatKey();
@@ -170,7 +165,12 @@ public class FieldColumn
iTimeFormatKey = aNumberFormatter.getTimeFormatKey();
iLogicalFormatKey = aNumberFormatter.getLogicalFormatKey();
bFormatKeysInitialized = true;
- }
+}
+
+m_xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class,
_xColumns.getByName(m_sFieldName));
+ColIndex = JavaTools.FieldInList(_xColumns.getElementNames(),
m_sFieldName) + 1;
+m_nFieldType =
AnyConverter.toInt(m_xColPropertySet.getPropertyValue("Type"));
+getTyperelatedFieldData();
}
catch (Exception e)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/report/ReportTextImplementation.java |1 +
1 file changed, 1 insertion(+)
New commits:
commit b255de87082d11a42d7af7860dcc4e971342df06
Author: Norbert Thiebaud
Date: Tue Jun 5 18:14:52 2012 -0500
fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79
Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 94b4e40..6be5b36 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
bexecute = getRecordParser().executeCommand(nCommandType);
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList,
true);
if (bexecute)
{
+DBMetaData.CommandObject oCommand =
getRecordParser().getQueryByName(sQueryName);
bexecute = getRecordParser().getFields(sFieldNameList,
true);
if (bexecute &&
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 11
+-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 3ec6e1378545b5d5071531d1f6de259ac9028176
Author: Lionel Elie Mamane
Date: Tue Jun 5 18:40:13 2012 +0200
fdo#47325 legacy reports: survive absence of Sorting hidden control
Reports created in 3.4 and earlier lack it.
Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
import com.sun.star.wizards.common.SystemDialog;
import com.sun.star.wizards.db.DBMetaData;
import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
import com.sun.star.wizards.ui.UIConsts;
import java.util.ArrayList;
import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
String sCommandType =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm,
PropertyNames.COMMAND_TYPE, sMsg);
String sGroupFieldNames =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames",
sMsg);
String sFieldNames =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
-final String sorting =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+String sorting;
+try
+{
+sorting =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+ sorting = "";
+}
String sRecordFieldNames =
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames",
sMsg);
if (xNamedForm.hasByName("QueryName"))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
