Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
	automation/source/inc/cmdbasestream.hxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/retstrm.hxx
	automation/source/testtool/cmdstrm.cxx
	automation/source/testtool/cmdstrm.hxx
	automation/source/testtool/tcommuni.cxx
	basctl/prj/d.lst
	basctl/uiconfig/basicide/toolbar/findbar.xml
	cui/source/dialogs/about.cxx
	cui/source/dialogs/about.src
	cui/source/inc/about.hxx
	extensions/source/abpilot/abpservices.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/svg/makefile.mk
	forms/Library_frm.mk
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/prj/d.lst
	package/source/zipapi/XMemoryStream.cxx
	package/source/zipapi/XMemoryStream.hxx
	setup_native/prj/d.lst
	setup_native/source/win32/customactions/relnotes/makefile.mk
	tools/test/export.map
	wizards/com/sun/star/wizards/common/ConfigGroup.py
	wizards/com/sun/star/wizards/common/ConfigNode.py
	wizards/com/sun/star/wizards/common/Configuration.py
	wizards/com/sun/star/wizards/common/Desktop.py
	wizards/com/sun/star/wizards/common/FileAccess.py
	wizards/com/sun/star/wizards/common/Helper.py
	wizards/com/sun/star/wizards/common/SystemDialog.py
	wizards/com/sun/star/wizards/document/OfficeDocument.py
	wizards/com/sun/star/wizards/fax/FaxDocument.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
	wizards/com/sun/star/wizards/letter/LetterDocument.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
	wizards/com/sun/star/wizards/text/TextDocument.py
	wizards/com/sun/star/wizards/text/TextFieldHandler.py
	wizards/com/sun/star/wizards/text/TextSectionHandler.py
	wizards/com/sun/star/wizards/text/ViewHandler.py
	wizards/com/sun/star/wizards/ui/UnoDialog.py
	wizards/com/sun/star/wizards/ui/UnoDialog2.py
	wizards/com/sun/star/wizards/ui/WizardDialog.py
	wizards/com/sun/star/wizards/ui/event/CommonListener.py
	wizards/com/sun/star/wizards/ui/event/DataAware.py
	wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
	wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
	wizards/util/helpids.h
	wizards/util/hidother.src
	xmlsecurity/prj/build.lst
	xmlsecurity/prj/d.lst
	xmlsecurity/qa/certext/SanCertExt.cxx

17 files changed, 344 insertions, 135 deletions

diff --git a/wizards/com/sun/star/wizards/common/MANIFEST.MF b/wizards/com/sun/star/wizards/common/MANIFEST.MF
index a670e80c31e7..e69de29bb2d1 100644
--- a/wizards/com/sun/star/wizards/common/MANIFEST.MF
+++ b/wizards/com/sun/star/wizards/common/MANIFEST.MF
@@ -1 +0,0 @@
-Class-Path: saxon9.jar
diff --git a/wizards/com/sun/star/wizards/common/prova.py b/wizards/com/sun/star/wizards/common/prova.py
new file mode 100644
index 000000000000..1219ba9aff7b
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/prova.py
@@ -0,0 +1,7 @@
+from PropertyNames import PropertyNames
+
+class prova:
+
+    def Imprimir(self):
+        print PropertyNames.PROPERTY_STEP
+
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 398468f6d4b2..8469a2bc7179 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -205,7 +205,7 @@ public class SQLQueryComposer
                 {
                     sOrder += ", ";
                 }
-                sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + CurDBMetaData.AggregateFieldNames[iAggregate][0] + ")";
+                sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")";
                 sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1];
                 m_queryComposer.setOrder(sOrder);
             }
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.py b/wizards/com/sun/star/wizards/fax/FaxDocument.py
index b5fee838796b..3b132e40df4c 100644
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.py
+++ b/wizards/com/sun/star/wizards/fax/FaxDocument.py
@@ -1,5 +1,10 @@
 from text.TextDocument import *
 from text.TextSectionHandler import TextSectionHandler
