From 54ad562ff57e5a7293ad017e6664bcfedaef09af Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Sat, 13 Apr 2013 09:22:11 -0400
Subject: fix mergelibs=all

Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
---
 sd/source/ui/inc/ViewShell.hxx | 4 ++--
 sd/source/ui/view/viewshe2.cxx | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 60ccfca78b68..62395018fdde 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -44,8 +44,6 @@ class ScrollBarBox;
 class SdDrawDocument;
 class ScrollBar;
 
-extern const String aEmptyStr;
-
 namespace com { namespace sun { namespace star {
 namespace embed {
     class XEmbeddedObject;
@@ -53,6 +51,8 @@ namespace embed {
 
 namespace sd {
 
+extern const String aEmptyStr;
+
 class DrawDocShell;
 class FrameView;
 class LayerTabBar;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 16410c0e6af6..31dcf3752feb 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -72,12 +72,10 @@
 
 using namespace com::sun::star;
 
-#if !defined(DISABLE_DYNLOADING) // otherwise use the one in sw...
-const String aEmptyStr;
-#endif
-
 namespace sd {
 
+const String aEmptyStr;
+
 /**
  * adjust Thumbpos and VisibleSize
  */
-- 
cgit