[Libreoffice-commits] .: oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sc/Library_vbaobj.mk sc/source unusedcode.easy

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Sep 20 12:42:26 PDT 2012


 oovbaapi/UnoApi_oovbaapi.mk        |    1 
 oovbaapi/ooo/vba/XFoundFiles.idl   |   47 -------------
 sc/Library_vbaobj.mk               |    1 
 sc/source/ui/vba/vbafoundfiles.cxx |  133 -------------------------------------
 sc/source/ui/vba/vbafoundfiles.hxx |   88 ------------------------
 unusedcode.easy                    |    2 
 6 files changed, 272 deletions(-)

New commits:
commit bc1424d49402a2ded345141307630bafe8892dd5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Sep 20 19:55:17 2012 +0200

    unusedcode: vbafoundfiles.?xx and XFoundFiles.idl
    
    Change-Id: If4d2c45a4c819d17043b5dcb89a184f470a8fe57

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index c360af6..3cd11a8 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
 	XErrObject \
 	XExecutableDialog \
 	XFontBase \
-	XFoundFiles \
 	XGlobalsBase \
 	XHelperInterface \
 	XPageSetupBase \
diff --git a/oovbaapi/ooo/vba/XFoundFiles.idl b/oovbaapi/ooo/vba/XFoundFiles.idl
deleted file mode 100644
index 245d8db..0000000
--- a/oovbaapi/ooo/vba/XFoundFiles.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2009, 2010.
- * 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 __ooo_vba_XFoundFiles_idl__
-#define __ooo_vba_XFoundFiles_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <ooo/vba/XCollection.idl>
-
-//=============================================================================
-
-module ooo {  module vba {
-//=============================================================================
-
-interface XFoundFiles
-{
-    interface ooo::vba::XCollection;
-};
-
-}; };
-
-#endif
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index fb7e1c3..37dfd24 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
 	sc/source/ui/vba/vbaformat \
 	sc/source/ui/vba/vbaformatcondition \
 	sc/source/ui/vba/vbaformatconditions \
-	sc/source/ui/vba/vbafoundfiles \
 	sc/source/ui/vba/vbaglobals \
 	sc/source/ui/vba/vbahyperlink \
 	sc/source/ui/vba/vbahyperlinks \
