[Libreoffice-commits] .: editeng/inc editeng/Library_editeng.mk editeng/Package_inc.mk editeng/source unusedcode.easy

Matus Kukan mkukan at kemper.freedesktop.org
Fri Aug 26 09:31:59 PDT 2011


 editeng/Library_editeng.mk       |    1 
 editeng/Package_inc.mk           |    1 
 editeng/inc/editeng/unoviwed.hxx |   64 -----------------
 editeng/source/uno/unoviwed.cxx  |  140 ---------------------------------------
 unusedcode.easy                  |    1 
 5 files changed, 207 deletions(-)

New commits:
commit 933d898b10f0c71fedc882ac2f2adb258d8b5994
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Aug 26 18:29:28 2011 +0200

    unusedcode: SvxEditEngineViewForwarder class

diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 9403002..340a754 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -130,7 +130,6 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
     editeng/source/uno/unopracc \
     editeng/source/uno/unotext \
     editeng/source/uno/unotext2 \
-    editeng/source/uno/unoviwed \
     editeng/source/uno/unoviwou \
     editeng/source/xml/xmltxtexp \
     editeng/source/xml/xmltxtimp \
diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
index 184556c..61d0603 100644
--- a/editeng/Package_inc.mk
+++ b/editeng/Package_inc.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unonrule.hxx,editeng/u
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unopracc.hxx,editeng/unopracc.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoprnms.hxx,editeng/unoprnms.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unotext.hxx,editeng/unotext.hxx))
-$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwed.hxx,editeng/unoviwed.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwou.hxx,editeng/unoviwou.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wghtitem.hxx,editeng/wghtitem.hxx))
 $(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/widwitem.hxx,editeng/widwitem.hxx))
diff --git a/editeng/inc/editeng/unoviwed.hxx b/editeng/inc/editeng/unoviwed.hxx
deleted file mode 100644
index 3fdab4a..0000000
--- a/editeng/inc/editeng/unoviwed.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVX_UNOVIWED_HXX
-#define _SVX_UNOVIWED_HXX
-
-#include <editeng/unoedsrc.hxx>
-
-#include <editeng/editdata.hxx>
-
-class EditView;
-
-/// Specialization for Calc
-class SvxEditEngineViewForwarder : public SvxEditViewForwarder
-{
-private:
-    EditView&           mrView;
-
-public:
-                        SvxEditEngineViewForwarder( EditView& rView );
-    virtual             ~SvxEditEngineViewForwarder();
-
-    virtual sal_Bool        IsValid() const;
-
-    virtual Rectangle   GetVisArea() const;
-    virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
-    virtual Point       PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
-
-    virtual sal_Bool    GetSelection( ESelection& rSelection ) const;
-    virtual sal_Bool    SetSelection( const ESelection& rSelection );
-    virtual sal_Bool    Copy();
-    virtual sal_Bool    Cut();
-    virtual sal_Bool    Paste();
-
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/unoviwed.cxx b/editeng/source/uno/unoviwed.cxx
deleted file mode 100644
index 5a7d859..0000000
--- a/editeng/source/uno/unoviwed.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_editeng.hxx"
-#include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
-
-#include <editeng/unoviwed.hxx>
-#include <editeng/editview.hxx>
-#include <editeng/editeng.hxx>
-
-SvxEditEngineViewForwarder::SvxEditEngineViewForwarder( EditView& rView ) :
-    mrView( rView )
-{
-}
-
-SvxEditEngineViewForwarder::~SvxEditEngineViewForwarder()
-{
-}
-
-sal_Bool SvxEditEngineViewForwarder::IsValid() const
-{
-    return sal_True;
-}
-
-Rectangle SvxEditEngineViewForwarder::GetVisArea() const
-{
-    OutputDevice* pOutDev = mrView.GetWindow();
-
-    if( pOutDev )
-    {
-        Rectangle aVisArea = mrView.GetVisArea();
-
-        // figure out map mode from edit engine
-        EditEngine* pEditEngine = mrView.GetEditEngine();
-
-        if( pEditEngine )
-        {
-            MapMode aMapMode(pOutDev->GetMapMode());
-            aVisArea = OutputDevice::LogicToLogic( aVisArea,
-                                                   pEditEngine->GetRefMapMode(),
-                                                   aMapMode.GetMapUnit() );
-            aMapMode.SetOrigin(Point());
-            return pOutDev->LogicToPixel( aVisArea, aMapMode );
-        }
-    }
-
-    return Rectangle();
-}
-
-Point SvxEditEngineViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const
-{
-    OutputDevice* pOutDev = mrView.GetWindow();
-
-    if( pOutDev )
-    {
-        MapMode aMapMode(pOutDev->GetMapMode());
-        Point aPoint( OutputDevice::LogicToLogic( rPoint, rMapMode,
-                                                  aMapMode.GetMapUnit() ) );
-        aMapMode.SetOrigin(Point());
-        return pOutDev->LogicToPixel( aPoint, aMapMode );
-    }
-
-    return Point();
-}
-
-Point SvxEditEngineViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const
-{
-    OutputDevice* pOutDev = mrView.GetWindow();
-
-    if( pOutDev )
-    {
-        MapMode aMapMode(pOutDev->GetMapMode());
-        aMapMode.SetOrigin(Point());
-        Point aPoint( pOutDev->PixelToLogic( rPoint, aMapMode ) );
-        return OutputDevice::LogicToLogic( aPoint,
-                                           aMapMode.GetMapUnit(),
-                                           rMapMode );
-    }
-
-    return Point();
-}
-
-sal_Bool SvxEditEngineViewForwarder::GetSelection( ESelection& rSelection ) const
-{
-    rSelection = mrView.GetSelection();
-    return sal_True;
-}
-
-sal_Bool SvxEditEngineViewForwarder::SetSelection( const ESelection& rSelection )
-{
-    mrView.SetSelection( rSelection );
-    return sal_True;
-}
-
-sal_Bool SvxEditEngineViewForwarder::Copy()
-{
-    mrView.Copy();
-    return sal_True;
-}
-
-sal_Bool SvxEditEngineViewForwarder::Cut()
-{
-    mrView.Cut();
-    return sal_True;
-}
-
-sal_Bool SvxEditEngineViewForwarder::Paste()
-{
-    mrView.Paste();
-    return sal_True;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index c1f7c2f..d723510 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1263,7 +1263,6 @@ SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
 SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
 SvxDrawPage::GetPageForSdrPage(SdrPage*)
 SvxDrawPage::SvxDrawPage()
-SvxEditEngineViewForwarder::SvxEditEngineViewForwarder(EditView&)
 SvxEditSourceHelper::UserSpaceToEE(Rectangle const&, Size const&, bool)
 SvxEditSourceHint::SetEndValue(unsigned long)
 SvxEditSourceHint::SetStartValue(unsigned long)


More information about the Libreoffice-commits mailing list