+<<<<<<< HEAD
+=======
+from text.TextFieldHandler import TextFieldHandler
+from common.Configuration import Configuration
+>>>>>>> master
 from common.PropertyNames import PropertyNames
 
 from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index 644f08a228db..8d7ea270f18e 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -86,7 +86,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (True, 12, LSTPRIVATESTYLE_HID, 180, 95, 1,
                 4, 74), self)
+<<<<<<< HEAD
         self.insertLabel("lblBusinessStyle",
+=======
+        self.lblBusinessStyle = self.insertLabel("lblBusinessStyle",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -97,7 +101,11 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblBusinessStyle_value,
                 110, 42, 1, 32, 60))
 
+<<<<<<< HEAD
         self.insertLabel("lblTitle1",
+=======
+        self.lblTitle1 = self.insertLabel("lblTitle1",
+>>>>>>> master
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -108,7 +116,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle1_value,
                 True, 91, 8, 1, 37, 212))
+<<<<<<< HEAD
         self.insertLabel("lblPrivateStyle",
+=======
+        self.lblPrivateStyle = self.insertLabel("lblPrivateStyle",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -117,7 +129,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblPrivateStyle_value, 110, 95, 1, 50, 60))
+<<<<<<< HEAD
         self.insertLabel("lblIntroduction",
+=======
+        self.lblIntroduction = self.insertLabel("lblIntroduction",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -264,7 +280,11 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKUSEFOOTER_HID,
                 self.resources.reschkUseFooter_value, 97, 163,
                 0, 2, 14, 212), self)
+<<<<<<< HEAD
         self.insertLabel("lblTitle3",
+=======
+        self.lblTitle3 = self.insertLabel("lblTitle3",
+>>>>>>> master
             ("FontDescriptor", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -312,7 +332,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERNAME_HID, 182, 67, 3, 17, 119), self)
+=======
+            (12, TXTSENDERNAME_HID, 182, 67, 3,
+                17, 119), self)
+>>>>>>> master
         self.txtSenderStreet = self.insertTextField("txtSenderStreet",
             TXTSENDERSTREET_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -322,7 +347,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERSTREET_HID, 182, 81, 3, 18, 119), self)
+=======
+            (12, TXTSENDERSTREET_HID, 182, 81, 3,
+                18, 119), self)
+>>>>>>> master
         self.txtSenderPostCode = self.insertTextField("txtSenderPostCode",
             TXTSENDERPOSTCODE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -332,7 +362,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERPOSTCODE_HID, 182, 95, 3, 19, 25), self)
+=======
+            (12, TXTSENDERPOSTCODE_HID, 182, 95, 3,
+                19, 25), self)
+>>>>>>> master
         self.txtSenderState = self.insertTextField("txtSenderState",
             TXTSENDERSTATE_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -342,7 +377,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERSTATE_HID, 211, 95, 3, 20, 21), self)
+=======
+            (12, TXTSENDERSTATE_HID, 211, 95, 3,
+                20, 21), self)
+>>>>>>> master
         self.txtSenderCity = self.insertTextField("txtSenderCity",
             TXTSENDERCITY_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -352,7 +392,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERCITY_HID, 236, 95, 3, 21, 65), self)
+=======
+            (12, TXTSENDERCITY_HID, 236, 95, 3,
+                21, 65), self)
+>>>>>>> master
         self.txtSenderFax = self.insertTextField("txtSenderFax",
             TXTSENDERFAX_TEXT_CHANGED,
             (PropertyNames.PROPERTY_HEIGHT,
@@ -362,7 +407,12 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (12, TXTSENDERFAX_HID, 182, 109, 3, 22, 119), self)
+=======
+            (12, TXTSENDERFAX_HID, 182, 109, 3,
+                22, 119), self)
+>>>>>>> master
         self.optReceiverPlaceholder = self.insertRadioButton(
             "optReceiverPlaceholder",
             OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
@@ -391,7 +441,11 @@ class FaxWizardDialog(WizardDialog):
             (8, OPTRECEIVERDATABASE_HID,
                 self.resources.resoptReceiverDatabase_value, 104, 160, 3,
                 24, 200), self)
