[Libreoffice-commits] .: Branch 'libreoffice-4-0' - wizards/com wizards/Pyuno_commonwizards.mk

[Libreoffice Gerrit user]

 wizards/Pyuno_commonwizards.mk                                |    1 
 wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py       |    4 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |    4 
 wizards/com/sun/star/wizards/text/ViewHandler.py              |   54 ----------
 4 files changed, 2 insertions(+), 61 deletions(-)

New commits:
commit 1f6b7857f417815fd8754d8e3da2f41f61531438
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Wed Dec 19 19:21:31 2012 +0100

    pywizards: get rid of ViewHandler
    
    Change-Id: Ie0098f0342a5863ffeb9dec96104efb7d94d7ae2

diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index 18141dc..abc6040 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Pyuno_add_files,wizards,\
     text/TextDocument.py \
     text/TextFieldHandler.py \
     text/TextSectionHandler.py \
-    text/ViewHandler.py \
     ui/__init__.py \
     ui/ControlScroller.py \
     ui/ImageList.py \
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
index 9aa2d72..0c5ed84 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
@@ -24,7 +24,6 @@ from ..ui.PathSelection import PathSelection
 from ..ui.event.UnoDataAware import UnoDataAware
 from ..ui.event.RadioDataAware import RadioDataAware
 from ..text.TextFieldHandler import TextFieldHandler
-from ..text.ViewHandler import ViewHandler
 from ..text.TextElement import TextElement
 from ..common.Configuration import Configuration
 from ..common.SystemDialog import SystemDialog
@@ -206,8 +205,7 @@ class FaxWizardDialogImpl(FaxWizardDialog):
 
                 oDoc = OfficeDocument.load(Desktop.getDesktop(self.xMSF),
                     self.sPath, "_default", loadValues)
-                myViewHandler = ViewHandler(self.xMSF, oDoc)
-                myViewHandler.setViewSetting("ZoomType", OPTIMAL)
+                oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL
             else:
                 pass
                 #TODO: Error Handling
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 5bede1e..466cd61 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -29,7 +29,6 @@ from ..ui.PathSelection import PathSelection
 from ..ui.event.UnoDataAware import UnoDataAware
 from ..ui.event.RadioDataAware import RadioDataAware
 from ..text.TextElement import TextElement
-from ..text.ViewHandler import ViewHandler
 from ..text.TextFieldHandler import TextFieldHandler
 from ..document.OfficeDocument import OfficeDocument
 
@@ -240,8 +239,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
                 oDoc = OfficeDocument.load(
                     Desktop.getDesktop(self.xMSF),
                     self.sPath, "_default", loadValues)
-                myViewHandler = ViewHandler(self.xMSF, oDoc)
-                myViewHandler.setViewSetting("ZoomType", OPTIMAL)
+                oDoc.CurrentController.ViewSettings.ZoomType = OPTIMAL
             else:
                 pass
 
diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.py b/wizards/com/sun/star/wizards/text/ViewHandler.py
deleted file mode 100644
index 1609acb..0000000
--- a/wizards/com/sun/star/wizards/text/ViewHandler.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-class ViewHandler(object):
-    '''Creates a new instance of View '''
-
-    def __init__ (self, xMSF, xTextDocument):
-        self.xMSFDoc = xMSF
-        self.xTextDocument = xTextDocument
-        self.xTextViewCursorSupplier = xTextDocument.CurrentController
-
-    def selectFirstPage(self, oTextTableHandler):
-        try:
-            xPageCursor = self.xTextViewCursorSupplier.ViewCursor
-            xPageCursor.jumpToFirstPage()
-            xPageCursor.jumpToStartOfPage()
-            Helper.setUnoPropertyValue(
-                xPageCursor, "PageDescName", "First Page")
-            oPageStyles = self.xTextDocument.StyleFamilies.getByName(
-                "PageStyles")
-            oPageStyle = oPageStyles.getByName("First Page")
-            xAllTextTables = oTextTableHandler.xTextTablesSupplier.TextTables
-            xTextTable = xAllTextTables.getByIndex(0)
-            xRange = xTextTable.Anchor.Text
-            xPageCursor.gotoRange(xRange, False)
-            if not com.sun.star.uno.AnyConverter.isVoid(XTextRange):
-                xViewTextCursor.gotoRange(xHeaderRange, False)
-                xViewTextCursor.collapseToStart()
-            else:
-                print ("No Headertext available")
-
-        except Exception:
-            traceback.print_exc()
-
-    def setViewSetting(self, Setting, Value):
-        self.xTextViewCursorSupplier.ViewSettings.setPropertyValue(Setting, Value)
-
-    def collapseViewCursorToStart(self):
-        xTextViewCursor = self.xTextViewCursorSupplier.ViewCursor
-        xTextViewCursor.collapseToStart()