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/inc | |
| 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/inc')
| -rw-r--r-- | sd/inc/app.hrc | 1 | ||||
| -rw-r--r-- | sd/inc/glob.hrc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 5dc3b3d091ff..d421a9bd653e 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -53,6 +53,7 @@ #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) #define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) +#define HID_POOLSHEET_OBJNOLINENOFILL (HID_SD_START + 102) #define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) #define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 009b0929317e..afbb483d06ff 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -97,6 +97,8 @@ #define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 #define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 // +#define STR_POOLSHEET_OBJNOLINENOFILL RID_GLOB_START+75 +// #define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80 #define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81 #define STR_PSEUDOSHEET_BACKGROUNDOBJECTS RID_GLOB_START+82 |