+<<<<<<< HEAD
         self.insertLabel("lblSenderAddress",
+=======
+        self.lblSenderAddress = self.insertLabel("lblSenderAddress",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -400,14 +454,22 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblSenderAddress_value, 97, 28, 3, 46, 136))
+<<<<<<< HEAD
         self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+=======
+        self.FixedLine2 = self.insertFixedLine("FixedLine2", (PropertyNames.PROPERTY_HEIGHT,
+>>>>>>> master
                 PropertyNames.PROPERTY_POSITION_X,
                 PropertyNames.PROPERTY_POSITION_Y,
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (5, 90, 126, 3, 51, 212))
+<<<<<<< HEAD
         self.insertLabel("lblSenderName",
+=======
+        self.lblSenderName = self.insertLabel("lblSenderName",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -415,8 +477,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblSenderName_value, 113, 69, 3, 52, 68))
         self.insertLabel("lblSenderStreet",
+=======
+            (8, self.resources.reslblSenderName_value, 113, 69, 3,
+                52, 68))
+        self.lblSenderStreet = self.insertLabel("lblSenderStreet",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -424,8 +492,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblSenderStreet_value, 113, 82, 3, 53, 68))
         self.insertLabel("lblPostCodeCity",
+=======
+            (8, self.resources.reslblSenderStreet_value, 113, 82, 3,
+                53, 68))
+        self.lblPostCodeCity = self.insertLabel("lblPostCodeCity",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -433,8 +507,14 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_STEP,
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
+<<<<<<< HEAD
             (8, self.resources.reslblPostCodeCity_value, 113, 97, 3, 54, 68))
         self.insertLabel("lblTitle4",
+=======
+            (8, self.resources.reslblPostCodeCity_value,
+                113, 97, 3, 54, 68))
+        self.lblTitle4 = self.insertLabel("lblTitle4",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -446,7 +526,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor5, 16, self.resources.reslblTitle4_value,
                  True, 91, 8, 3, 60, 212))
