CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 192 insertions, 136 deletions

diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 484f0530fb04..27e88e287585 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -38,13 +38,13 @@ import com.sun.star.wizards.ui.*;
 
 public class ReportLayouter
 {
+
     UnoDialog CurUnoDialog;
 //    static String sOrientationHeader;
 //    static String sOrientVertical;
 //    static String sOrientHorizontal;
     final int SOTXTTITLE = 28;
     final int SOCONTENTLST = 29;
-
     final static public int SOOPTLANDSCAPE = 30;
     final static public int SOOPTPORTRAIT = 31;
     final int SOLAYOUTLST = 32;
@@ -61,144 +61,200 @@ public class ReportLayouter
     public String[][] LayoutFiles;
     public String[][] ContentFiles;
     // private Desktop.OfficePathRetriever curofficepath;
-    Object aOrientationImage;
-    // boolean m_bLandscape = true;
-
+    Object aOrientationImage;    // boolean m_bLandscape = true;
     private XMultiServiceFactory m_xMSF;
 
     public ReportLayouter(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, UnoDialog _CurUnoDialog)
+    {
+        m_xMSF = _xMSF;
+        try
         {
-            m_xMSF = _xMSF;
-            try
-            {
-                short curtabindex = (short) (100 * ReportWizard.SOTEMPLATEPAGE);
-                this.CurUnoDialog = _CurUnoDialog;
-                this.CurReportDocument = _CurReportDocument;
-                //TODO the constructor for the OfficePathRetriever is redundant and should be instantiated elsewhere
-                // Desktop odesktop = new Desktop();
-                // curofficepath = odesktop.new OfficePathRetriever(m_xMSF);
-  String              slblDataStructure = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 15);
-String                slblPageLayout = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 16);
+            short curtabindex = (short) (100 * ReportWizard.SOTEMPLATEPAGE);
+            this.CurUnoDialog = _CurUnoDialog;
+            this.CurReportDocument = _CurReportDocument;
+            //TODO the constructor for the OfficePathRetriever is redundant and should be instantiated elsewhere
+            // Desktop odesktop = new Desktop();
+            // curofficepath = odesktop.new OfficePathRetriever(m_xMSF);
+            String slblDataStructure = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 15);
+            String slblPageLayout = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 16);
 // String                sOrganizeFields = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 19);
 
-String                sOrientationHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 22);
-String                sOrientVertical = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 23);
-String                sOrientHorizontal = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 24);
+            String sOrientationHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 22);
+            String sOrientVertical = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 23);
+            String sOrientHorizontal = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 24);
 
-                // XInterface xUcbInterface = (XInterface) m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
-                // XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface);
-                // boolean bcntexists = xSimpleFileAccess.exists(CurReportDocument.getReportPath() + "/cnt-default.ott");
-                // boolean bstlexists = xSimpleFileAccess.exists(CurReportDocument.getReportPath() + "/stl-default.ott");
-                //      if ((bcntexists == false) || (bstlexists == false))
-                //          throw  new NoValidPathException(CurReportDocument.xMSF);
+            // XInterface xUcbInterface = (XInterface) m_xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
+            // XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface);
+            // boolean bcntexists = xSimpleFileAccess.exists(CurReportDocument.getReportPath() + "/cnt-default.ott");
+            // boolean bstlexists = xSimpleFileAccess.exists(CurReportDocument.getReportPath() + "/stl-default.ott");
+            //      if ((bcntexists == false) || (bstlexists == false))
+            //          throw  new NoValidPathException(CurReportDocument.xMSF);
 
 
-                CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblContent",
-                                                new String[] { "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width" },
-                                                new Object[] { new Integer(8), slblDataStructure, new Integer(95), new Integer(27), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(99)});
+            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblContent",
+                    new String[]
+                    {
+                        "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(8), slblDataStructure, new Integer(95), new Integer(27), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(99)
+                    });
 
-                short iSelPos = 0;
+            short iSelPos = 0;
 //                    ContentFiles = FileAccess.getFolderTitles(m_xMSF, "cnt", CurReportDocument.getReportPath());
