diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-20 18:22:32 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:01 -0400 |
| commit | 1ebdd13f88542e1b42f76825f09d59aa0d4ebdc7 (patch) | |
| tree | 75b58221e4f9bdd74fd543a40525be704a70e960 /sd | |
| parent | remove duplicate copy of SchXMLSeriesHelper (diff) | |
| download | core-1ebdd13f88542e1b42f76825f09d59aa0d4ebdc7.tar.gz core-1ebdd13f88542e1b42f76825f09d59aa0d4ebdc7.zip | |
add oox sd and xmlsecurity to Library_merged
Change-Id: Ie9ef511308179902cbaeb2cca39414e86c57ce30
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 90b81798ad8f..69cc2be872a2 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -72,7 +72,7 @@ using namespace com::sun::star; -#ifndef DISABLE_DYNLOADING // otherwise use the one in sw... +#if !defined(DISABLE_DYNLOADING) && !defined(LIBO_MERGELIBS) // otherwise use the one in sw... const String aEmptyStr; #endif |