[Libreoffice-commits] core.git: sfx2/inc sfx2/Package_inc.mk sfx2/source
Noel Grandin
noel at peralex.com
Tue Apr 16 13:05:47 PDT 2013
sfx2/Package_inc.mk | 1
sfx2/inc/sfx2/minstack.hxx | 56 --------------------------------------------
sfx2/source/menu/mnumgr.cxx | 1
3 files changed, 58 deletions(-)
New commits:
commit 187a592df9bc9c1ef4b53fe6dce40a3c74f6bb67
Author: Noel Grandin <noel at peralex.com>
Date: Mon Apr 15 11:26:43 2013 +0200
remove dead code minstack.hxx
Change-Id: I67a7a4c51188187c1ab234f8e9d2634eb018badf
Reviewed-on: https://gerrit.libreoffice.org/3397
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 228cc62..4c08af5 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.h
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx))
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
deleted file mode 100644
index d4de0da..0000000
--- a/sfx2/inc/sfx2/minstack.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 _SFXMINSTACK_HXX
-#define _SFXMINSTACK_HXX
-
-#include <sfx2/minarray.hxx>
-
-#define DECL_PTRSTACK( ARR, T, nI, nG ) \
-DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \
-class ARR: private ARR##arr_ \
-{ \
-public: \
- ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \
- ARR##arr_( nInitSize, nGrowSize ) \
- {} \
-\
- ARR( const ARR& rOrig ): \
- ARR##arr_( rOrig ) \
- {} \
-\
- sal_uInt16 Count() const { return ARR##arr_::Count(); } \
- void Push( T rElem ) { Append( rElem ); } \
- T Top( sal_uInt16 nLevel = 0 ) const \
- { return (*this)[Count()-nLevel-1]; } \
- T Bottom() const { return (*this)[0]; } \
- T Pop() \
- { T aRet = (*this)[Count()-1]; \
- Remove( Count()-1, 1 ); \
- return aRet; \
- } \
- T* operator*() \
- { return &(*this)[Count()-1]; } \
- void Clear() { ARR##arr_::Clear(); } \
- sal_Bool Contains( const T pItem ) const \
- { return ARR##arr_::Contains( pItem ); } \
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index a83e975..0a2f0ca 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -52,7 +52,6 @@
#include "virtmenu.hxx"
#include <sfx2/msg.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/minstack.hxx>
#include <sfx2/app.hxx>
#include "sfxtypes.hxx"
#include <sfx2/bindings.hxx>
More information about the Libreoffice-commits
mailing list