-                ContentFiles = CurReportDocument.getDataLayout();
-                iSelPos = (short) JavaTools.FieldInList(ContentFiles[1], CurReportDocument.getContentPath());
-                if (iSelPos < 0)
-                {
-                    iSelPos = 0;
-                }
-                iOldContentPos = (int) iSelPos;
-                xContentListBox = CurUnoDialog.insertListBox("lstContent", SOCONTENTLST, new ActionListenerImpl(), new ItemListenerImpl(),
-                                                             new String[] { "Height", "HelpURL", "PositionX", "PositionY", "SelectedItems", "Step", "StringItemList", "TabIndex", "Width" },
-                                                             new Object[] { new Integer(108), "HID:34363", new Integer(95), new Integer(37), new short[] { iSelPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), new Integer(99)
-                                                             });
+            ContentFiles = CurReportDocument.getDataLayout();
+            iSelPos = (short) JavaTools.FieldInList(ContentFiles[1], CurReportDocument.getContentPath());
+            if (iSelPos < 0)
+            {
+                iSelPos = 0;
+            }
+            iOldContentPos = (int) iSelPos;
+            xContentListBox = CurUnoDialog.insertListBox("lstContent", SOCONTENTLST, new ActionListenerImpl(), new ItemListenerImpl(),
+                    new String[]
+                    {
+                        "Height", "HelpURL", "PositionX", "PositionY", "SelectedItems", "Step", "StringItemList", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(108), "HID:34363", new Integer(95), new Integer(37), new short[]
+                        {
+                            iSelPos
+                        }, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), new Integer(99)
+                    });
 
-                CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblLayout",
-                                                new String[] { "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width" },
-                                                new Object[] { new Integer(8), slblPageLayout, new Integer(205), new Integer(27), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(99)});
+            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblLayout",
+                    new String[]
+                    {
+                        "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(8), slblPageLayout, new Integer(205), new Integer(27), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(99)
+                    });
 
-                short iSelLayoutPos = 0;
+            short iSelLayoutPos = 0;
 //                    LayoutFiles = FileAccess.getFolderTitles(m_xMSF, "stl", CurReportDocument.getReportPath());
-                LayoutFiles = CurReportDocument.getHeaderLayout();
-                iSelLayoutPos = (short) JavaTools.FieldInList(LayoutFiles[1], CurReportDocument.getLayoutPath());
+            LayoutFiles = CurReportDocument.getHeaderLayout();
+            iSelLayoutPos = (short) JavaTools.FieldInList(LayoutFiles[1], CurReportDocument.getLayoutPath());
+            if (iSelLayoutPos < 0)
+            {
+                iSelLayoutPos = (short) JavaTools.FieldInList(LayoutFiles[0], CurReportDocument.getLayoutPath());
                 if (iSelLayoutPos < 0)
                 {
-                    iSelLayoutPos = (short) JavaTools.FieldInList(LayoutFiles[0], CurReportDocument.getLayoutPath());
-                    if (iSelLayoutPos < 0)
-                    {
-                        iSelLayoutPos = 0;
-                    }
+                    iSelLayoutPos = 0;
                 }
-                xLayoutListBox = CurUnoDialog.insertListBox("lstLayout", SOLAYOUTLST, new ActionListenerImpl(), new ItemListenerImpl(),
-                                                            new String[] { "Height", "HelpURL", "PositionX", "PositionY", "SelectedItems", "Step", "StringItemList", "TabIndex", "Width" },
-                                                            new Object[] { new Integer(108), "HID:34364", new Integer(205), new Integer(37), new short[] { iSelLayoutPos }, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), new Integer(99)
-                                                            });
-                iOldLayoutPos = (int) iSelPos;
-                CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblOrientation",
-                                                new String[] { "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width" },
-                                                new Object[] { new Integer(8), sOrientationHeader, new Integer(95), new Integer(148), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(74)});
+            }
+            xLayoutListBox = CurUnoDialog.insertListBox("lstLayout", SOLAYOUTLST, new ActionListenerImpl(), new ItemListenerImpl(),
+                    new String[]
+                    {
+                        "Height", "HelpURL", "PositionX", "PositionY", "SelectedItems", "Step", "StringItemList", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(108), "HID:34364", new Integer(205), new Integer(37), new short[]
+                        {
+                            iSelLayoutPos
+                        }, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), new Integer(99)
+                    });
+            iOldLayoutPos = (int) iSelPos;
+            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblOrientation",
+                    new String[]
+                    {
+                        "Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(8), sOrientationHeader, new Integer(95), new Integer(148), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(74)
+                    });
 
