From 5e838ad7d9d9919a362497cf5f04bdb2e7c1c6f7 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 16 Apr 2010 23:02:51 +0200
Subject: CWS gnumake2: move delivered header files from sfx2/inc to
 sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver

---
 sfx2/source/menu/mnuitem.cxx  | 6 +++---
 sfx2/source/menu/mnumgr.cxx   | 2 +-
 sfx2/source/menu/virtmenu.cxx | 9 ++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'sfx2/source/menu')

diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 0e80cc207ce0..e194a718bbb3 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -75,9 +75,9 @@
 #include <sfx2/module.hxx>
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "imgmgr.hxx"
-#include "imagemgr.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/imgmgr.hxx"
+#include "sfx2/imagemgr.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "../doc/doc.hrc"
 
 using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 076932ba9dea..01d94dc141cf 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -71,7 +71,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/bindings.hxx>
 #include "mnucfga.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/macrconf.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/sfx.hrc>
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 87f35805d1e7..04eaba861b94 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -39,14 +39,9 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <comphelper/processfactory.hxx>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
-#endif
 #include <tools/urlobj.hxx>
 
-#ifndef GCC
-#endif
-
 #include "virtmenu.hxx"
 #include <sfx2/msgpool.hxx>
 #include "statcach.hxx"
@@ -63,9 +58,9 @@
 #include <sfx2/viewsh.hxx>
 #include "sfxpicklist.hxx"
 #include <sfx2/macrconf.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "menu.hrc"
-#include "imagemgr.hxx"
+#include "sfx2/imagemgr.hxx"
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 #include <framework/addonsoptions.hxx>
-- 
cgit 


From c05087b295acf86ce13105b0cc67b82feb92f45a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Fri, 19 Nov 2010 21:45:41 +0100
Subject: gnumake2: removing old dmake file in migrated modules

---
 sfx2/source/menu/makefile.mk | 55 --------------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 sfx2/source/menu/makefile.mk

(limited to 'sfx2/source/menu')

diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk
deleted file mode 100644
index 8b55bd0840ea..000000000000
--- a/sfx2/source/menu/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-
-PRJNAME=sfx2
-TARGET=menu
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = menu.src
-
-SLOFILES =	\
-        $(SLO)$/mnuitem.obj \
-        $(SLO)$/mnumgr.obj \
-        $(SLO)$/objmnctl.obj \
-        $(SLO)$/thessubmenu.obj \
-        $(SLO)$/virtmenu.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-- 
cgit