diff --git a/sc/source/ui/vba/vbafoundfiles.cxx b/sc/source/ui/vba/vbafoundfiles.cxx
deleted file mode 100644
index 33933f2..0000000
--- a/sc/source/ui/vba/vbafoundfiles.cxx
+++ /dev/null
@@ -1,133 +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 IBM Corporation 2009, 2010.
- * 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.
- *
- ************************************************************************/
-
-#include "vbafoundfiles.hxx"
-
-VbaFoundFilesEnum::VbaFoundFilesEnum( css::uno::Sequence<rtl::OUString>& sFileList ) : m_nIndex(0), m_sFileList(sFileList)
-{
-
-}
-
-VbaFoundFilesEnum::~VbaFoundFilesEnum()
-{
-
-}
-
-sal_Int32 SAL_CALL VbaFoundFilesEnum::getCount() throw (css::uno::RuntimeException)
-{
-    return m_sFileList.getLength();
-}
-
-css::uno::Any SAL_CALL VbaFoundFilesEnum::getByIndex( sal_Int32 nIndex )
-    throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException)
-{
-    if ( nIndex >= getCount() )
-    {
-        throw css::lang::IndexOutOfBoundsException();
-    }
-
-    return css::uno::makeAny( m_sFileList[nIndex] );
-}
-
-css::uno::Type SAL_CALL VbaFoundFilesEnum::getElementType() throw (css::uno::RuntimeException)
-{
-    return getCppuType((css::uno::Reference< css::container::XIndexAccess >*)0);
-}
-
-sal_Bool SAL_CALL VbaFoundFilesEnum::hasElements() throw (css::uno::RuntimeException)
-{
-    return ( getCount() != 0 );
-}
-
-sal_Bool SAL_CALL VbaFoundFilesEnum::hasMoreElements() throw (css::uno::RuntimeException)
-{
-    if ( getCount() > m_nIndex )
-    {
-        return sal_True;
-    }
-    return false;
-}
-
-css::uno::Any SAL_CALL VbaFoundFilesEnum::nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
-{
-    if ( !hasMoreElements() )
-    {
-        throw css::container::NoSuchElementException();
-    }
-
-    return css::uno::makeAny( m_sFileList[m_nIndex++] );
-}
-
-////////////////////////////////VbaFoundFiles//////////////////////////////////////////
-VbaFoundFiles::VbaFoundFiles( const css::uno::Reference< ov::XHelperInterface >& xParent,
-    const css::uno::Reference< css::uno::XComponentContext >& xContext,
-    const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess
-    ) : VbaFoundFilesImpl_BASE( xParent, xContext, xIndexAccess )
-{
-
-}
-
-VbaFoundFiles::~VbaFoundFiles()
-{
-
-}
-
-css::uno::Reference< css::container::XEnumeration > VbaFoundFiles::createEnumeration() throw (css::uno::RuntimeException)
-{
-    css::uno::Reference< css::container::XEnumeration > xEnumRet( m_xIndexAccess, css::uno::UNO_QUERY );
-    return xEnumRet;
-}
-
-css::uno::Any VbaFoundFiles::createCollectionObject( const css::uno::Any& aSource )
-{
-    return aSource;
-}
-
-css::uno::Type VbaFoundFiles::getElementType() throw (css::uno::RuntimeException)
-{
-    return ov::XFoundFiles::static_type(0);
-}
-
-rtl::OUString VbaFoundFiles::getServiceImplName()
-{
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VbaFoundFiles"));
-}
-
-css::uno::Sequence< rtl::OUString > VbaFoundFiles::getServiceNames()
-{
-    static css::uno::Sequence< rtl::OUString > aServiceNames;
-    if ( aServiceNames.getLength() == 0 )
-    {
-        aServiceNames.realloc( 1 );
-        aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.FoundFiles") );
-    }
-    return aServiceNames;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/vba/vbafoundfiles.hxx b/sc/source/ui/vba/vbafoundfiles.hxx
deleted file mode 100644
index f3570fe..0000000
--- a/sc/source/ui/vba/vbafoundfiles.hxx
+++ /dev/null
@@ -1,88 +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 IBM Corporation 2009, 2010.
- * 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 SC_VBA_FOUNDFILES_HXX
-#define SC_VBA_FOUNDFILES_HXX
-
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <ooo/vba/XFoundFiles.hpp>
-#include <vbahelper/vbacollectionimpl.hxx>
-
-namespace css = ::com::sun::star;
-
-typedef CollTestImplHelper< ooo::vba::XFoundFiles > VbaFoundFilesImpl_BASE;
-
-class VbaFoundFilesEnum : public cppu::WeakImplHelper2< css::container::XIndexAccess, css::container::XEnumeration >
-{
-private:
-    sal_Int32 m_nIndex;
-    css::uno::Sequence< rtl::OUString > m_sFileList;
-
-public:
-    VbaFoundFilesEnum( css::uno::Sequence< rtl::OUString >& sFileList );
-    ~VbaFoundFilesEnum();
-
-    // XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-
-    // XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException);
-
-    // XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException);
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
-};
-
-class VbaFoundFiles : public VbaFoundFilesImpl_BASE
-{
-private:
-
-public:
-    VbaFoundFiles( const css::uno::Reference< ov::XHelperInterface >& xParent,
-        const css::uno::Reference< css::uno::XComponentContext >& xContext,
-        const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
-    virtual ~VbaFoundFiles();
-
-    virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
-
-    // XEnumerationAccess
-    virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
-    virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
-
-    // XHelperInterface
-    virtual rtl::OUString getServiceImplName();
-    virtual css::uno::Sequence< rtl::OUString > getServiceNames();
-};
-
-#endif /* SC_VBA_FOUNDFILES_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 54dca39..df2d6bd 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -33,8 +33,6 @@ ThumbnailView::ImplScroll(Point const&)
 ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString const&, unsigned long)
 ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
 ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&)
-VbaFoundFiles::VbaFoundFiles(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
-VbaFoundFilesEnum::VbaFoundFilesEnum(com::sun::star::uno::Sequence<rtl::OUString>&)
 VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
 Window::PostUserEvent(unsigned long&, unsigned long, void*)
 XclExpPivotCache::GetFieldAcc(rtl::OUString const&)


More information about the Libreoffice-commits mailing list