diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-12-23 10:01:58 +0100 |
commit | b44240f655f3f5974a91911b7ec5e5652910a73e (patch) | |
tree | f3b02c278e52118fcb13169cc29e1bf5dedeabdd /sd/inc | |
parent | undoapi: merged DEV300m95 (diff) | |
parent | CWS-TOOLING: integrate CWS sb131 (diff) | |
download | core-b44240f655f3f5974a91911b7ec5e5652910a73e.tar.gz core-b44240f655f3f5974a91911b7ec5e5652910a73e.zip |
undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system
Diffstat (limited to 'sd/inc')
-rwxr-xr-x[-rw-r--r--] | sd/inc/pch/precompiled_sd.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 7e92020eb88f..2a80030b7560 100644..100755 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -617,7 +617,6 @@ #include "svx/galbrws.hxx" #include "svx/gallery.hxx" #include "svx/globl3d.hxx" -#include "svx/globlac.hrc" #include "svx/globlmn.hrc" #include "svx/grafctrl.hxx" #include "svx/hlnkitem.hxx" @@ -865,7 +864,7 @@ #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -#include "vcl/imagebtn.hxx" +#include "vcl/button.hxx" #include "vcl/jobset.hxx" #include "vcl/lineinfo.hxx" #include "vcl/lstbox.hxx" |