[Libreoffice-commits] core.git: 2 commits - include/editeng include/svl

[Tor Lillqvist]

 include/editeng/AccessibleSvxFindReplaceDialog.hxx |   56 ---------------------
 include/svl/itempool.hxx                           |    2 
 include/svl/itemset.hxx                            |    4 -
 3 files changed, 62 deletions(-)

New commits:
commit 26b1c43091e25f8b5dc2ba6b69a1ec583272a9df
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 20:12:23 2014 +0300

    Bin unused file
    
    Change-Id: Ibd4ded85d5d3e1de8bf12934cbe55210d1983b18

diff --git a/include/editeng/AccessibleSvxFindReplaceDialog.hxx b/include/editeng/AccessibleSvxFindReplaceDialog.hxx
deleted file mode 100644
index 635e90a3..0000000
--- a/include/editeng/AccessibleSvxFindReplaceDialog.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-#ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
-#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <toolkit/awt/vclxwindows.hxx>
-
-class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent
-{
-public:
-    VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow);
-    virtual ~VCLXAccessibleSvxFindReplaceDialog();
-    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
-
-};
-
-
-class VCLXSvxFindReplaceDialog : public VCLXDialog
-{
-public:
-    VCLXSvxFindReplaceDialog(Window* pSplDlg)
-    {
-        SetWindow(pSplDlg);
-    }
-    virtual ~VCLXSvxFindReplaceDialog()
-    {};
-private:
-    virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessibleContext >  CreateAccessibleContext()
-    {
-        return new VCLXAccessibleSvxFindReplaceDialog(this);
-    }
-};
-#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f9f60b95c1c2b032deccf44775336f706a67bf99
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 19:54:20 2014 +0300

    Bin crack, _SFXITEMS_HXX is not defined anywhere anyway
    
    Change-Id: I9143e7fffef6e99d25a0fd87712ed26d2d42116e

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 72bd11d..9ce3220 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -78,7 +78,6 @@ public:
     void AddSfxItemPoolUser(SfxItemPoolUser& rNewUser);
     void RemoveSfxItemPoolUser(SfxItemPoolUser& rOldUser);
 
-#ifndef _SFXITEMS_HXX
 private:
     sal_uInt16                      GetIndex_Impl(sal_uInt16 nWhich) const;
     sal_uInt16                      GetSize_Impl() const;
@@ -90,7 +89,6 @@ public:
     // for default SfxItemSet::CTOR, set default WhichRanges
     void                            FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const;
     const sal_uInt16*               GetFrozenIdRanges() const;
-#endif
 
 protected:
     static inline void              SetRefCount( SfxPoolItem& rItem, sal_uLong n );
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 2e4b61e..eed23ce 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -52,8 +52,6 @@ class SVL_DLLPUBLIC SfxItemSet
     sal_uInt16*                     _pWhichRanges;  // Array von Which-Bereichen
     sal_uInt16                      _nCount;        // Anzahl Items
 
-#ifndef _SFXITEMS_HXX
-
 friend class SfxItemPoolCache;
 friend class SfxAllItemSet;
 friend const char *DbgCheckItemSet( const void* );
@@ -66,8 +64,6 @@ private:
 public:
     SfxItemArray                GetItems_Impl() const { return _aItems; }
 
-#endif
-
 private:
     const SfxItemSet&           operator=(const SfxItemSet &);   // n.i.!!