-                short m_nLandscapeState = CurReportDocument.getDefaultPageOrientation() == SOOPTLANDSCAPE ? (short)1 : 0;
-                CurUnoDialog.insertRadioButton("optLandscape", SOOPTLANDSCAPE, new ItemListenerImpl(),
-                                               new String[] { "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width" },
-                                               new Object[] { new Integer(10), "HID:34365", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)});
+            short m_nLandscapeState = CurReportDocument.getDefaultPageOrientation() == SOOPTLANDSCAPE ? (short) 1 : 0;
+            CurUnoDialog.insertRadioButton("optLandscape", SOOPTLANDSCAPE, new ItemListenerImpl(),
+                    new String[]
+                    {
+                        "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(10), "HID:34365", sOrientHorizontal, new Integer(101), new Integer(158), new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
+                    });
 
-                short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short)1 : (short)0;
-                CurUnoDialog.insertRadioButton("optPortrait", SOOPTPORTRAIT, new ItemListenerImpl(),
-                                               new String[] { "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width" },
-                                               new Object[] { new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)});
+            short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short) 1 : (short) 0;
+            CurUnoDialog.insertRadioButton("optPortrait", SOOPTPORTRAIT, new ItemListenerImpl(),
+                    new String[]
+                    {
+                        "Height", "HelpURL", "Label", "PositionX", "PositionY", "State", "Step", "TabIndex", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)
+                    });
 
-                aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation",
-                                                                 new String[] { "Border", "Height", "PositionX", "PositionY", "ScaleImage", "Step", "Width" },
-                                                                 new Object[] { new Short("0"), new Integer(23), new Integer(164), new Integer(158), new Boolean(false), new Integer(ReportWizard.SOTEMPLATEPAGE), new Integer(30)});
+            aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation",
+                    new String[]
+                    {
+                        "Border", "Height", "PositionX", "PositionY", "ScaleImage", "Step", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Short("0"), new Integer(23), new Integer(164), new Integer(158), new Boolean(false), new Integer(ReportWizard.SOTEMPLATEPAGE), new Integer(30)
+                    });
 
-                String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.m_oResource);
-                CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_2",
-                                                new String[] { "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "Width" },
-                                                new Object[] { new Integer(34), sNote, new Boolean(true), new Integer(205), new Integer(148), new Integer(ReportWizard.SOTEMPLATEPAGE), new Integer(99)});
-                if (m_nLandscapeState == 1)
-                {
-                    CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002, 1003);
-                }
-                else
-                {
-                    CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000, 1001);
-                }
+            String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.m_oResource);
+            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_2",
+                    new String[]
+                    {
+                        "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "Width"
+                    },
+                    new Object[]
+                    {
+                        new Integer(34), sNote, new Boolean(true), new Integer(205), new Integer(148), new Integer(ReportWizard.SOTEMPLATEPAGE), new Integer(99)
+                    });
+            if (m_nLandscapeState == 1)
+            {
+                CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002, 1003);
             }
-            catch (Exception exception)
+            else
             {
-                exception.printStackTrace(System.out);
+                CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000, 1001);
             }
         }
+        catch (Exception exception)
+        {
+            exception.printStackTrace(System.out);
+        }
+    }
 
     public void initialize(String _defaultTemplatePath)
