From 5e2e0c158c73af234483bbe42bf92620c75defbf Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@openoffice.org>
Date: Sun, 13 Dec 2009 12:40:51 +0100
Subject: dtardon01: #i107647#: remove empty files in framework

---
 framework/util/makefile.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'framework/util')

diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 0a07f3cf137d..30c052edc59f 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -83,7 +83,6 @@ LIB2OBJFILES=   \
                 $(SLO)$/statusbardocumenthandler.obj            \
                 $(SLO)$/toolboxconfiguration.obj                \
                 $(SLO)$/toolboxdocumenthandler.obj              \
-                $(SLO)$/toolboxlayoutdocumenthandler.obj        \
                 $(SLO)$/imagesconfiguration.obj                 \
                 $(SLO)$/imagesdocumenthandler.obj               \
                 $(SLO)$/xmlnamespaces.obj                       \
-- 
cgit 


From ec0ee57607a1e8a800bb4809a0be6921df1f2e19 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 29 Jan 2010 17:01:54 +0100
Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put
 symbols, and simplified it by requiring that first section is labeled
 UDK_3_0_0; adapted map files accordingly, replacing many individual ones with
 solenv/src templates

---
 framework/util/exports.map | 10 ----------
 framework/util/makefile.mk |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 framework/util/exports.map

(limited to 'framework/util')

diff --git a/framework/util/exports.map b/framework/util/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/framework/util/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index 0a07f3cf137d..0a6c9c60fde6 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -223,7 +223,7 @@ SHL3DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN)
 
 DEF3NAME=       $(SHL3TARGET)
 
-SHL3VERSIONMAP= exports.map
+SHL3VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- services library ----------------------------------------------------
 
@@ -365,7 +365,7 @@ SHL4DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
 
 DEF4NAME=       $(SHL4TARGET)
 
-SHL4VERSIONMAP= exports.map
+SHL4VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- services library ----------------------------------------------------
 
@@ -396,7 +396,7 @@ SHL5DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
 
 DEF5NAME=       $(SHL5TARGET)
 
-SHL5VERSIONMAP= exports.map
+SHL5VERSIONMAP= $(SOLARENV)/src/component.map
 
 RESLIB1NAME=        fwe
 RESLIB1IMAGES=      $(PRJ)$/res
-- 
cgit 


From b3ca4b3cbdce79eb3b387da6e84126c7a9f20eaa Mon Sep 17 00:00:00 2001
From: Christian Lippka <cl@openoffice.org>
Date: Sun, 21 Mar 2010 20:01:33 +0100
Subject: Adding PopupMenuController to allow PopupMenuControllerBase
 dervivates to be used in toolbars

---
 framework/util/makefile.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/util')

diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk
index ed7e2e131550..29c1947b1149 100644
--- a/framework/util/makefile.mk
+++ b/framework/util/makefile.mk
@@ -56,7 +56,6 @@ LIB1OBJFILES=   \
                 $(SLO)$/rootitemcontainer.obj                   \
                 $(SLO)$/constitemcontainer.obj                  \
                 $(SLO)$/jobconst.obj                            \
-                $(SLO)$/popupmenucontrollerbase.obj             \
                 $(SLO)$/mischelper.obj                          \
                 $(SLO)$/propertysethelper.obj
 
@@ -196,7 +195,8 @@ SHL3OBJS=       $(SLO)$/mediatypedetectionhelper.obj\
                 $(SLO)$/dispatchrecorder.obj        \
                 $(SLO)$/dispatchrecordersupplier.obj\
                 $(SLO)$/dispatchhelper.obj          \
-                $(SLO)$/popupmenudispatcher.obj           \
+                $(SLO)$/popupmenudispatcher.obj     \
+                $(SLO)$/popupmenucontroller.obj
 
 SHL3STDLIBS=    \
                 $(FWILIB)                           \
-- 
cgit