[Libreoffice-commits] .: 7 commits - Makefile.top nss/makefile.mk officecfg/registry openldap/makefile.mk postprocess/packcomponents scp2/source wizards/com wizards/Jar_fax.mk wizards/Module_wizards.mk wizards/Pyuno_fax.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sun Oct 14 13:50:40 PDT 2012


 Makefile.top                                                   |    7 
 nss/makefile.mk                                                |   26 
 officecfg/registry/data/org/openoffice/Office/Common.xcu       |    2 
 openldap/makefile.mk                                           |    6 
 postprocess/packcomponents/makefile.mk                         |    2 
 scp2/source/ooo/file_ooo.scp                                   |    1 
 wizards/Jar_fax.mk                                             |   57 
 wizards/Module_wizards.mk                                      |    1 
 wizards/Pyuno_fax.mk                                           |    6 
 wizards/com/sun/star/wizards/common/NumberFormatter.py         |    2 
 wizards/com/sun/star/wizards/common/SystemDialog.py            |    4 
 wizards/com/sun/star/wizards/fax/CGFax.java                    |   50 
 wizards/com/sun/star/wizards/fax/CGFaxWizard.java              |   28 
 wizards/com/sun/star/wizards/fax/CallWizard.java               |  228 --
 wizards/com/sun/star/wizards/fax/CallWizard.py                 |   30 
 wizards/com/sun/star/wizards/fax/FaxDocument.java              |  201 -
 wizards/com/sun/star/wizards/fax/FaxDocument.py                |    5 
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.java          |  618 -----
 wizards/com/sun/star/wizards/fax/FaxWizardDialog.py            |   72 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java     |  106 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py       |  146 -
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java      | 1073 ----------
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py        |    7 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.java |  216 --
 wizards/com/sun/star/wizards/fax/MANIFEST.MF                   |    2 
 wizards/com/sun/star/wizards/fax/fax.component                 |   10 
 wizards/com/sun/star/wizards/fax/pyfax.component               |   24 
 wizards/com/sun/star/wizards/ui/UnoDialog2.py                  |    2 
 wizards/com/sun/star/wizards/ui/WizardDialog.py                |    2 
 wizards/com/sun/star/wizards/ui/event/CommonListener.py        |    1 
 wizards/com/sun/star/wizards/ui/event/DataAware.py             |    3 
 wizards/com/sun/star/wizards/ui/event/RadioDataAware.py        |    5 
 wizards/com/sun/star/wizards/ui/event/UnoDataAware.py          |    7 
 33 files changed, 188 insertions(+), 2762 deletions(-)

New commits:
commit af1f02a85d2a4d27c8291dccf43d63887543caa4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 14 23:46:04 2012 +0300

    Handle cross-compilation
    
    Guesstimate that --with-yielding_select=yes.
    
    Change-Id: I44c91c41b5f46ee4e969065b8c5e7c0c01899286

diff --git a/openldap/makefile.mk b/openldap/makefile.mk
index e12587a..d152294 100644
--- a/openldap/makefile.mk
+++ b/openldap/makefile.mk
@@ -37,6 +37,11 @@ PATCH_FILES=\
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --without-cyrus-sasl --disable-shared --enable-static
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-yielding_select=yes
+.ENDIF
+
 .IF "$(SYSTEM_NSS)" == "YES"
 CONFIGURE_FLAGS+=CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)"
 .ELSE
@@ -44,6 +49,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOL
 CONFIGURE_FLAGS+=CFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nspr"
 CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARVER)$/$(INPATH)$/lib"
 .ENDIF
+
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE)
commit c96b4c550db2e5206786b9b689c2eb293ee787bb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 14 23:35:54 2012 +0300

    Handle cross-compilation of nss (for desktop OSes)
    
    A bit messy, but then so is the nss configuration and build mechanism.
    
    Change-Id: If2259e3da81521a2f87a5b312c6acd9d40e75ae5

diff --git a/Makefile.top b/Makefile.top
index 2b0cac0..0e85de6 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -435,7 +435,12 @@ build-nocheck : build
 
 cross-toolset: bootstrap fetch
 	cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
-
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifneq (WNT,$(OS))
+# We need to build nss for nsinstall... See NSINSTALL=... in nss/makefile.mk
+	$(GNUMAKE) gb_Side=build nss
+endif
+endif
 
 #
 # Install
diff --git a/nss/makefile.mk b/nss/makefile.mk
index bff00b2..7e27b93 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -74,7 +74,13 @@ my_prefix=/@.__________________________________________________$(EXTRPATH)
 my_prefix=$(OUTDIR)
 .END
 
-CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$(OUTDIR)/inc/mozilla/nspr ; \
+CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$(OUTDIR)/inc/mozilla/nspr
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_ACTION+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
+CONFIGURE_ACTION+= ; \
     sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \
     chmod a+x mozilla/security/nss/nss-config
 
@@ -114,6 +120,24 @@ OUT2BIN=config/nspr-config mozilla/security/nss/nss-config
 
 BUILD_DIR=mozilla/security/nss
 BUILD_ACTION= $(GNUMAKE) nss_build_all -j1
+
+.IF "$(CROSS_COMPILING)"=="YES"
+
+.IF "$(OS)-$(CPUNAME)"="MACOSX-POWERPC"
+# Hardcode this for now... need to add more when/if cross-compiling to
+# other desktop OSes, yeah, this is silly, but the nss build mechanism
+# is a bit messy, I could not figure out how to get it to get CPU_ARCH
+# automatically when cross-compiling
+BUILD_ACTION+= CPU_ARCH=ppc
+.ENDIF
+
+# When cross-compiling need to use a nsinstall built for the build
+# platform, so yeah, whole nss built for the build platform just for
+# that... But oh well, nss is small compared to LO;)
+BUILD_ACTION+= NSINSTALL=$(SRC_ROOT)/nss/$(INPATH_FOR_BUILD)/misc/build/$(TARFILE_ROOTDIR)/mozilla/security/coreconf/nsinstall/out/nsinstall
+
+.ENDIF
+
 #Note: with the new version the libfreebl3.so gets built in a way that does
 # not conflict with the system one on Linux automatically;
 # it is no longer necessary to add a workaround for #i105566# && moz#513024#
commit 9715b31f9dc4b77ad566b00b6427832203d4bc42
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Sun Oct 14 21:28:48 2012 +0200

    pyfax: get rid of import *
    
    Change-Id: Ifb1d5edc400fe9f8b91851057c243280151eb1a2

diff --git a/wizards/com/sun/star/wizards/ui/event/CommonListener.py b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
index 2a6ef5b..f8f2a9b 100644
--- a/wizards/com/sun/star/wizards/ui/event/CommonListener.py
+++ b/wizards/com/sun/star/wizards/ui/event/CommonListener.py
@@ -31,7 +31,6 @@
 #   Danny Brewer         Revised 2004-06-05-01
 #
 import unohelper
-
 from com.sun.star.awt import XActionListener
 
 class ActionListenerProcAdapter( unohelper.Base, XActionListener ):
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py
index 8a9f08d..781dc88 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py
@@ -17,8 +17,7 @@
 #
 import traceback
 from abc import ABCMeta, abstractmethod
-from .CommonListener import *
-from ...common.PropertyNames import *
+from ...common.PropertyNames import PropertyNames
 
 '''
 @author rpiterman
diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
index fa30c4d..9a263c1 100644
--- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
@@ -16,9 +16,8 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import time
-from .DataAware import *
-from .DataAware import *
-from .UnoDataAware import *
+from .CommonListener import ItemListenerProcAdapter
+from .DataAware import DataAware
 
 class RadioDataAware(DataAware):
 
diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
index 4cc5a3e..c753a9b 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.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 .
 #
-from .DataAware import *
-from .DataAware import *
-from ...common.Helper import *
+import uno
+from .CommonListener import ItemListenerProcAdapter, TextListenerProcAdapter
+from .DataAware import DataAware, PropertyNames
+from ...common.Helper import Helper
 
 '''
 @author rpiterman
commit 6c78b874a8d439e20c96593a399b85185ac0785e
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Sun Oct 14 21:12:10 2012 +0200

    pyfax: replace tabs with spaces
    
    Change-Id: I8606c419e93ace8895b409a364fd79b474be7f6a

diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.py b/wizards/com/sun/star/wizards/common/NumberFormatter.py
index 67d9d98..5a9bb15 100644
--- a/wizards/com/sun/star/wizards/common/NumberFormatter.py
+++ b/wizards/com/sun/star/wizards/common/NumberFormatter.py
@@ -18,7 +18,7 @@
 import traceback
 from com.sun.star.lang import Locale
 from com.sun.star.util.NumberFormat import \
