INTEGRATION: CWS rptwizard01 (1.9.68); FILE MERGED

2008/05/21 10:14:47 lla 1.9.68.6: RESYNC: (1.9-1.10); FILE MERGED
2008/05/16 07:05:13 lla 1.9.68.5: #i86092# restructures to work with design templates
2008/03/18 12:09:42 lla 1.9.68.4: #i86092# remove Note: text in new Report Wizard only
2008/03/11 12:32:23 lla 1.9.68.3: #i86092# cleanups
2008/02/19 12:46:06 lla 1.9.68.2: #i86092# use new getter for layout access
2008/02/14 13:00:48 lla 1.9.68.1: #i86092# changes for new Report Wizard

1 files changed, 203 insertions, 138 deletions

diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 88f6aaafb711..484f0530fb04 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ReportLayouter.java,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,192 +30,257 @@
 package com.sun.star.wizards.report;
 
 import com.sun.star.awt.XListBox;
-import com.sun.star.awt.XTextComponent;
+// import com.sun.star.awt.XTextComponent;
 import com.sun.star.lang.EventObject;
-import com.sun.star.ucb.XSimpleFileAccess;
-import com.sun.star.uno.XInterface;
+import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.wizards.common.*;
 import com.sun.star.wizards.ui.*;
 
-public class ReportLayouter {
+public class ReportLayouter
+{
     UnoDialog CurUnoDialog;
-    static String sOrientationHeader;
-    static String sOrientVertical;
-    static String sOrientHorizontal;
+//    static String sOrientationHeader;
+//    static String sOrientVertical;
+//    static String sOrientHorizontal;
     final int SOTXTTITLE = 28;
     final int SOCONTENTLST = 29;
 
-    final int SOOPTLANDSCAPE = 30;
-    final int SOOPTPORTRAIT = 31;
+    final static public int SOOPTLANDSCAPE = 30;
+    final static public int SOOPTPORTRAIT = 31;
     final int SOLAYOUTLST = 32;
-    static String sReportTitle;
-    static String slblDataStructure;
-    static String slblPageLayout;
-    static String sOrganizeFields;
+//    static String sReportTitle;
+//    static String slblDataStructure;
+//    static String slblPageLayout;
+//    static String sOrganizeFields;
     XListBox xContentListBox;
     XListBox xLayoutListBox;
     int iOldContentPos;
     int iOldLayoutPos;
-    ReportDocument CurReportDocument;
+    // ReportTextDocument CurReportDocument;
+    IReportDocument CurReportDocument;
     public String[][] LayoutFiles;
     public String[][] ContentFiles;
-    private Desktop.OfficePathRetriever curofficepath;
-    Object imgOrientation;
-
-    public ReportLayouter(ReportDocument _CurReportDocument, UnoDialog _CurUnoDialog) {
-        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(CurReportDocument.xMSF);
-            slblDataStructure = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 15);
-            slblPageLayout = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 16);
-            sOrganizeFields = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 19);
-
-            sOrientationHeader = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 22);
-            sOrientVertical = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 23);
-            sOrientHorizontal = CurUnoDialog.oResource.getResText(UIConsts.RID_REPORT + 24);
-
-            ContentFiles = FileAccess.getFolderTitles(CurReportDocument.xMSF, "cnt", ReportWizard.ReportPath);
-            LayoutFiles = FileAccess.getFolderTitles(CurReportDocument.xMSF, "stl", ReportWizard.ReportPath);
-            XInterface xUcbInterface = (XInterface) CurReportDocument.xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
-            XSimpleFileAccess xSimpleFileAccess = (XSimpleFileAccess) com.sun.star.uno.UnoRuntime.queryInterface(XSimpleFileAccess.class, xUcbInterface);
-            boolean bcntexists = xSimpleFileAccess.exists(ReportWizard.ReportPath + "/cnt-default.ott");
-            boolean bstlexists = xSimpleFileAccess.exists(ReportWizard.ReportPath + "/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)});
-
-            short iSelPos = (short) JavaTools.FieldInList(ContentFiles[1], ReportWizard.ReportPath + "/cnt-default.ott");
-            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)});
-
-            short iSelLayoutPos = (short) JavaTools.FieldInList(LayoutFiles[1], ReportWizard.ReportPath + "/stl-default.ott");
-            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)});
-
-            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((short) 1), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)});
-
-            CurUnoDialog.insertRadioButton("optPortrait", SOOPTPORTRAIT, new ItemListenerImpl(),
-                                        new String[] { "Height", "HelpURL", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width" },
-                                        new Object[] { new Integer(10), "HID:34366", sOrientVertical, new Integer(101), new Integer(171), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), new Integer(60)});
-
-            imgOrientation = 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)});
-
-            CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblBlindTextNote_2",
-                                        new String[] { "Height", "Label", "MultiLine", "PositionX", "PositionY", "Step", "Width" },
-                                        new Object[] { new Integer(34), ReportWizard.sBlindTextNote, new Boolean(true), new Integer(205), new Integer(148), new Integer(ReportWizard.SOTEMPLATEPAGE), new Integer(99)});
-            CurUnoDialog.getPeerConfiguration().setImageUrl(imgOrientation, 1002, 1003);
-
-        } catch (Exception exception) {
-            exception.printStackTrace(System.out);
+    // private Desktop.OfficePathRetriever curofficepath;
+    Object aOrientationImage;
+    // boolean m_bLandscape = true;
+
+    private XMultiServiceFactory m_xMSF;
+
+    public ReportLayouter(XMultiServiceFactory _xMSF, IReportDocument _CurReportDocument, UnoDialog _CurUnoDialog)
+        {
+            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);
+// 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);
+
+                // 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)});
+
+                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)
+                                                             });
+
+                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;
+//                    LayoutFiles = FileAccess.getFolderTitles(m_xMSF, "stl", CurReportDocument.getReportPath());
+                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 = 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)});
+
+                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)});
+
+                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);
+                }
+            }
+            catch (Exception exception)
+            {
+                exception.printStackTrace(System.out);
+            }
         }