+<<<<<<< HEAD
         self.insertLabel("lblSenderFax",
+=======
+        self.Label1 = self.insertLabel("lblSenderFax",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -455,7 +539,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_TABINDEX,
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.resLabel1_value, 113, 111, 3, 68, 68))
+<<<<<<< HEAD
         self.insertLabel("Label2",
+=======
+        self.Label2 = self.insertLabel("Label2",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -505,7 +593,11 @@ class FaxWizardDialog(WizardDialog):
             (8, CHKFOOTERPAGENUMBERS_HID,
                 self.resources.reschkFooterPageNumbers_value, 97, 106,
                 0, 4, 27, 201), self)
+<<<<<<< HEAD
         self.insertLabel("lblFooter",
+=======
+        self.lblFooter = self.insertLabel("lblFooter",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -516,7 +608,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (self.fontDescriptor4, 8, self.resources.reslblFooter_value,
                 97, 28, 4, 33, 116))
+<<<<<<< HEAD
         self.insertLabel("lblTitle5",
+=======
+        self.lblTitle5 = self.insertLabel("lblTitle5",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
@@ -567,7 +663,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, OPTMAKECHANGES_HID, self.resources.resoptMakeChanges_value,
                 104, 123, 5, 31, 198), self)
+<<<<<<< HEAD
         self.insertLabel("lblFinalExplanation1",
+=======
+        self.lblFinalExplanation1 = self.insertLabel("lblFinalExplanation1",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -578,7 +678,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (28, self.resources.reslblFinalExplanation1_value,
                 True, 97, 28, 5, 34, 205))
+<<<<<<< HEAD
         self.insertLabel("lblProceed",
+=======
+        self.lblProceed = self.insertLabel("lblProceed",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -588,7 +692,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (8, self.resources.reslblProceed_value, 97, 100, 5,
                 35, 204))
+<<<<<<< HEAD
         self.insertLabel("lblFinalExplanation2",
+=======
+        self.lblFinalExplanation2 = self.insertLabel("lblFinalExplanation2",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_MULTILINE,
@@ -599,7 +707,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (33, self.resources.reslblFinalExplanation2_value, True, 104, 145, 5,
                 36, 199))
+<<<<<<< HEAD
         self.insertImage("ImageControl2",
+=======
+        self.ImageControl2 = self.insertImage("ImageControl2",
+>>>>>>> master
             ("Border",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_IMAGEURL,
@@ -611,7 +723,11 @@ class FaxWizardDialog(WizardDialog):
                 PropertyNames.PROPERTY_WIDTH),
             (0, 10, UIConsts.INFOIMAGEURL, 92, 145,
                 False, 5, 47, 10))
+<<<<<<< HEAD
         self.insertLabel("lblTemplateName",
+=======
+        self.lblTemplateName = self.insertLabel("lblTemplateName",
+>>>>>>> master
             (PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
                 PropertyNames.PROPERTY_POSITION_X,
@@ -622,7 +738,11 @@ class FaxWizardDialog(WizardDialog):
             (8, self.resources.reslblTemplateName_value, 97, 58, 5,
                 57, 101))
 
+<<<<<<< HEAD
         self.insertLabel("lblTitle6",
+=======
+        self.lblTitle6 = self.insertLabel("lblTitle6",
+>>>>>>> master
             ("FontDescriptor",
                 PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_LABEL,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
index e5a72e195033..e690248caa70 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
@@ -38,7 +38,11 @@ CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged"
 CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged"
 TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged"
 FILETEMPLATEPATH_TEXT_CHANGED = None # "fileTemplatePathTextChanged"
+<<<<<<< HEAD
 OPTCREATEFAX_ITEM_CHANGED = "optCreateFromTemplateItemChanged"
+=======
+OPTCREATEFAX_ITEM_CHANGED = "optCreateFaxItemChanged"
+>>>>>>> master
 OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged"
 imageURLImageControl2 = None #"images/ImageControl2"
 imageURLImageControl3 = None #"images/ImageControl3"
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 499cfababe2f..4da4146322c6 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -1,6 +1,7 @@
 from FaxWizardDialog import *
 from CGFaxWizard import *
 from FaxDocument import *
+<<<<<<< HEAD
 from ui.PathSelection import PathSelection
 from common.FileAccess import FileAccess
 from ui.event.UnoDataAware import UnoDataAware
@@ -12,6 +13,21 @@ from common.NoValidPathException import NoValidPathException
 from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
 from com.sun.star.uno import RuntimeException
 from com.sun.star.util import CloseVetoException
+=======
+from ui.PathSelection import *
+from common.FileAccess import *
+from ui.event.UnoDataAware import *
+from ui.event.RadioDataAware import *
+from common.Configuration import *
+from document.OfficeDocument import OfficeDocument
+from text.TextFieldHandler import TextFieldHandler
+from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
+
+from common.NoValidPathException import *
+from com.sun.star.uno import RuntimeException
+from com.sun.star.util import CloseVetoException
+
+>>>>>>> master
 from com.sun.star.view.DocumentZoomType import OPTIMAL
 from com.sun.star.document.UpdateDocMode import FULL_UPDATE
 from com.sun.star.document.MacroExecMode import ALWAYS_EXECUTE
@@ -30,11 +46,19 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     RM_FOOTER = 4
     RM_FINALSETTINGS = 5
 
+<<<<<<< HEAD
     lstBusinessStylePos = None
     lstPrivateStylePos = None
 
     def __init__(self, xmsf):
         super(FaxWizardDialogImpl, self).__init__(xmsf)
+=======
+
+    def __init__(self, xmsf):
+        super(FaxWizardDialogImpl, self).__init__(xmsf)
+        self.mainDA = []
+        self.faxDA = []
+>>>>>>> master
         self.bSaveSuccess = False
         self.filenameChanged = False
         self.UserTemplatePath = ""
@@ -59,7 +83,11 @@ class FaxWizardDialogImpl(FaxWizardDialog):
     def startWizard(self, xMSF, CurPropertyValue):
         self.running = True
         try:
+<<<<<<< HEAD
             #Number of steps on WizardDialog
+=======
+            #Number of steps on WizardDialog:
+>>>>>>> master
             self.nMaxStep = 5
 
             #instatiate The Document Frame for the Preview
@@ -82,18 +110,33 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             #special Control fFrameor setting the save Path:
             self.insertPathSelectionControl()
 
+<<<<<<< HEAD
             self.initializeTemplates(xMSF)
 
+=======
+>>>>>>> master
             #load the last used settings
             #from the registry and apply listeners to the controls:
             self.initConfiguration()
 
+<<<<<<< HEAD
 
             if self.myPathSelection.xSaveTextBox.Text.lower() == "":
                 self.myPathSelection.initializePath()
 
             xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
             self.createWindowPeer(xContainerWindow)
+=======
+            self.initializeTemplates(xMSF)
+
+            #update the dialog UI according to the loaded Configuration
+            self.__updateUI()
+            if self.myPathSelection.xSaveTextBox.Text.lower() == "":
+                self.myPathSelection.initializePath()
+
+            self.xContainerWindow = self.myFaxDoc.xFrame.ContainerWindow
+            self.createWindowPeer(self.xContainerWindow)
+>>>>>>> master
 
             #add the Roadmap to the dialog:
             self.insertRoadmap()
@@ -146,8 +189,12 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 if fileAccess.exists(self.sPath, True):
                     answer = SystemDialog.showMessageBox(
                         self.xMSF, "MessBox", YES_NO + DEF_NO,
+<<<<<<< HEAD
                         self.resources.resOverwriteWarning,
                         self.xUnoDialog.Peer)
+=======
+                        self.resources.resOverwriteWarning, self.xUnoDialog.Peer)
+>>>>>>> master
                     if answer == 3:
                         # user said: no, do not overwrite...
                         endWizard = False
@@ -214,9 +261,32 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
     def insertRoadmap(self):
         self.addRoadmap()
+<<<<<<< HEAD
         self.insertRoadMapItems(
                 [True, True, True, False, True], self.resources.RoadmapLabels)
 
+=======
+        i = 0
+        i = self.insertRoadmapItem(
+            0, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_TYPESTYLE - 1],
+            FaxWizardDialogImpl.RM_TYPESTYLE)
+        i = self.insertRoadmapItem(
+            i, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_ELEMENTS - 1],
+            FaxWizardDialogImpl.RM_ELEMENTS)
+        i = self.insertRoadmapItem(
+            i, True, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_SENDERRECEIVER - 1],
+            FaxWizardDialogImpl.RM_SENDERRECEIVER)
+        i = self.insertRoadmapItem(
+            i, False, self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_FOOTER - 1], FaxWizardDialogImpl.RM_FOOTER)
+        i = self.insertRoadmapItem(i, True,
+            self.resources.RoadmapLabels[
+            FaxWizardDialogImpl.RM_FINALSETTINGS - 1],
+            FaxWizardDialogImpl.RM_FINALSETTINGS)
+>>>>>>> master
         self.setRoadmapInteractive(True)
         self.setRoadmapComplete(True)
         self.setCurrentRoadmapItemID(1)
@@ -235,6 +305,13 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.myPathSelection.addSelectionListener( \
             self.myPathSelectionListener())
 
+<<<<<<< HEAD
+=======
+    def __updateUI(self):
+        UnoDataAware.updateUIs(self.mainDA)
+        UnoDataAware.updateUIs(self.faxDA)
+
+>>>>>>> master
     def __initializePaths(self):
         try:
             self.sTemplatePath = FileAccess.getOfficePath2(self.xMSF,
@@ -308,6 +385,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             root = Configuration.getConfigurationRoot(self.xMSF,
                 "/org.openoffice.Office.Writer/Wizards/Fax", False)
             self.myConfig.readConfiguration(root, "cp_")
+<<<<<<< HEAD
             RadioDataAware.attachRadioButtons(
                 self.myConfig, "cp_FaxType",
                 (self.optBusinessFax, self.optPrivateFax), True).updateUI()
@@ -368,6 +446,74 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 "cp_TemplateName", self.txtTemplateName, True).updateUI()
             UnoDataAware.attachEditControl(cgl, "cp_TemplatePath",
                 self.myPathSelection.xSaveTextBox, True).updateUI()
+=======
+            self.mainDA.append(RadioDataAware.attachRadioButtons(
+                self.myConfig, "cp_FaxType",
+                (self.optBusinessFax, self.optPrivateFax), True))
+            self.mainDA.append(UnoDataAware.attachListBox(
+                self.myConfig.cp_BusinessFax, "cp_Style",
+                self.lstBusinessStyle, True))
+            self.mainDA.append(UnoDataAware.attachListBox(
+                self.myConfig.cp_PrivateFax, "cp_Style", self.lstPrivateStyle,
+                True))
+            cgl = self.myConfig.cp_BusinessFax
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintCompanyLogo", self.chkUseLogo, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintSubjectLine", self.chkUseSubject, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintSalutation", self.chkUseSalutation, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintDate", self.chkUseDate, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintCommunicationType", self.chkUseCommunicationType,
+                True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintGreeting", self.chkUseGreeting, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_PrintFooter", self.chkUseFooter, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Salutation", self.lstSalutation, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Greeting", self.lstGreeting, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_CommunicationType", self.lstCommunicationType,
+                True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_SenderAddressType", (self.optSenderDefine, \
+                self.optSenderPlaceholder), True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderCompanyName", self.txtSenderName, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderStreet", self.txtSenderStreet, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderPostCode", self.txtSenderPostCode, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderState", self.txtSenderState, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderCity", self.txtSenderCity, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_SenderFax", self.txtSenderFax, True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_ReceiverAddressType", (self.optReceiverDatabase,
+                self.optReceiverPlaceholder), True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_Footer", self.txtFooter, True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_FooterOnlySecondPage", self.chkFooterNextPages,
+                True))
+            self.faxDA.append(UnoDataAware.attachCheckBox(cgl,
+                "cp_FooterPageNumbers", self.chkFooterPageNumbers,
+                True))
+            self.faxDA.append(RadioDataAware.attachRadioButtons(cgl,
+                "cp_CreationType", (self.optCreateFax, self.optMakeChanges),
+                True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_TemplateName", self.txtTemplateName, True))
+            self.faxDA.append(UnoDataAware.attachEditControl(cgl,
+                "cp_TemplatePath", self.myPathSelection.xSaveTextBox,
+                True))
+>>>>>>> master
         except Exception, exception:
             traceback.print_exc()
 
@@ -388,7 +534,12 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.optPrivateFaxItemChanged()
 
     def optBusinessFaxItemChanged(self):
+<<<<<<< HEAD
         FaxWizardDialogImpl.lstPrivateStylePos = None
+=======
+        DataAware.setDataObjects(self.faxDA,
+            self.myConfig.cp_BusinessFax, True)
+>>>>>>> master
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, True)
         self.setControlProperty("lstBusinessStyle",
@@ -400,6 +551,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.lstBusinessStyleItemChanged()
         self.__enableSenderReceiver()
         self.__setPossibleFooter(True)
+<<<<<<< HEAD
 
     def lstBusinessStyleItemChanged(self):
         selectedItemPos = self.lstBusinessStyle.SelectedItemPos
@@ -413,6 +565,18 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
     def optPrivateFaxItemChanged(self):
         FaxWizardDialogImpl.lstBusinessStylePos = None
+=======
+    def lstBusinessStyleItemChanged(self):
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+            self.BusinessFiles[1][self.lstBusinessStyle.SelectedItemPos],
+                False)
+        self.initializeElements()
+        self.setElements()
+
+    def optPrivateFaxItemChanged(self):
+        DataAware.setDataObjects(self.faxDA,
+            self.myConfig.cp_PrivateFax, True)
+>>>>>>> master
         self.setControlProperty("lblBusinessStyle",
             PropertyNames.PROPERTY_ENABLED, False)
         self.setControlProperty("lstBusinessStyle",
@@ -426,6 +590,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.__setPossibleFooter(False)
 
     def lstPrivateStyleItemChanged(self):
+<<<<<<< HEAD
         selectedItemPos = self.lstPrivateStyle.SelectedItemPos
         #avoid to load the same item again
         if FaxWizardDialogImpl.lstPrivateStylePos is not selectedItemPos:
@@ -434,6 +599,13 @@ class FaxWizardDialogImpl(FaxWizardDialog):
                 self.PrivateFiles[1][selectedItemPos], False)
             self.initializeElements()
             self.setElements()
+=======
+        TextDocument.xTextDocument = self.myFaxDoc.loadAsPreview( \
+            self.PrivateFiles[1][self.lstPrivateStyle.SelectedItemPos],
+                False)
+        self.initializeElements()
+        self.setElements()
+>>>>>>> master
 
     def txtTemplateNameTextChanged(self):
         xDocProps = TextDocument.xTextDocument.DocumentProperties
@@ -493,6 +665,23 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         self.txtSenderCityTextChanged()
         self.txtSenderFaxTextChanged()
 
+<<<<<<< HEAD
+=======
+    def optReceiverPlaceholderItemChanged(self):
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+            "StarBasic", "macro:#/Template.Correspondence.Placeholder()")
+
+    def optReceiverDatabaseItemChanged(self):
+        OfficeDocument.attachEventCall(TextDocument.xTextDocument, "OnNew",
+            "StarBasic", "macro:#/Template.Correspondence.Database()")
+
+    def optCreateFaxItemChanged(self):
+        self.bEditTemplate = False
+
+    def optMakeChangesItemChanged(self):
+        self.bEditTemplate = True
+
+>>>>>>> master
     def txtSenderNameTextChanged(self):
         self.myFieldHandler.changeUserFieldContent(
             "Company", self.txtSenderName.Text)
@@ -539,6 +728,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
         if self.optReceiverDatabase.State:
             self.optReceiverDatabaseItemChanged()
 
+<<<<<<< HEAD
         elif self.optReceiverPlaceholder.State:
             self.optReceiverPlaceholderItemChanged()
 
@@ -546,6 +736,15 @@ class FaxWizardDialogImpl(FaxWizardDialog):
             self.optCreateFromTemplateItemChanged()
 
         elif self.optMakeChanges.State:
+=======
+        if self.optReceiverPlaceholder.State:
+            self.optReceiverPlaceholderItemChanged()
+
+        if self.optCreateFax.State:
+            self.optCreateFaxItemChanged()
+
+        if self.optMakeChanges.State:
+>>>>>>> master
             self.optMakeChangesItemChanged()
 
     def chkUseLogoItemChanged(self):
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index bbf6921d381f..20c32c38045f 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -1,6 +1,10 @@
 from common.Resource import Resource
 
 class FaxWizardDialogResources(Resource):
+<<<<<<< HEAD
+=======
+    UNIT_NAME = "dbwizres"
+>>>>>>> master
     MODULE_NAME = "dbw"
     RID_FAXWIZARDDIALOG_START = 3200
     RID_FAXWIZARDCOMMUNICATION_START = 3270
diff --git a/wizards/com/sun/star/wizards/letter/LetterDocument.py b/wizards/com/sun/star/wizards/letter/LetterDocument.py
index f2603956ceb5..af928c8aab3f 100644
--- a/wizards/com/sun/star/wizards/letter/LetterDocument.py
+++ b/wizards/com/sun/star/wizards/letter/LetterDocument.py
@@ -202,7 +202,6 @@ class BusinessPaperObject(object):
             Helper.setUnoPropertyValue(
                 self.xFrame,
                 "Print", False)
-
             xTextCursor = \
                 TextDocument.xTextDocument.Text.createTextCursor()
             xTextCursor.gotoEnd(True)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 8f740cdf1540..76d4f8e79969 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -1067,8 +1067,7 @@ class LetterWizardDialog(WizardDialog):
                 "lblFinalExplanation2", 104, 145, 6, 54, 199))
         self.insertImage(
             "ImageControl2",
-            (
-            "Border", PropertyNames.PROPERTY_HEIGHT,
+            ("Border", PropertyNames.PROPERTY_HEIGHT,
                 PropertyNames.PROPERTY_IMAGEURL,
                 PropertyNames.PROPERTY_NAME,
                 PropertyNames.PROPERTY_POSITION_X,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index 5324e1c37938..12474e34c343 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -1,6 +1,7 @@
 from common.Resource import Resource
 
 class LetterWizardDialogResources(Resource):
+
     MODULE_NAME = "dbw"
     RID_LETTERWIZARDDIALOG_START = 3000
     RID_LETTERWIZARDGREETING_START = 3080
diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk
deleted file mode 100644
index ca7b24941335..000000000000
--- a/wizards/com/sun/star/wizards/report/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET  = report
-PACKAGE = com$/sun$/star$/wizards$/report
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
-
-CUSTOMMANIFESTFILE= MANIFEST.MF
-
-JARCLASSDIRS	= com$/sun$/star$/wizards$/report
-JARTARGET	= $(TARGET).jar
-JARCLASSPATH = commonwizards.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=                             \
-    CallReportWizard.java   		   \
-    DBColumn.java           		   \
-    Dataimport.java         		   \
-    GroupFieldHandler.java  		   \
-    IReportDocument.java    		   \
-    IReportBuilderLayouter.java    		   \
-    IReportDefinitionReadAccess.java    		   \
-    RecordTable.java        		   \
-    ReportFinalizer.java               \
-    ReportImplementationHelper.java    \
-    ReportLayouter.java     		   \
-    ReportTextDocument.java 		   \
-    ReportTextImplementation.java      \
-    ReportWizard.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/report.component
-
-$(MISC)/report.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        report.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt report.component
diff --git a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
deleted file mode 100644
index 41e4d3cd9c79..000000000000
--- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = wizards
-TARGET  = reportbuilderwizard
-PACKAGE = com$/sun$/star$/wizards$/reportbuilder
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
-
-JARCLASSDIRS	= com$/sun$/star$/wizards$/reportbuilder
-JARTARGET	= $(TARGET).jar
-JARCLASSPATH = commonwizards.jar report.jar
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=                             \
-    ReportBuilderImplementation.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.py b/wizards/com/sun/star/wizards/text/TextDocument.py
index cebb8d6c6ece..df7c0e76aafa 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.py
+++ b/wizards/com/sun/star/wizards/text/TextDocument.py
@@ -218,6 +218,7 @@ class TextDocument(object):
             year = time.strftime("%Y", now)
             month = time.strftime("%m", now)
             day = time.strftime("%d", now)
+
             dateObject = dateTimeObject(int(year), int(month), int(day))
             du = Helper.DateUtils(self.xMSF, TextDocument.xTextDocument)
             ff = du.getFormat(DATE_SYS_DDMMYY)
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index 7de9d8b04410..45b6249a942f 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -202,7 +202,6 @@ class UnoDialog2(UnoDialog):
             sName, sPropNames, oPropValues)
         return oLine
 
-
     def insertLabel(self, sName, sPropNames, oPropValues):
         oFixedText = self.insertControlModel(
             "com.sun.star.awt.UnoControlFixedTextModel",
@@ -238,4 +237,3 @@ class UnoDialog2(UnoDialog):
         return SystemDialog.showMessageBox(
             xMSF, self.xControl.Peer,
             windowServiceName, windowAttribute, MessageText)
-
diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
index 9da4ec4a4e0d..c94ae418036c 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
@@ -61,7 +61,6 @@ class ItemListenerProcAdapter( unohelper.Base, XItemListener ):
             except:
                 apply( self.oProcToCall, (oItemEvent,) + self.tParams )
 
-
 from com.sun.star.awt import XTextListener
 class TextListenerProcAdapter( unohelper.Base, XTextListener ):
     def __init__( self, oProcToCall, tParams=() ):
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py
index 5975dcad9d55..5f4df9585587 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py
@@ -101,6 +101,7 @@ class DataAware(object):
             self.enableControls(ui)
         except Exception:
             traceback.print_exc()
+
     '''
     given a collection containing DataAware objects,
     calls updateUI() on each memebr of the collection.