[Libreoffice-commits] .: 2 commits - offapi/com sfx2/Library_sfx.mk sfx2/source

[Norbert Thiebaud]

 offapi/com/sun/star/ucb/Content.idl |    3 -
 sfx2/Library_sfx.mk                 |    1 
 sfx2/source/appl/appreg.cxx         |    1 
 sfx2/source/inc/objmnctl.hxx        |   57 ------------------------------------
 4 files changed, 1 insertion(+), 61 deletions(-)

New commits:
commit c28724df95b791d18314b256b5ceecb65eb02657
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 27 11:37:59 2011 -0500

    fix bad comment

diff --git a/offapi/com/sun/star/ucb/Content.idl b/offapi/com/sun/star/ucb/Content.idl
index 084e464..f70951c 100644
--- a/offapi/com/sun/star/ucb/Content.idl
+++ b/offapi/com/sun/star/ucb/Content.idl
@@ -447,8 +447,7 @@ published service Content
         // contains the count of subfolders of a folder.
         long FolderCount
 
-        // contains the free space left on a storage device. It is
-            specified in bytes.
+        // contains the free space left on a storage device. It is specified in bytes.
         hyper FreeSpace
 
         // indicates whether a content has subcontents, which are documents.
commit addbb37f7ae8dca8075bc90e5afc1b8c8938d8c6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 27 10:15:24 2011 -0500

    remove unused SfxObjectVerbsControl class

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 432b464..ca66a9e 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -222,7 +222,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/inet/inettbc \
     sfx2/source/menu/mnuitem \
     sfx2/source/menu/mnumgr \
-    sfx2/source/menu/objmnctl \
     sfx2/source/menu/thessubmenu \
     sfx2/source/menu/virtmenu \
     sfx2/source/notify/eventsupplier \
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 743c783..564317d 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -36,7 +36,6 @@
 #include "arrdecl.hxx"
 #include "sfx2/sfxhelp.hxx"
 #include <sfx2/templdlg.hxx>
-#include "objmnctl.hxx"
 #include "inettbc.hxx"
 #include "sfx2/stbitem.hxx"
 #include <sfx2/navigat.hxx>
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
deleted file mode 100644
index 4d744cc..0000000
--- a/sfx2/source/inc/objmnctl.hxx
+++ /dev/null
@@ -1,57 +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 _SFX_OBJMNCTL_HXX
-#define _SFX_OBJMNCTL_HXX
-
-
-#include <sfx2/mnuitem.hxx>
-
-class SfxBindings;
-class PopupMenu;
-class Menu;
-
-class SfxObjectVerbsControl: public SfxMenuControl
-{
-    PopupMenu*          pMenu;
-    Menu&               rParent;
-
-private:
-    void                FillMenu();
-    DECL_LINK( MenuSelect, Menu * );
-    virtual             void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
-
-public:
-                        SfxObjectVerbsControl(sal_uInt16, Menu&, SfxBindings&);
-                        ~SfxObjectVerbsControl();
-    virtual PopupMenu*  GetPopup() const;
-    SFX_DECL_MENU_CONTROL();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */