diff options
| author | Armin Le Grand <alg@apache.org> | 2012-05-31 13:23:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-11 11:20:23 +0100 |
| commit | 0a29c5bedda700a86b46e3c3cd9c9e1ce1d4f278 (patch) | |
| tree | 61ef44bcf873afb94ed3b9efe761e9c0de67307d /sd/source/ui/view | |
| parent | e2d31c5e705e6e4d6b0185bebba66a55e77981f4 (diff) | |
Resolves: #i119287# exchanged hard attributes for OLE and GraphicObject
...with new default StyleSheet for these objects
(cherry picked from commit 2868ea34151cfb623a6a8bf41862d430205d9784)
Conflicts:
sd/source/core/drawdoc4.cxx
svx/source/sdr/contact/viewcontactofgraphic.cxx
Change-Id: I4849101de2ac1da83c8fb0f2d68316774982d197
Resolves: #i119287# Adapted to get the needed style as default style
for all SdrGrafObj and SDrOle2Objs. Checked various scenarios, works
well.
(cherry picked from commit bc85939149f7ae5b65343d7f27bf302a8e31d4b1)
Conflicts:
sd/source/core/drawdoc.cxx
sd/source/ui/func/fuinsert.cxx
sd/source/ui/view/sdview4.cxx
Change-Id: I40a17216f5c11ebca073026f62f1e9ab9ddfd119
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 075cf79074be..53d414cbd701 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -59,6 +59,7 @@ #include <svtools/soerr.hxx> #include <sfx2/ipclient.hxx> +#include "glob.hrc" using namespace com::sun::star; |