-    }
 
-    public void initialize(String _defaultTemplatePath) {
-        CurReportDocument.xTextDocument.lockControllers();
-        CurReportDocument.setupRecordSection(_defaultTemplatePath);
-        if (CurUnoDialog.getControlProperty("txtTitle", "Text").equals("")) {
-            String[] sCommandNames = CurReportDocument.CurDBMetaData.getIncludedCommandNames();
-            CurUnoDialog.setControlProperty("txtTitle", "Text", sCommandNames[0]);
+    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.oViewHandler.selectFirstPage(CurReportDocument.oTextTableHandler);
-        CurUnoDialog.setFocus("lblContent");
-        CurReportDocument.unlockallControllers();
-    }
 
-    class ItemListenerImpl implements com.sun.star.awt.XItemListener {
+    class ItemListenerImpl implements com.sun.star.awt.XItemListener
+    {
 
-        public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject) {
-            try {
-                int iPos;
-                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
-                CurReportDocument.xTextDocument.lockControllers();
-                int iKey = CurUnoDialog.getControlKey(EventObject.Source, CurUnoDialog.ControlList);
-                switch (iKey) {
+        public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
+            {
+                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)
+                    {
                     case SOCONTENTLST :
                         iPos = xContentListBox.getSelectedItemPos();
-                        if (iPos != iOldContentPos) {
+                        if (iPos != iOldContentPos)
+                        {
                             iOldContentPos = iPos;
-                            CurReportDocument.swapContentTemplate(ContentFiles[1][iPos]);
+                            CurReportDocument.liveupdate_changeContentTemplate(ContentFiles[1][iPos]);
                         }
                         break;
 
                     case SOLAYOUTLST :
                         iPos = xLayoutListBox.getSelectedItemPos();
-                        if (iPos != iOldLayoutPos) {
+                        if (iPos != iOldLayoutPos)
+                        {
                             iOldLayoutPos = iPos;
-                            CurReportDocument.swapLayoutTemplate(LayoutFiles[1][iPos], curofficepath.BitmapPath);
+                            CurReportDocument.liveupdate_changeLayoutTemplate(LayoutFiles[1][iPos]/*, Desktop.getBitmapPath(m_xMSF)*/);
                         }
                         break;
 
                     case SOOPTLANDSCAPE :
-                        CurReportDocument.changePageOrientation(true);
-                        Helper.setUnoPropertyValue(imgOrientation, "ImageURL", CurUnoDialog.getWizardImageUrl(1002, 1003));
+                        // CurReportDocument.getDoc().changePageOrientation(true);
+                        try
+                        {
+                            CurReportDocument.setPageOrientation(SOOPTLANDSCAPE);
+                        }
+                        catch(com.sun.star.lang.IllegalArgumentException e)
+                        {}
+                        Helper.setUnoPropertyValue(aOrientationImage, "ImageURL", CurUnoDialog.getWizardImageUrl(1002, 1003));
 
                         break;
 
                     case SOOPTPORTRAIT :
-                        CurReportDocument.changePageOrientation( false);
-                        CurUnoDialog.setControlProperty("imgOrientation", "ImageURL", curofficepath.BitmapPath + "/portrait.gif");
-                        Helper.setUnoPropertyValue(imgOrientation, "ImageURL", CurUnoDialog.getWizardImageUrl(1000, 1001));
+                        // CurReportDocument.getDoc().changePageOrientation( false);
+                        try
+                        {
+                            CurReportDocument.setPageOrientation(SOOPTPORTRAIT);
+                        }
+                        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 :
                         break;
+                    }
                 }
-            } catch (RuntimeException e) {
-                e.printStackTrace();
+                catch (RuntimeException e)
+                {
+                    e.printStackTrace();
+                }
+                // CurReportDocument.getDoc().unlockallControllers();
+                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
             }
-            CurReportDocument.unlockallControllers();
-            Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
-        }
 
-        public void disposing(EventObject eventObject) {
-        }
+        public void disposing(EventObject eventObject)
+            {
+            }
     }
 
-    class ActionListenerImpl implements com.sun.star.awt.XActionListener {
+    class ActionListenerImpl implements com.sun.star.awt.XActionListener
+    {
 
-        public void disposing(EventObject eventObject) {
-        }
-
-        public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent) {
-            try {
-                Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(false));
-                CurReportDocument.xTextDocument.lockControllers();
-                boolean blandscape = (((Short) CurUnoDialog.getControlProperty("optLandscape", "State")).shortValue() == 1);
-                CurReportDocument.changePageOrientation(blandscape);
+        public void disposing(EventObject eventObject)
+            {
+            }
 
-            } catch (Exception exception) {
-                exception.printStackTrace(System.out);
+        public void actionPerformed(com.sun.star.awt.ActionEvent actionEvent)
+            {
+                try
+                {
+                    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));
             }
-            CurReportDocument.unlockallControllers();
-            Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel, "Enabled", new Boolean(true));
-        }
     }