-        {
+    {
 //             CurReportDocument.getDoc().xTextDocument.lockControllers();
-            CurReportDocument.layout_setupRecordSection(_defaultTemplatePath);
-            if (CurUnoDialog.getControlProperty("txtTitle", "Text").equals(""))
-            {
-                String[] sCommandNames = CurReportDocument.getRecordParser().getIncludedCommandNames();
-                CurUnoDialog.setControlProperty("txtTitle", "Text", sCommandNames[0]);
-            }
-            // CurReportDocument.getDoc().oViewHandler.selectFirstPage(CurReportDocument.getDoc().oTextTableHandler);
-            CurReportDocument.layout_selectFirstPage();
-            CurUnoDialog.setFocus("lblContent");
-//            CurReportDocument.getDoc().unlockallControllers();
+        CurReportDocument.layout_setupRecordSection(_defaultTemplatePath);
+        if (CurUnoDialog.getControlProperty("txtTitle", "Text").equals(""))
+        {
+            String[] sCommandNames = CurReportDocument.getRecordParser().getIncludedCommandNames();
+            CurUnoDialog.setControlProperty("txtTitle", "Text", sCommandNames[0]);
         }
+        // CurReportDocument.getDoc().oViewHandler.selectFirstPage(CurReportDocument.getDoc().oTextTableHandler);
+        CurReportDocument.layout_selectFirstPage();
+        CurUnoDialog.setFocus("lblContent");
+//            CurReportDocument.getDoc().unlockallControllers();
+    }
 
     class ItemListenerImpl implements com.sun.star.awt.XItemListener
     {
 
         public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
+        {
+            try
             {
-                try
+                int iPos;
+                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
+                // LLA: should we lock controllers here?
+                //                    CurReportDocument.getDoc().xTextDocument.lockControllers();
+                int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
+                switch (iKey)
                 {
-                    int iPos;
-                    Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
-                    // LLA: should we lock controllers here?
-                    //                    CurReportDocument.getDoc().xTextDocument.lockControllers();
-                    int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
-                    switch (iKey)
-                    {
-                    case SOCONTENTLST :
+                    case SOCONTENTLST:
                         iPos = xContentListBox.getSelectedItemPos();
                         if (iPos != iOldContentPos)
                         {
@@ -207,7 +263,7 @@ String                sOrientHorizontal = CurUnoDialog.m_oResource.getResText(UI
                         }
                         break;
 
-                    case SOLAYOUTLST :
+                    case SOLAYOUTLST:
                         iPos = xLayoutListBox.getSelectedItemPos();
                         if (iPos != iOldLayoutPos)
                         {
@@ -216,72 +272,72 @@ String                sOrientHorizontal = CurUnoDialog.m_oResource.getResText(UI
                         }
                         break;
 
-                    case SOOPTLANDSCAPE :
+                    case SOOPTLANDSCAPE:
                         // CurReportDocument.getDoc().changePageOrientation(true);
                         try
                         {
                             CurReportDocument.setPageOrientation(SOOPTLANDSCAPE);
                         }
-                        catch(com.sun.star.lang.IllegalArgumentException e)
-                        {}
+                        catch (com.sun.star.lang.IllegalArgumentException e)
+                        {
+                        }
                         Helper.setUnoPropertyValue(aOrientationImage, "ImageURL", CurUnoDialog.getWizardImageUrl(1002, 1003));
 
                         break;
 
-                    case SOOPTPORTRAIT :
+                    case SOOPTPORTRAIT:
                         // CurReportDocument.getDoc().changePageOrientation( false);
                         try
                         {
                             CurReportDocument.setPageOrientation(SOOPTPORTRAIT);
                         }
-                        catch(com.sun.star.lang.IllegalArgumentException e)
-                        {}
+                        catch (com.sun.star.lang.IllegalArgumentException e)
+                        {
+                        }
 
                         CurUnoDialog.setControlProperty("imgOrientation", "ImageURL", Desktop.getBitmapPath(m_xMSF) + "/portrait.gif");
                         Helper.setUnoPropertyValue(aOrientationImage, "ImageURL", CurUnoDialog.getWizardImageUrl(1000, 1001));
                         break;
 
-                    default :
+                    default:
                         break;
-                    }
-                }
-                catch (RuntimeException e)
-                {
-                    e.printStackTrace();
                 }
-                // CurReportDocument.getDoc().unlockallControllers();
-                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
             }
-
-        public void disposing(EventObject eventObject)
+            catch (RuntimeException e)
             {
+                e.printStackTrace();
             }
+            // CurReportDocument.getDoc().unlockallControllers();
+            Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
+        }
+
+        public void disposing(EventObject eventObject)
+        {
+        }
     }
 
     class ActionListenerImpl implements com.sun.star.awt.XActionListener
     {
 
         public void disposing(EventObject eventObject)
-            {
-            }
+        {
+        }
 
         public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent)
+        {
+            try
             {
-                try
-                {
-                    Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
+                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
 //                     CurReportDocument.getDoc().xTextDocument.lockControllers();
-                    boolean blandscape = (((Short) CurUnoDialog.getControlProperty("optLandscape", "State")).shortValue() == 1);
-                    CurReportDocument.setPageOrientation((blandscape == true) ? SOOPTLANDSCAPE : SOOPTPORTRAIT );
-                }
-                catch (Exception exception)
-                {
-                    exception.printStackTrace(System.out);
-                }
-//                CurReportDocument.getDoc().unlockallControllers();
-                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
+                boolean blandscape = (((Short) CurUnoDialog.getControlProperty("optLandscape", "State")).shortValue() == 1);
+                CurReportDocument.setPageOrientation((blandscape == true) ? SOOPTLANDSCAPE : SOOPTPORTRAIT);
+            }
+            catch (Exception exception)
+            {
+                exception.printStackTrace(System.out);
             }
+//                CurReportDocument.getDoc().unlockallControllers();
+            Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
+        }
     }
-
-
 }