-	DATE, LOGICAL, DATETIME, TEXT, NUMBER
+    DATE, LOGICAL, DATETIME, TEXT, NUMBER
 
 class NumberFormatter(object):
 
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index 3a89f98..c0b7673 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -37,9 +37,9 @@ class SystemDialog(object):
             self.systemDialog = xMSF.createInstance(ServiceName)
             self.xStringSubstitution = self.createStringSubstitution(xMSF)
 
-			# Add a name textbox to the filepicker
+            # Add a name textbox to the filepicker
             if self.systemDialog is not None:
-				self.systemDialog.initialize((Type,))
+                self.systemDialog.initialize((Type,))
 
         except Exception, exception:
             traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.py b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
index f13a240..9f7f103 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.py
@@ -20,7 +20,7 @@ from .UIConsts import UIConsts
 from ..common.Desktop import Desktop
 from ..common.PropertyNames import PropertyNames
 from .event.CommonListener import ItemListenerProcAdapter, \
-	ActionListenerProcAdapter, TextListenerProcAdapter
+    ActionListenerProcAdapter, TextListenerProcAdapter
 
 '''
 This class contains convenience methods for inserting components to a dialog.
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index ea7cab8..cfd2607 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -19,7 +19,7 @@ import uno
 import traceback
 from abc import ABCMeta, abstractmethod
 from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
-	ItemListenerProcAdapter
+    ItemListenerProcAdapter
 from .event.CommonListener import TerminateListenerProcAdapter
 from ..common.Helper import Helper
 from ..common.Resource import Resource
commit 500edb98783fea1d8f244b0ca0d2eb5b099985e5
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Sun Oct 14 21:02:16 2012 +0200

    pyfax: Remove java code
    
    Change-Id: If910b37990677458dcb2c88007ad713b1f208fbe

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 45e8b35..2f13b99 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -404,7 +404,7 @@
       </node>
       <node oor:name="m1" oor:op="replace" install:module="writer">
         <prop oor:name="URL"  oor:type="xs:string">
-          <value >service:com.sun.star.wizards.fax.CallWizard?start</value>
+          <value >service:com.sun.star.wizards.fax.CallWizard?insert</value>
         </prop>
         <prop oor:name="Title">
           <value xml:lang="en-US">~Fax...</value>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b2b2296..9c191f2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -195,6 +195,7 @@ my_components += \
     component/scripting/source/dlgprov/dlgprov \
     component/scripting/source/protocolhandler/protocolhandler \
     component/scripting/source/pyprov/mailmerge \
+    component/wizards/com/sun/star/wizards/fax/fax \
     component/scripting/source/stringresource/stringresource \
     component/scripting/source/vbaevents/vbaevents \
     component/scripting/util/scriptframe \
@@ -297,7 +298,6 @@ my_components += \
     component/scripting/java/ScriptFramework \
     component/scripting/java/ScriptProviderForJava \
     component/wizards/com/sun/star/wizards/agenda/agenda \
-    component/wizards/com/sun/star/wizards/fax/fax \
     component/wizards/com/sun/star/wizards/form/form \
     component/connectivity/source/drivers/hsqldb/hsqldb \
     component/connectivity/source/drivers/jdbc/jdbc \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ea102c3..5535210 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -432,7 +432,6 @@ STD_JAR_FILE( gid_File_Jar_Report, report )
 STD_JAR_FILE( gid_File_Jar_Table, table )
 STD_JAR_FILE( gid_File_Jar_Letter, letter )
 STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Fax, fax )
 STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
deleted file mode 100644
index b65fd4d..0000000
--- a/wizards/Jar_fax.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Jar_Jar,fax))
-
-$(eval $(call gb_Jar_use_jars,fax,\
-	ridl \
-	unoil \
-	jurt \
-	juh \
-	java_uno \
-	commonwizards \
-))
-
-$(eval $(call gb_Jar_set_packageroot,fax,com))
-
-$(eval $(call gb_Jar_set_manifest,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax/MANIFEST.MF))
-
-$(eval $(call gb_Jar_add_sourcefiles,fax,\
-	wizards/com/sun/star/wizards/fax/CallWizard \
-	wizards/com/sun/star/wizards/fax/CGFax \
-	wizards/com/sun/star/wizards/fax/CGFaxWizard \
-	wizards/com/sun/star/wizards/fax/FaxDocument \
-	wizards/com/sun/star/wizards/fax/FaxWizardDialog \
-	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst \
-	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl \
-	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources \
-))
-
-$(eval $(call gb_Jar_set_componentfile,fax,wizards/com/sun/star/wizards/fax/fax,OOO))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index fb23aa2..a9547e7 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -55,7 +55,6 @@ ifeq ($(SOLAR_JAVA),TRUE)
 $(eval $(call gb_Module_add_targets,wizards,\
 	Jar_commonwizards \
 	Jar_agenda \
-	Jar_fax \
 	Jar_form \
 	Jar_letter \
 	Jar_query \
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index 868eecf..cd5990e 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -25,9 +25,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Pyuno_Pyuno,pyfax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
+$(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
 
-$(eval $(call gb_Pyuno_add_files,pyfax,\
+$(eval $(call gb_Pyuno_add_files,fax,\
     __init__.py \
     CallWizard.py \
     CGFax.py \
@@ -38,6 +38,6 @@ $(eval $(call gb_Pyuno_add_files,pyfax,\
     FaxWizardDialog.py \
     FaxWizardDialogResources.py \
 ))
-$(eval $(call gb_Pyuno_set_componentfile_full,pyfax,wizards/com/sun/star/wizards/fax/pyfax,vnd.openoffice.pymodule:wizards.fax,.CallWizard))
+$(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.openoffice.pymodule:wizards.fax,.CallWizard))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/CGFax.java b/wizards/com/sun/star/wizards/fax/CGFax.java
deleted file mode 100644
index 52e895a..0000000
--- a/wizards/com/sun/star/wizards/fax/CGFax.java
+++ /dev/null
@@ -1,50 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import com.sun.star.wizards.common.ConfigGroup;
-
-public class CGFax extends ConfigGroup
-{
-
-    public int cp_Style;
-    public boolean cp_PrintCompanyLogo;
-    public boolean cp_PrintDate;
-    public boolean cp_PrintSubjectLine;
-    public boolean cp_PrintSalutation;
-    public boolean cp_PrintCommunicationType;
-    public boolean cp_PrintGreeting;
-    public boolean cp_PrintFooter;
-    public String cp_CommunicationType;
-    public String cp_Salutation;
-    public String cp_Greeting;
-    public int cp_SenderAddressType;
-    public String cp_SenderCompanyName;
-    public String cp_SenderStreet;
-    public String cp_SenderPostCode;
-    public String cp_SenderState;
-    public String cp_SenderCity;
-    public String cp_SenderFax;
-    public int cp_ReceiverAddressType;
-    public String cp_Footer;
-    public boolean cp_FooterOnlySecondPage;
-    public boolean cp_FooterPageNumbers;
-    public int cp_CreationType;
-    public String cp_TemplateName;
-    public String cp_TemplatePath;
-}
diff --git a/wizards/com/sun/star/wizards/fax/CGFaxWizard.java b/wizards/com/sun/star/wizards/fax/CGFaxWizard.java
deleted file mode 100644
index 588c2fa..0000000
--- a/wizards/com/sun/star/wizards/fax/CGFaxWizard.java
+++ /dev/null
@@ -1,28 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import com.sun.star.wizards.common.ConfigGroup;
-
-public class CGFaxWizard extends ConfigGroup
-{
-
-    public int cp_FaxType;
-    public CGFax cp_BusinessFax = new CGFax();
-    public CGFax cp_PrivateFax = new CGFax();
-}
diff --git a/wizards/com/sun/star/wizards/fax/CallWizard.java b/wizards/com/sun/star/wizards/fax/CallWizard.java
deleted file mode 100644
index 64e341f..0000000
--- a/wizards/com/sun/star/wizards/fax/CallWizard.java
+++ /dev/null
@@ -1,228 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import com.sun.star.beans.XPropertyAccess;
-import com.sun.star.comp.loader.FactoryHelper;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.lang.XSingleServiceFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.task.XJob;
-import com.sun.star.task.XJobExecutor;
-import com.sun.star.uno.Type;
-import com.sun.star.wizards.common.PropertyNames;
-
-/**
- * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>).
- */
-public class CallWizard
-{
-
-    /**
-     * Gives a factory for creating the service. This method is called by the
-     * <code>JavaLoader</code>
-     * 
-     * <p></p>
-     *
-     * @param stringImplementationName The implementation name of the component.
-     * @param xMSF The service manager, who gives access to every known service.
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return Returns a <code>XSingleServiceFactory</code> for creating the component.
-     *
-     * @see com.sun.star.comp.loader.JavaLoader
-     */
-    public static XSingleServiceFactory __getServiceFactory(String stringImplementationName, XMultiServiceFactory xMSF, XRegistryKey xregistrykey)
-    {
-        XSingleServiceFactory xsingleservicefactory = null;
-
-        if (stringImplementationName.equals(WizardImplementation.class.getName()))
-        {
-            xsingleservicefactory = FactoryHelper.getServiceFactory(WizardImplementation.class, WizardImplementation.__serviceName, xMSF, xregistrykey);
-        }
-
-        return xsingleservicefactory;
-    }
-
-    /**
-     * This class implements the component. At least the interfaces XServiceInfo,
-     * XTypeProvider, and XInitialization should be provided by the service.
-     */
-    public static class WizardImplementation implements XInitialization, XTypeProvider, XServiceInfo, XJobExecutor
-    {
-
-        /**
-         * The constructor of the inner class has a XMultiServiceFactory parameter.
-         *
-         * @param xmultiservicefactoryInitialization A special service factory could be
-         *        introduced while initializing.
-         */
-        public WizardImplementation(XMultiServiceFactory xmultiservicefactoryInitialization)
-        {
-            xmultiservicefactory = xmultiservicefactoryInitialization;
-
-            if (xmultiservicefactory != null)
-            {
-            }
-        }
-
-        /**
-         * Execute Wizard
-         *
-         * @param str only valid parameter is 'start' at the moment.
-         */
-        public void trigger(String str)
-        {
-            if (str.equalsIgnoreCase(PropertyNames.START))
-            {
-                FaxWizardDialogImpl lw = new FaxWizardDialogImpl(xmultiservicefactory);
-                if (!FaxWizardDialogImpl.running)
-                {
-                    lw.startWizard(xmultiservicefactory, null);
-                }
-            }
-        }        //*******************************************
-        /**
-         * The service name, that must be used to get an instance of this service.
-         */
-        private static final String __serviceName = "com.sun.star.wizards.fax.CallWizard";
-        /**
-         * The service manager, that gives access to all registered services.
-         */
-        private XMultiServiceFactory xmultiservicefactory;
-
-        /**
-         * This method is a member of the interface for initializing an object directly
-         * after its creation.
-         *
-         * @param object This array of arbitrary objects will be passed to the component
-         *        after its creation.
-         *
-         * @throws com.sun.star.uno.Exception Every exception will not be handled, but
-         *         will be passed to the caller.
-         */
-        public void initialize(Object[] object) throws com.sun.star.uno.Exception
-        {
-        }
-
-        /**
-         * This method returns an array of all supported service names.
-         *
-         * @return Array of supported service names.
-         */
-        public java.lang.String[] getSupportedServiceNames()
-        {
-            String[] stringSupportedServiceNames = new String[1];
-            stringSupportedServiceNames[0] = __serviceName;
-
-            return (stringSupportedServiceNames);
-        }
-
-        /**
-         * This method returns true, if the given service will be supported by the
-         * component.
-         *
-         * @param stringService Service name.
-         *
-         * @return True, if the given service name will be supported.
-         */
-        public boolean supportsService(String stringService)
-        {
-            boolean booleanSupportsService = false;
-
-            if (stringService.equals(__serviceName))
-            {
-                booleanSupportsService = true;
-            }
-
-            return (booleanSupportsService);
-        }
-
-        /**
-         * This method returns an array of bytes, that can be used to unambiguously
-         * distinguish between two sets of types, e.g. to realise hashing functionality
-         * when the object is introspected. Two objects that return the same ID also
-         * have to return the same set of types in getTypes(). If an unique
-         * implementation Id cannot be provided this method has to return an empty
-         * sequence. Important: If the object aggregates other objects the ID has to be
-         * unique for the whole combination of objects.
-         *
-         * @return Array of bytes, in order to distinguish between two sets.
-         */
-        public byte[] getImplementationId()
-        {
-            byte[] byteReturn =
-            {
-            };
-
-            try
-            {
-                byteReturn = (PropertyNames.EMPTY_STRING + this.hashCode()).getBytes();
-            }
-            catch (Exception exception)
-            {
-                System.err.println(exception);
-            }
-
-            return (byteReturn);
-        }
-
-        /**
-         * Return the class name of the component.
-         *
-         * @return Class name of the component.
-         */
-        public java.lang.String getImplementationName()
-        {
-            return (WizardImplementation.class.getName());
-        }
-
-        /**
-         * Provides a sequence of all types (usually interface types) provided by the
-         * object.
-         *
-         * @return Sequence of all types (usually interface types) provided by the
-         *         service.
-         */
-        public com.sun.star.uno.Type[] getTypes()
-        {
-            Type[] typeReturn =
-            {
-            };
-
-            try
-            {
-                typeReturn = new Type[]
-                        {
-                            new Type(XPropertyAccess.class), new Type(XJob.class), new Type(XJobExecutor.class), new Type(XTypeProvider.class), new Type(XServiceInfo.class), new Type(XInitialization.class)
-                        };
-            }
-            catch (Exception exception)
-            {
-                System.err.println(exception);
-            }
-
-            return (typeReturn);
-        }
-    }
-}
diff --git a/wizards/com/sun/star/wizards/fax/FaxDocument.java b/wizards/com/sun/star/wizards/fax/FaxDocument.java
deleted file mode 100644
index c4cd286..0000000
--- a/wizards/com/sun/star/wizards/fax/FaxDocument.java
+++ /dev/null
@@ -1,201 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import com.sun.star.wizards.common.*;
-import com.sun.star.wizards.text.*;
-import com.sun.star.frame.XDesktop;
-import com.sun.star.frame.XTerminateListener;
-import com.sun.star.text.*;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.awt.XWindowPeer;
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.style.NumberingType;
-import com.sun.star.style.ParagraphAdjust;
-import com.sun.star.style.XStyleFamiliesSupplier;
-import com.sun.star.style.XStyle;
-
-public class FaxDocument extends TextDocument
-{
-
-    XDesktop xDesktop;
-    boolean keepLogoFrame = true;
-    boolean keepTypeFrame = true;
-
-    public FaxDocument(XMultiServiceFactory xMSF, XTerminateListener listener)
-    {
-        super(xMSF, listener, "WIZARD_LIVE_PREVIEW");
-    }
-
-    public XWindowPeer getWindowPeer()
-    {
-        return UnoRuntime.queryInterface(XWindowPeer.class, xTextDocument);
-    }
-
-    public void switchElement(String sElement, boolean bState)
-    {
-        try
-        {
-            TextSectionHandler mySectionHandler = new TextSectionHandler(xMSF, xTextDocument);
-            Object oSection = mySectionHandler.xTextSectionsSupplier.getTextSections().getByName(sElement);
-            Helper.setUnoPropertyValue(oSection, "IsVisible", Boolean.valueOf(bState));
-
-        }
-        catch (Exception exception)
-        {
-            exception.printStackTrace(System.err);
-        }
-    }
-
-    public void updateDateFields()
-    {
-        TextFieldHandler FH = new TextFieldHandler(xMSFDoc, xTextDocument);
-        FH.updateDateFields();
-    }
-
-    public void switchFooter(String sPageStyle, boolean bState, boolean bPageNumber, String sText)
-    {
-        if (xTextDocument != null)
-        {
-            xTextDocument.lockControllers();
-            try
-            {
-                XStyleFamiliesSupplier xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument);
-                com.sun.star.container.XNameAccess xNameAccess = null;
-                xNameAccess = xStyleFamiliesSupplier.getStyleFamilies();
-
-                com.sun.star.container.XNameContainer xPageStyleCollection = null;
-                xPageStyleCollection = UnoRuntime.queryInterface(com.sun.star.container.XNameContainer.class, xNameAccess.getByName("PageStyles"));
-
-                XText xFooterText;
-                XStyle xPageStyle = UnoRuntime.queryInterface(XStyle.class, xPageStyleCollection.getByName(sPageStyle));
-
-                if (bState)
-                {
-                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn", Boolean.TRUE);
-                    xFooterText = UnoRuntime.queryInterface(XText.class, Helper.getUnoPropertyValue(xPageStyle, "FooterText"));
-                    xFooterText.setString(sText);
-                    if (bPageNumber)
-                    {
-                        //Adding the Page Number
-                        XTextCursor myCursor = xFooterText.createTextCursor();
-                        myCursor.gotoEnd(false);
-                        xFooterText.insertControlCharacter(myCursor, ControlCharacter.PARAGRAPH_BREAK, false);
-                        XPropertySet xCursorPSet = UnoRuntime.queryInterface(XPropertySet.class, myCursor);
-                        xCursorPSet.setPropertyValue("ParaAdjust", ParagraphAdjust.CENTER);
-                        XTextField xPageNumberField = UnoRuntime.queryInterface(XTextField.class, xMSFDoc.createInstance("com.sun.star.text.TextField.PageNumber"));
-                        XPropertySet xPSet = UnoRuntime.queryInterface(XPropertySet.class, xPageNumberField);
-                        xPSet.setPropertyValue("SubType", PageNumberType.CURRENT);
-                        xPSet.setPropertyValue("NumberingType", new Short(NumberingType.ARABIC));
-                        xFooterText.insertTextContent(xFooterText.getEnd(), xPageNumberField, false);
-                    }
-                }
-                else
-                {
-                    Helper.setUnoPropertyValue(xPageStyle, "FooterIsOn", Boolean.FALSE);
-                }
-                xTextDocument.unlockControllers();
-            }
-            catch (Exception exception)
-            {
-                exception.printStackTrace(System.err);
-            }
-        }
-    }
-
-    public boolean hasElement(String sElement)
-    {
-        if (xTextDocument != null)
-        {
-            TextSectionHandler mySectionHandler = new TextSectionHandler(xMSF, xTextDocument);
-            return mySectionHandler.hasTextSectionByName(sElement);
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    public void switchUserField(String sFieldName, String sNewContent, boolean bState)
-    {
-        TextFieldHandler myFieldHandler = new TextFieldHandler(xMSF, xTextDocument);
-        if (bState)
-        {
-            myFieldHandler.changeUserFieldContent(sFieldName, sNewContent);
-        }
-        else
-        {
-            myFieldHandler.changeUserFieldContent(sFieldName, PropertyNames.EMPTY_STRING);
-        }
-    }
-
-    public void fillSenderWithUserData()
-    {
-        try
-        {
-            TextFieldHandler myFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument);
-            Object oUserDataAccess = Configuration.getConfigurationRoot(xMSF, "org.openoffice.UserProfile/Data", false);
-            myFieldHandler.changeUserFieldContent("Company", (String) Helper.getUnoObjectbyName(oUserDataAccess, "o"));
-            myFieldHandler.changeUserFieldContent("Street", (String) Helper.getUnoObjectbyName(oUserDataAccess, "street"));
-            myFieldHandler.changeUserFieldContent("PostCode", (String) Helper.getUnoObjectbyName(oUserDataAccess, "postalcode"));
-            myFieldHandler.changeUserFieldContent(PropertyNames.PROPERTY_STATE, (String) Helper.getUnoObjectbyName(oUserDataAccess, "st"));
-            myFieldHandler.changeUserFieldContent("City", (String) Helper.getUnoObjectbyName(oUserDataAccess, "l"));
-            myFieldHandler.changeUserFieldContent("Fax", (String) Helper.getUnoObjectbyName(oUserDataAccess, "facsimiletelephonenumber"));
-        }
-        catch (Exception exception)
-        {
-            exception.printStackTrace(System.err);
-        }
-    }
-
-    public void killEmptyUserFields()
-    {
-        TextFieldHandler myFieldHandler = new TextFieldHandler(xMSF, xTextDocument);
-        myFieldHandler.removeUserFieldByContent(PropertyNames.EMPTY_STRING);
-    }
-
-    public void killEmptyFrames()
-    {
-        try
-        {
-            if (!keepLogoFrame)
-            {
-                XTextFrame xTF = TextFrameHandler.getFrameByName("Company Logo", xTextDocument);
-                if (xTF != null)
-                {
-                    xTF.dispose();
-                }
-            }
-            if (!keepTypeFrame)
-            {
-                XTextFrame xTF = TextFrameHandler.getFrameByName("Communication Type", xTextDocument);
-                if (xTF != null)
-                {
-                    xTF.dispose();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-    }
-}
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java
deleted file mode 100644
index 5fdfb2a..0000000
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.java
+++ /dev/null
@@ -1,618 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import com.sun.star.awt.*;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.wizards.common.*;
-import com.sun.star.wizards.ui.*;
-
-public abstract class FaxWizardDialog extends WizardDialog implements FaxWizardDialogConst, UIConsts
-{
-
-    XRadioButton optBusinessFax;
-    XListBox lstBusinessStyle;
-    XRadioButton optPrivateFax;
-    XListBox lstPrivateStyle;
-    XFixedText lblBusinessStyle;
-    XFixedText lblTitle1;
-    XFixedText lblPrivateStyle;
-    XFixedText lblIntroduction;
-    //Image Control
-    XControl ImageControl3;
-    XCheckBox chkUseLogo;
-    XCheckBox chkUseDate;
-    XCheckBox chkUseCommunicationType;
-    XComboBox lstCommunicationType;
-    XCheckBox chkUseSubject;
-    XCheckBox chkUseSalutation;
-    XComboBox lstSalutation;
-    XCheckBox chkUseGreeting;
-    XComboBox lstGreeting;
-    XCheckBox chkUseFooter;
-    XFixedText lblTitle3;
-    XRadioButton optSenderPlaceholder;
-    XRadioButton optSenderDefine;
-    XTextComponent txtSenderName;
-    XTextComponent txtSenderStreet;
-    XTextComponent txtSenderPostCode;
-    XTextComponent txtSenderState;
-    XTextComponent txtSenderCity;
-    XTextComponent txtSenderFax;
-    XRadioButton optReceiverDatabase;
-    XRadioButton optReceiverPlaceholder;
-    XFixedText lblSenderAddress;
-    //Fixed Line
-    XControl FixedLine2;
-    XFixedText lblSenderName;
-    XFixedText lblSenderStreet;
-    XFixedText lblPostCodeCity;
-    XFixedText lblTitle4;
-    XFixedText Label1;
-    XFixedText Label2;
-    XTextComponent txtFooter;
-    XCheckBox chkFooterNextPages;
-    XCheckBox chkFooterPageNumbers;
-    XFixedText lblFooter;
-    XFixedText lblTitle5;
-    XTextComponent txtTemplateName;
-    //File Control
-    XControl fileTemplatePath;
-    XRadioButton optCreateFax;
-    XRadioButton optMakeChanges;
-    XFixedText lblFinalExplanation1;
-    XFixedText lblProceed;
-    XFixedText lblFinalExplanation2;
-    //Image Control
-    XControl ImageControl2;
-    XFixedText lblTemplateName;
-    XFixedText lblTemplatePath;
-    XFixedText lblTitle6;
-    XFixedText Label9;
-    //Font Descriptors as Class members.
-    FontDescriptor fontDescriptor1 = new FontDescriptor();
-    FontDescriptor fontDescriptor2 = new FontDescriptor();
-    FontDescriptor fontDescriptor4 = new FontDescriptor();
-    FontDescriptor fontDescriptor5 = new FontDescriptor();    //Resources Object
-    FaxWizardDialogResources resources;
-
-    public FaxWizardDialog(XMultiServiceFactory xmsf)
-    {
-        super(xmsf, HIDMAIN);
-        //Load Resources
-        resources = new FaxWizardDialogResources(xmsf);
-
-
-        //set dialog properties...
-        Helper.setUnoPropertyValues(xDialogModel,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_CLOSEABLE, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_MOVEABLE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_TITLE, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, 210, Boolean.TRUE, 104, 52, INTEGERS[1], new Short((short) 1), resources.resFaxWizardDialog_title, 310
-                });
-
-
-
-        //Set member- FontDescriptors...
-        fontDescriptor1.Weight = 150;
-        fontDescriptor1.Underline = com.sun.star.awt.FontUnderline.SINGLE;
-        fontDescriptor2.Weight = 100;
-        fontDescriptor4.Weight = 100;
-        fontDescriptor5.Weight = 150;
-    }
-    //build components
-    public void buildStep1()
-    {
-        optBusinessFax = insertRadioButton("optBusinessFax", OPTBUSINESSFAX_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTBUSINESSFAX_HID, resources.resoptBusinessFax_value, 97, 28, INTEGERS[1], new Short((short) 1), 184
-                });
-        lstBusinessStyle = insertListBox("lstBusinessStyle", LSTBUSINESSSTYLE_ACTION_PERFORMED, LSTBUSINESSSTYLE_ITEM_CHANGED,
-                new String[]
-                {
-                    "Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, INTEGER_12, LSTBUSINESSSTYLE_HID, 180, INTEGER_40, INTEGERS[1], new Short((short) 3), 74
-                });
-        optPrivateFax = insertRadioButton("optPrivateFax", OPTPRIVATEFAX_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTPRIVATEFAX_HID, resources.resoptPrivateFax_value, 97, 81, INTEGERS[1], new Short((short) 2), 184
-                });
-        lstPrivateStyle = insertListBox("lstPrivateStyle", LSTPRIVATESTYLE_ACTION_PERFORMED, LSTPRIVATESTYLE_ITEM_CHANGED,
-                new String[]
-                {
-                    "Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, INTEGER_12, LSTPRIVATESTYLE_HID, 180, 95, INTEGERS[1], new Short((short) 4), 74
-                });
-        lblBusinessStyle = insertLabel("lblBusinessStyle",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblBusinessStyle_value, 110, 42, INTEGERS[1], new Short((short) 32), 60
-                });
-        lblTitle1 = insertLabel("lblTitle1",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor5, INTEGER_16, resources.reslblTitle1_value, Boolean.TRUE, 91, INTEGERS[8], INTEGERS[1], new Short((short) 37), 212
-                });
-        lblPrivateStyle = insertLabel("lblPrivateStyle",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblPrivateStyle_value, 110, 95, INTEGERS[1], new Short((short) 50), 60
-                });
-        lblIntroduction = insertLabel("lblIntroduction",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    39, resources.reslblIntroduction_value, Boolean.TRUE, 104, 145, INTEGERS[1], new Short((short) 55), 199
-                });
-        ImageControl3 = insertInfoImage(92, 145, 1);
-//  ImageControl3 = insertImage("ImageControl3", 
-//      new String[] {PropertyNames.PROPERTY_BORDER, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_IMAGEURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "ScaleImage", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH},
-//      new Object[] { new Short((short)0),INTEGERS[10],"private:resource/dbu/image/19205",92,145,Boolean.FALSE,INTEGERS[1],new Short((short)56),INTEGERS[10]}
-//    );
-    }
-
-    public void buildStep2()
-    {
-        chkUseLogo = insertCheckBox("chkUseLogo", CHKUSELOGO_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSELOGO_HID, resources.reschkUseLogo_value, 97, 28, new Short((short) 0), INTEGERS[2], new Short((short) 5), 212
-                });
-        chkUseDate = insertCheckBox("chkUseDate", CHKUSEDATE_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSEDATE_HID, resources.reschkUseDate_value, 97, 43, new Short((short) 0), INTEGERS[2], new Short((short) 6), 212
-                });
-        chkUseCommunicationType = insertCheckBox("chkUseCommunicationType", CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSECOMMUNICATIONTYPE_HID, resources.reschkUseCommunicationType_value, 97, 57, new Short((short) 0), INTEGERS[2], new Short((short) 7), 100
-                });
-        lstCommunicationType = insertComboBox("lstCommunicationType", LSTCOMMUNICATIONTYPE_ACTION_PERFORMED, LSTCOMMUNICATIONTYPE_ITEM_CHANGED, LSTCOMMUNICATIONTYPE_TEXT_CHANGED,
-                new String[]
-                {
-                    "Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, INTEGER_12, LSTCOMMUNICATIONTYPE_HID, 105, 68, INTEGERS[2], new Short((short) 8), 174
-                });
-        chkUseSubject = insertCheckBox("chkUseSubject", CHKUSESUBJECT_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSESUBJECT_HID, resources.reschkUseSubject_value, 97, 87, new Short((short) 0), INTEGERS[2], new Short((short) 9), 212
-                });
-        chkUseSalutation = insertCheckBox("chkUseSalutation", CHKUSESALUTATION_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSESALUTATION_HID, resources.reschkUseSalutation_value, 97, 102, new Short((short) 0), INTEGERS[2], new Short((short) 10), 100
-                });
-        lstSalutation = insertComboBox("lstSalutation", LSTSALUTATION_ACTION_PERFORMED, LSTSALUTATION_ITEM_CHANGED, LSTSALUTATION_TEXT_CHANGED,
-                new String[]
-                {
-                    "Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, INTEGER_12, LSTSALUTATION_HID, 105, 113, INTEGERS[2], new Short((short) 11), 174
-                });
-        chkUseGreeting = insertCheckBox("chkUseGreeting", CHKUSEGREETING_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSEGREETING_HID, resources.reschkUseGreeting_value, 97, 132, new Short((short) 0), INTEGERS[2], new Short((short) 12), 100
-                });
-        lstGreeting = insertComboBox("lstGreeting", LSTGREETING_ACTION_PERFORMED, LSTGREETING_ITEM_CHANGED, LSTGREETING_TEXT_CHANGED,
-                new String[]
-                {
-                    "Dropdown", PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    Boolean.TRUE, INTEGER_12, LSTGREETING_HID, 105, 143, INTEGERS[2], new Short((short) 13), 174
-                });
-        chkUseFooter = insertCheckBox("chkUseFooter", CHKUSEFOOTER_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKUSEFOOTER_HID, resources.reschkUseFooter_value, 97, 163, new Short((short) 0), INTEGERS[2], new Short((short) 14), 212
-                });
-        lblTitle3 = insertLabel("lblTitle3",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor5, INTEGER_16, resources.reslblTitle3_value, Boolean.TRUE, 91, INTEGERS[8], INTEGERS[2], new Short((short) 59), 212
-                });
-    }
-
-    public void buildStep3()
-    {
-        optSenderPlaceholder = insertRadioButton("optSenderPlaceholder", OPTSENDERPLACEHOLDER_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTSENDERPLACEHOLDER_HID, resources.resoptSenderPlaceholder_value, 104, 42, INTEGERS[3], new Short((short) 15), 149
-                });
-        optSenderDefine = insertRadioButton("optSenderDefine", OPTSENDERDEFINE_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTSENDERDEFINE_HID, resources.resoptSenderDefine_value, 104, 54, INTEGERS[3], new Short((short) 16), 149
-                });
-        txtSenderName = insertTextField("txtSenderName", TXTSENDERNAME_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERNAME_HID, 182, 67, INTEGERS[3], new Short((short) 17), 119
-                });
-        txtSenderStreet = insertTextField("txtSenderStreet", TXTSENDERSTREET_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERSTREET_HID, 182, 81, INTEGERS[3], new Short((short) 18), 119
-                });
-        txtSenderPostCode = insertTextField("txtSenderPostCode", TXTSENDERPOSTCODE_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERPOSTCODE_HID, 182, 95, INTEGERS[3], new Short((short) 19), 25
-                });
-        txtSenderState = insertTextField("txtSenderState", TXTSENDERSTATE_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERSTATE_HID, 211, 95, INTEGERS[3], new Short((short) 20), 21
-                });
-        txtSenderCity = insertTextField("txtSenderCity", TXTSENDERCITY_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERCITY_HID, 236, 95, INTEGERS[3], new Short((short) 21), 65
-                });
-        txtSenderFax = insertTextField("txtSenderFax", TXTSENDERFAX_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTSENDERFAX_HID, 182, 109, INTEGERS[3], new Short((short) 22), 119
-                });
-        optReceiverPlaceholder = insertRadioButton("optReceiverPlaceholder", OPTRECEIVERPLACEHOLDER_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTRECEIVERPLACEHOLDER_HID, resources.resoptReceiverPlaceholder_value, 104, 148, INTEGERS[3], new Short((short) 23), 200
-                });
-        optReceiverDatabase = insertRadioButton("optReceiverDatabase", OPTRECEIVERDATABASE_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTRECEIVERDATABASE_HID, resources.resoptReceiverDatabase_value, 104, 160, INTEGERS[3], new Short((short) 24), 200
-                });
-        lblSenderAddress = insertLabel("lblSenderAddress",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblSenderAddress_value, 97, 28, INTEGERS[3], new Short((short) 46), 136
-                });
-        FixedLine2 = insertFixedLine("FixedLine2",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[5], 90, 126, INTEGERS[3], new Short((short) 51), 212
-                });
-        lblSenderName = insertLabel("lblSenderName",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblSenderName_value, 113, 69, INTEGERS[3], new Short((short) 52), 68
-                });
-        lblSenderStreet = insertLabel("lblSenderStreet",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblSenderStreet_value, 113, 82, INTEGERS[3], new Short((short) 53), 68
-                });
-        lblPostCodeCity = insertLabel("lblPostCodeCity",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblPostCodeCity_value, 113, 97, INTEGERS[3], new Short((short) 54), 68
-                });
-        lblTitle4 = insertLabel("lblTitle4",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor5, INTEGER_16, resources.reslblTitle4_value, Boolean.TRUE, 91, INTEGERS[8], INTEGERS[3], new Short((short) 60), 212
-                });
-        Label1 = insertLabel("lblSenderFax",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.resLabel1_value, 113, 111, INTEGERS[3], new Short((short) 68), 68
-                });
-        Label2 = insertLabel("Label2",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.resLabel2_value, 97, 137, INTEGERS[3], new Short((short) 69), 136
-                });
-    }
-
-    public void buildStep4()
-    {
-        txtFooter = insertTextField("txtFooter", TXTFOOTER_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    47, TXTFOOTER_HID, Boolean.TRUE, 97, INTEGER_40, INTEGERS[4], new Short((short) 25), 203
-                });
-        chkFooterNextPages = insertCheckBox("chkFooterNextPages", CHKFOOTERNEXTPAGES_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKFOOTERNEXTPAGES_HID, resources.reschkFooterNextPages_value, 97, 92, new Short((short) 0), INTEGERS[4], new Short((short) 26), 202
-                });
-        chkFooterPageNumbers = insertCheckBox("chkFooterPageNumbers", CHKFOOTERPAGENUMBERS_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], CHKFOOTERPAGENUMBERS_HID, resources.reschkFooterPageNumbers_value, 97, 106, new Short((short) 0), INTEGERS[4], new Short((short) 27), 201
-                });
-        lblFooter = insertLabel("lblFooter",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor4, INTEGERS[8], resources.reslblFooter_value, 97, 28, INTEGERS[4], new Short((short) 33), 116
-                });
-        lblTitle5 = insertLabel("lblTitle5",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor5, INTEGER_16, resources.reslblTitle5_value, Boolean.TRUE, 91, INTEGERS[8], INTEGERS[4], new Short((short) 61), 212
-                });
-    }
-
-    public void buildStep5()
-    {
-        txtTemplateName = insertTextField("txtTemplateName", TXTTEMPLATENAME_TEXT_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Text", PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGER_12, TXTTEMPLATENAME_HID, 202, 56, INTEGERS[5], new Short((short) 28), resources.restxtTemplateName_value, 100
-                });
-        /*
-        fileTemplatePath = insertFileControl("fileTemplatePath", FILETEMPLATEPATH_TEXT_CHANGED,
-        new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH},
-        new Object[] { INTEGER_12,FILETEMPLATEPATH_HID,172,74,INTEGERS[5],new Short((short)29),130}
-        );
-         */
-        optCreateFax = insertRadioButton("optCreateFax", OPTCREATEFAX_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTCREATEFAX_HID, resources.resoptCreateFax_value, 104, 111, INTEGERS[5], new Short((short) 30), 198
-                });
-        optMakeChanges = insertRadioButton("optMakeChanges", OPTMAKECHANGES_ITEM_CHANGED,
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], OPTMAKECHANGES_HID, resources.resoptMakeChanges_value, 104, 123, INTEGERS[5], new Short((short) 31), 198
-                });
-        lblFinalExplanation1 = insertLabel("lblFinalExplanation1",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    28, resources.reslblFinalExplanation1_value, Boolean.TRUE, 97, 28, INTEGERS[5], new Short((short) 34), 205
-                });
-        lblProceed = insertLabel("lblProceed",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblProceed_value, 97, 100, INTEGERS[5], new Short((short) 35), 204
-                });
-        lblFinalExplanation2 = insertLabel("lblFinalExplanation2",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    33, resources.reslblFinalExplanation2_value, Boolean.TRUE, 104, 145, INTEGERS[5], new Short((short) 36), 199
-                });
-        ImageControl2 = insertImage("ImageControl2",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_BORDER, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_IMAGEURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, "ScaleImage", PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    new Short((short) 0), INTEGERS[10], "private:resource/dbu/image/19205", 92, 145, Boolean.FALSE, INTEGERS[5], new Short((short) 47), INTEGERS[10]
-                });
-        lblTemplateName = insertLabel("lblTemplateName",
-                new String[]
-                {
-                    PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    INTEGERS[8], resources.reslblTemplateName_value, 97, 58, INTEGERS[5], new Short((short) 57), 101
-                });
-        /*
-        lblTemplatePath = insertLabel("lblTemplatePath", 
-        new String[] {PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH},
-        new Object[] { INTEGERS[8],resources.reslblTemplatePath_value,97,77,INTEGERS[5],new Short((short)58),71}
-        );
-         */
-        lblTitle6 = insertLabel("lblTitle6",
-                new String[]
-                {
-                    PropertyNames.FONT_DESCRIPTOR, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
-                },
-                new Object[]
-                {
-                    fontDescriptor5, INTEGER_16, resources.reslblTitle6_value, Boolean.TRUE, 91, INTEGERS[8], INTEGERS[5], new Short((short) 62), 212
-                });
-
-    }
-}
\ No newline at end of file
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
deleted file mode 100644
index 65e52e9..0000000
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java
+++ /dev/null
@@ -1,106 +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 .
- */
-package com.sun.star.wizards.fax;
-import com.sun.star.wizards.common.*;
-
-public interface FaxWizardDialogConst
-{
-
-    public static final String OPTBUSINESSFAX_ITEM_CHANGED = "optBusinessFaxItemChanged";
-    public static final String LSTBUSINESSSTYLE_ACTION_PERFORMED = null; // "lstBusinessStyleActionPerformed";
-    public static final String LSTBUSINESSSTYLE_ITEM_CHANGED = "lstBusinessStyleItemChanged";
-    public static final String OPTPRIVATEFAX_ITEM_CHANGED = "optPrivateFaxItemChanged";
-    public static final String LSTPRIVATESTYLE_ACTION_PERFORMED = null; // "lstPrivateStyleActionPerformed";
-    public static final String LSTPRIVATESTYLE_ITEM_CHANGED = "lstPrivateStyleItemChanged";
-    public static final String CHKUSELOGO_ITEM_CHANGED = "chkUseLogoItemChanged";
-    public static final String CHKUSEDATE_ITEM_CHANGED = "chkUseDateItemChanged";
-    public static final String CHKUSECOMMUNICATIONTYPE_ITEM_CHANGED = "chkUseCommunicationItemChanged";
-    public static final String LSTCOMMUNICATIONTYPE_ACTION_PERFORMED = null; // "lstCommunicationActionPerformed";
-    public static final String LSTCOMMUNICATIONTYPE_ITEM_CHANGED = "lstCommunicationItemChanged";
-    public static final String LSTCOMMUNICATIONTYPE_TEXT_CHANGED = "lstCommunicationTextChanged";
-    public static final String CHKUSESUBJECT_ITEM_CHANGED = "chkUseSubjectItemChanged";
-    public static final String CHKUSESALUTATION_ITEM_CHANGED = "chkUseSalutationItemChanged";
-    public static final String LSTSALUTATION_ACTION_PERFORMED = null; // "lstSalutationActionPerformed";
-    public static final String LSTSALUTATION_ITEM_CHANGED = "lstSalutationItemChanged";
-    public static final String LSTSALUTATION_TEXT_CHANGED = "lstSalutationTextChanged";
-    public static final String CHKUSEGREETING_ITEM_CHANGED = "chkUseGreetingItemChanged";
-    public static final String LSTGREETING_ACTION_PERFORMED = null; // "lstGreetingActionPerformed";
-    public static final String LSTGREETING_ITEM_CHANGED = "lstGreetingItemChanged";
-    public static final String LSTGREETING_TEXT_CHANGED = "lstGreetingTextChanged";
-    public static final String CHKUSEFOOTER_ITEM_CHANGED = "chkUseFooterItemChanged";
-    public static final String OPTSENDERPLACEHOLDER_ITEM_CHANGED = "optSenderPlaceholderItemChanged";
-    public static final String OPTSENDERDEFINE_ITEM_CHANGED = "optSenderDefineItemChanged";
-    public static final String TXTSENDERNAME_TEXT_CHANGED = "txtSenderNameTextChanged";
-    public static final String TXTSENDERSTREET_TEXT_CHANGED = "txtSenderStreetTextChanged";
-    public static final String TXTSENDERPOSTCODE_TEXT_CHANGED = "txtSenderPostCodeTextChanged";
-    public static final String TXTSENDERSTATE_TEXT_CHANGED = "txtSenderStateTextChanged";
-    public static final String TXTSENDERCITY_TEXT_CHANGED = "txtSenderCityTextChanged";
-    public static final String TXTSENDERFAX_TEXT_CHANGED = "txtSenderFaxTextChanged";
-    public static final String OPTRECEIVERPLACEHOLDER_ITEM_CHANGED = "optReceiverPlaceholderItemChanged";
-    public static final String OPTRECEIVERDATABASE_ITEM_CHANGED = "optReceiverDatabaseItemChanged";
-    public static final String TXTFOOTER_TEXT_CHANGED = "txtFooterTextChanged";
-    public static final String CHKFOOTERNEXTPAGES_ITEM_CHANGED = "chkFooterNextPagesItemChanged";
-    public static final String CHKFOOTERPAGENUMBERS_ITEM_CHANGED = "chkFooterPageNumbersItemChanged";
-    public static final String TXTTEMPLATENAME_TEXT_CHANGED = "txtTemplateNameTextChanged";
-    public static final String FILETEMPLATEPATH_TEXT_CHANGED = null; // "fileTemplatePathTextChanged";
-    public static final String OPTCREATEFAX_ITEM_CHANGED = "optCreateFaxItemChanged";
-    public static final String OPTMAKECHANGES_ITEM_CHANGED = "optMakeChangesItemChanged";
-    public static final String imageURLImageControl2 = null; //"images/ImageControl2";
-    public static final String imageURLImageControl3 = null; //"images/ImageControl3";
-
-    /* ====================================
-     *                 Help IDs
-     * ====================================
-     */
-    public final static int HID = 41119; //TODO enter first hid here 
-    public static final int HIDMAIN = 41180;
-    public final String OPTBUSINESSFAX_HID = HelpIds.getHelpIdString(HID + 1);
-    public final String LSTBUSINESSSTYLE_HID = HelpIds.getHelpIdString(HID + 2);
-    public final String OPTPRIVATEFAX_HID = HelpIds.getHelpIdString(HID + 3);
-    public final String LSTPRIVATESTYLE_HID = HelpIds.getHelpIdString(HID + 4);
-    public final String IMAGECONTROL3_HID = HelpIds.getHelpIdString(HID + 5);
-    public final String CHKUSELOGO_HID = HelpIds.getHelpIdString(HID + 6);
-    public final String CHKUSEDATE_HID = HelpIds.getHelpIdString(HID + 7);
-    public final String CHKUSECOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 8);
-    public final String LSTCOMMUNICATIONTYPE_HID = HelpIds.getHelpIdString(HID + 9);
-    public final String CHKUSESUBJECT_HID = HelpIds.getHelpIdString(HID + 10);
-    public final String CHKUSESALUTATION_HID = HelpIds.getHelpIdString(HID + 11);
-    public final String LSTSALUTATION_HID = HelpIds.getHelpIdString(HID + 12);
-    public final String CHKUSEGREETING_HID = HelpIds.getHelpIdString(HID + 13);
-    public final String LSTGREETING_HID = HelpIds.getHelpIdString(HID + 14);
-    public final String CHKUSEFOOTER_HID = HelpIds.getHelpIdString(HID + 15);
-    public final String OPTSENDERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 16);
-    public final String OPTSENDERDEFINE_HID = HelpIds.getHelpIdString(HID + 17);
-    public final String TXTSENDERNAME_HID = HelpIds.getHelpIdString(HID + 18);
-    public final String TXTSENDERSTREET_HID = HelpIds.getHelpIdString(HID + 19);
-    public final String TXTSENDERPOSTCODE_HID = HelpIds.getHelpIdString(HID + 20);
-    public final String TXTSENDERSTATE_HID = HelpIds.getHelpIdString(HID + 21);
-    public final String TXTSENDERCITY_HID = HelpIds.getHelpIdString(HID + 22);
-    public final String TXTSENDERFAX_HID = HelpIds.getHelpIdString(HID + 23);
-    public final String OPTRECEIVERPLACEHOLDER_HID = HelpIds.getHelpIdString(HID + 24);
-    public final String OPTRECEIVERDATABASE_HID = HelpIds.getHelpIdString(HID + 25);
-    public final String TXTFOOTER_HID = HelpIds.getHelpIdString(HID + 26);
-    public final String CHKFOOTERNEXTPAGES_HID = HelpIds.getHelpIdString(HID + 27);
-    public final String CHKFOOTERPAGENUMBERS_HID = HelpIds.getHelpIdString(HID + 28);
-    public final String TXTTEMPLATENAME_HID = HelpIds.getHelpIdString(HID + 29);
-    public final String FILETEMPLATEPATH_HID = HelpIds.getHelpIdString(HID + 30);
-    public final String OPTCREATEFAX_HID = HelpIds.getHelpIdString(HID + 31);
-    public final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString(HID + 32);
-    public final String IMAGECONTROL2_HID = HelpIds.getHelpIdString(HID + 33);
-}
-  
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
deleted file mode 100644
index 6f4792f..0000000
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ /dev/null
@@ -1,1073 +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 .
- */
-package com.sun.star.wizards.fax;
-
-import java.util.ArrayList;
-
-import com.sun.star.awt.VclWindowPeerAttribute;
-import com.sun.star.awt.XTextComponent;
-import com.sun.star.awt.XWindow;
-import com.sun.star.awt.XWindowPeer;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.document.MacroExecMode;
-import com.sun.star.document.XDocumentProperties;
-import com.sun.star.document.XDocumentPropertiesSupplier;
-import com.sun.star.graphic.XGraphic;
-import com.sun.star.graphic.XGraphicProvider;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.task.XInteractionHandler;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.RuntimeException;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-import com.sun.star.util.CloseVetoException;
-import com.sun.star.util.XCloseable;
-import com.sun.star.wizards.common.Configuration;
-import com.sun.star.wizards.common.Desktop;
-import com.sun.star.wizards.common.FileAccess;
-import com.sun.star.wizards.common.HelpIds;
-import com.sun.star.wizards.common.Helper;
-import com.sun.star.wizards.common.NoValidPathException;
-import com.sun.star.wizards.common.PropertyNames;
-import com.sun.star.wizards.common.SystemDialog;
-import com.sun.star.wizards.document.OfficeDocument;
-import com.sun.star.wizards.text.TextFieldHandler;
-import com.sun.star.wizards.text.ViewHandler;
-import com.sun.star.wizards.ui.PathSelection;
-import com.sun.star.wizards.ui.XPathSelectionListener;
-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.util.XSearchable;
-import com.sun.star.util.XSearchDescriptor;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.text.*;
-import com.sun.star.wizards.common.TextElement;
-import com.sun.star.wizards.common.PlaceholderTextElement;
-
-import java.util.List;
-import com.sun.star.beans.XPropertySet;
-
-public class FaxWizardDialogImpl extends FaxWizardDialog
-{
-
-    protected void enterStep(int OldStep, int NewStep)
-    {
-    }
-
-    protected void leaveStep(int OldStep, int NewStep)
-    {
-    }
-    static FaxDocument myFaxDoc;
-    static boolean running;
-    XTextDocument xTextDocument;
-    PathSelection myPathSelection;
-    CGFaxWizard myConfig;
-    ArrayList<DataAware> mainDA = new ArrayList<DataAware>();
-    ArrayList<DataAware> faxDA = new ArrayList<DataAware>();
-    String[][] BusinessFiles;
-    String[][] PrivateFiles;
-    String sTemplatePath;
-    String sUserTemplatePath;
-    String sBitmapPath;
-    String sFaxPath;
-    String sWorkPath;
-    String sPath;
-    boolean bEditTemplate;
-    boolean bSaveSuccess = false;
-    private boolean filenameChanged = false;
-    final static int RM_TYPESTYLE = 1;
-    final static int RM_ELEMENTS = 2;
-    final static int RM_SENDERRECEIVER = 3;
-    final static int RM_FOOTER = 4;
-    final static int RM_FINALSETTINGS = 5;
-
-    List<XTextRange> constRangeList = new ArrayList<XTextRange>();
-    XTextRange trTo, trFrom, trFaxconst, trTelconst, trEmailconst, trConsist1, trConsist2, trConsist3;
-    TextElement teTo, teFrom, teFaxconst, teTelconst, teEmailconst, teConsist1, teConsist2, teConsist3;
-
-    public FaxWizardDialogImpl(XMultiServiceFactory xmsf)
-    {
-        super(xmsf);
-    }
-
-    public static void main(String args[])
-    {
-        //only being called when starting wizard remotely
-
-        try
-        {
-            String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager";
-            XMultiServiceFactory xLocMSF = Desktop.connect(ConnectStr);
-            FaxWizardDialogImpl lw = new FaxWizardDialogImpl(xLocMSF);
-            lw.startWizard(xLocMSF, null);
-        }
-        catch (RuntimeException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        catch (Exception e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        catch (java.lang.Exception e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
-    }
-
-    public void startWizard(XMultiServiceFactory xMSF, Object[] CurPropertyValue)
-    {
-
-        running = true;
-        try
-        {
-            //Number of steps on WizardDialog:
-            setMaxStep(5);
-
-            //instatiate The Document Frame for the Preview
-            myFaxDoc = new FaxDocument(xMSF, this);
-
-            //create the dialog:
-            drawNaviBar();
-            buildStep1();
-            buildStep2();
-            buildStep3();
-            buildStep4();
-            buildStep5();
-
-            initializeSalutation();
-            initializeGreeting();
-            initializeCommunication();
-            initializePaths();
-
-            //special Control for setting the save Path:
-            insertPathSelectionControl();
-
-            //load the last used settings from the registry and apply listeners to the controls:
-            initConfiguration();
-
-            initializeTemplates(xMSF);
-
-
-            //update the dialog UI according to the loaded Configuration
-            updateUI();
-
-            if (myPathSelection.xSaveTextBox.getText().equalsIgnoreCase(PropertyNames.EMPTY_STRING))
-            {
-                myPathSelection.initializePath();
-            }
-
-            XWindow xContainerWindow = myFaxDoc.xFrame.getContainerWindow();
-            XWindowPeer xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xContainerWindow);
-            createWindowPeer(xWindowPeer);
-
-            //add the Roadmap to the dialog:
-            insertRoadmap();
-
-            //load the last used document and apply last used settings:
-            //TODO:
-            setConfiguration();
-
-            //If the configuration does not define Greeting/Salutation/CommunicationType yet choose a default
-            setDefaultForGreetingAndSalutationAndCommunication();
-
-            //disable funtionality that is not supported by the template:
-            initializeElements();
-
-            //disable the document, so that the user cannot change anything:
-            myFaxDoc.xFrame.getComponentWindow().setEnable(false);
-
-            executeDialog(myFaxDoc.xFrame);
-            removeTerminateListener();
-            closeDocument();
-            running = false;
-
-        }
-        catch (Exception exception)
-        {
-            removeTerminateListener();
-            exception.printStackTrace(System.err);
-            running = false;
-            }
-    }
-
-    public void cancelWizard()
-    {
-        xDialog.endExecute();
-        running = false;
-    }
-
-    public boolean finishWizard()
-    {
-        switchToStep(getCurrentStep(), getMaxStep());
-        myFaxDoc.setWizardTemplateDocInfo(resources.resFaxWizardDialog_title, resources.resTemplateDescription);
-        try
-        {
-            //myFaxDoc.xTextDocument.lockControllers();
-            FileAccess fileAccess = new FileAccess(xMSF);
-            sPath = myPathSelection.getSelectedPath();
-            if (sPath.equals(PropertyNames.EMPTY_STRING))
-            {
-                myPathSelection.triggerPathPicker();
-                sPath = myPathSelection.getSelectedPath();
-            }
-            sPath = fileAccess.getURL(sPath);
-
-            //first, if the filename was not changed, thus
-            //it is coming from a saved session, check if the
-            // file exists and warn the user.
-            if (!filenameChanged)
-            {
-                if (fileAccess.exists(sPath, true))
-                {
-
-                    int answer = SystemDialog.showMessageBox(xMSF, xControl.getPeer(), "MessBox", VclWindowPeerAttribute.YES_NO + VclWindowPeerAttribute.DEF_NO, resources.resOverwriteWarning);
-                    if (answer == 3) // user said: no, do not overwrite....
-                    {
-                        return false;
-                    }
-                }
-            }
-            myFaxDoc.setWizardTemplateDocInfo(resources.resFaxWizardDialog_title, resources.resTemplateDescription);
-            myFaxDoc.killEmptyUserFields();
-            myFaxDoc.keepLogoFrame = (chkUseLogo.getState() != 0);
-            myFaxDoc.keepTypeFrame = (chkUseCommunicationType.getState() != 0);
-            myFaxDoc.killEmptyFrames();
-
-
-            bSaveSuccess = OfficeDocument.store(xMSF, xTextDocument, sPath, "writer8_template", false);
-            if (bSaveSuccess)
-            {
-                saveConfiguration();
-                XInteractionHandler xIH = UnoRuntime.queryInterface(XInteractionHandler.class, xMSF.createInstance("com.sun.star.comp.uui.UUIInteractionHandler"));
-                PropertyValue loadValues[] = new PropertyValue[4];
-                loadValues[0] = new PropertyValue();
-                loadValues[0].Name = "AsTemplate";
-                loadValues[1] = new PropertyValue();
-                loadValues[1].Name = "MacroExecutionMode";
-                loadValues[1].Value = new Short(MacroExecMode.ALWAYS_EXECUTE);
-                loadValues[2] = new PropertyValue();
-                loadValues[2].Name = "UpdateDocMode";
-                loadValues[2].Value = new Short(com.sun.star.document.UpdateDocMode.FULL_UPDATE);
-                loadValues[3] = new PropertyValue();
-                loadValues[3].Name = "InteractionHandler";
-                loadValues[3].Value = xIH;
-
-
-                if (bEditTemplate)
-                {
-                    loadValues[0].Value = Boolean.FALSE;
-                }
-                else
-                {
-                    loadValues[0].Value = Boolean.TRUE;
-                }
-                Object oDoc = OfficeDocument.load(Desktop.getDesktop(xMSF), sPath, "_default", loadValues);
-                XTextDocument xTextDocument = (com.sun.star.text.XTextDocument) oDoc;
-                XMultiServiceFactory xDocMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
-                ViewHandler myViewHandler = new ViewHandler(xDocMSF, xTextDocument);
-                myViewHandler.setViewSetting("ZoomType", new Short(com.sun.star.view.DocumentZoomType.OPTIMAL));
-            }
-            else
-            {
-                //TODO: Error Handling
-            }
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        finally
-        {
-            xDialog.endExecute();
-            running = false;
-        }
-        return true;
-    }
-
-    public void closeDocument()
-    {
-        try
-        {
-            //xComponent.dispose();
-            XCloseable xCloseable = UnoRuntime.queryInterface(XCloseable.class, myFaxDoc.xFrame);
-            xCloseable.close(false);
-        }
-        catch (CloseVetoException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public void drawConstants()
-    {
-            constRangeList = searchFillInItems(1);
-
-            XTextRange item = null;
-
-            for (int i = 0; i < constRangeList.size(); i++)
-            {
-                item = constRangeList.get(i);
-                String text = item.getString().trim().toLowerCase();
-                if (text.equals(resources.resToPlaceHolder))
-                {
-                    teTo = new PlaceholderTextElement(item, resources.resToPlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trTo = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teTo,trTo,resources.resToPlaceHolder_value);
-                }
-                else if (text.equals(resources.resFromPlaceHolder))
-                {
-                    teFrom = new PlaceholderTextElement(item, resources.resFromPlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trFrom = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teFrom,trFrom,resources.resFromPlaceHolder_value);
-                }
-                else if (text.equals(resources.resFaxconstPlaceHolder))
-                {
-                    teFaxconst = new PlaceholderTextElement(item, resources.resFaxconstPlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trFaxconst = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teFaxconst,trFaxconst,resources.resFaxconstPlaceHolder_value);
-                }
-                else if (text.equals(resources.resTelconstPlaceHolder))
-                {
-                    teTelconst = new PlaceholderTextElement(item, resources.resTelconstPlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trTelconst = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teTelconst,trTelconst,resources.resTelconstPlaceHolder_value);
-                }
-                else if (text.equals(resources.resEmailconstPlaceHolder))
-                {
-                    teEmailconst = new PlaceholderTextElement(item, resources.resEmailconstPlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trEmailconst = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teEmailconst,trEmailconst,resources.resEmailconstPlaceHolder_value);
-                }
-                else if (text.equals(resources.resConsist1PlaceHolder))
-                {
-                    teConsist1 = new PlaceholderTextElement(item, resources.resConsist1PlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trConsist1 = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teConsist1,trConsist1,resources.resConsist1PlaceHolder_value);
-                }
-                else if (text.equals(resources.resConsist2PlaceHolder))
-                {
-                    teConsist2 = new PlaceholderTextElement(item, resources.resConsist2PlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trConsist2 = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teConsist2,trConsist2,resources.resConsist2PlaceHolder_value);
-                }
-                else if (text.equals(resources.resConsist3PlaceHolder))
-                {
-                    teConsist3 = new PlaceholderTextElement(item, resources.resConsist3PlaceHolder_value, "hint", myFaxDoc.xMSF);
-                    trConsist3 = item;
-                    constRangeList.remove(i--);
-                    writeTitle(teConsist3,trConsist3,resources.resConsist3PlaceHolder_value);
-                }
-
-            }
-    }
-
-    public void clearConstants()
-    {
-        constRangeList.clear();
-        trTo = null;
-        trFrom = null;
-        trFaxconst = null;
-        trTelconst = null;
-        trEmailconst = null;
-        trConsist1 = null;
-        trConsist2 = null;
-        trConsist3 = null;
-        teTo = null;
-        teFrom = null;
-        teFaxconst = null;
-        teTelconst = null;
-        teEmailconst = null;
-        teConsist1 = null;
-        teConsist2 = null;
-        teConsist3 = null;
-    }
-
-    private void writeTitle(TextElement te, XTextRange tr, String text)
-    {
-        te.setText(text == null ? PropertyNames.EMPTY_STRING : text);
-        te.write(tr);
-    }
-
-    public List<XTextRange> searchFillInItems(int type)
-    {
-      try
-      {
-            XSearchable xSearchable = UnoRuntime.queryInterface(XSearchable.class, xTextDocument);
-            XSearchDescriptor sd = xSearchable.createSearchDescriptor();
-
-            if(type == 0)
-            {
-              sd.setSearchString("<[^>]+>");
-            }
-            else if(type == 1)
-            {
-              sd.setSearchString("#[^#]+#");
-            }
-            sd.setPropertyValue("SearchRegularExpression", Boolean.TRUE);
-            sd.setPropertyValue("SearchWords", Boolean.TRUE);
-
-            XIndexAccess ia = xSearchable.findAll(sd);
-
-            List<XTextRange> l = new ArrayList<XTextRange>(ia.getCount());
-            for (int i = 0; i < ia.getCount(); i++)
-            {
-                try
-                {
-                    l.add(UnoRuntime.queryInterface(XTextRange.class, ia.getByIndex(i)));
-                }

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list