|
 |
f085be |
From 2b8f66388450fcf7fb2f8087ee7c66c142fe72c0 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Armin Le Grand <alg@apache.org>
|
|
|
f085be |
Date: Wed, 9 Jul 2014 11:57:21 +0000
|
|
|
f085be |
Subject: [PATCH 003/137] Resolves: #i119287# corrected default style for draw
|
|
|
f085be |
objects...
|
|
|
f085be |
|
|
|
f085be |
created using UNO API
|
|
|
f085be |
|
|
|
f085be |
(cherry picked from commit d07778f62ed386672a60ef7570a89b5fa109e026)
|
|
|
f085be |
|
|
|
f085be |
Conflicts:
|
|
|
f085be |
sd/source/ui/unoidl/unopage.cxx
|
|
|
f085be |
|
|
|
f085be |
(cherry picked from commit 0aa3dee5e88a1494a7a6a8401e084cbdb4324727)
|
|
|
f085be |
Signed-off-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f085be |
|
|
|
f085be |
Conflicts:
|
|
|
f085be |
sd/source/ui/unoidl/unopage.cxx
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I016d801edefb5ab32b7b6a8e13a1dc3e8fdb866e
|
|
|
f085be |
---
|
|
|
f085be |
sd/source/ui/unoidl/unopage.cxx | 16 ++++++++++++++++
|
|
|
f085be |
1 file changed, 16 insertions(+)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
|
|
|
f085be |
index 9ad3473..fa61e5f 100644
|
|
|
f085be |
--- a/sd/source/ui/unoidl/unopage.cxx
|
|
|
f085be |
+++ b/sd/source/ui/unoidl/unopage.cxx
|
|
|
f085be |
@@ -69,6 +69,7 @@
|
|
|
f085be |
#include "unopback.hxx"
|
|
|
f085be |
#include "unohelp.hxx"
|
|
|
f085be |
#include <vcl/dibtools.hxx>
|
|
|
f085be |
+#include <svx/svdograf.hxx>
|
|
|
f085be |
|
|
|
f085be |
using ::com::sun::star::animations::XAnimationNode;
|
|
|
f085be |
using ::com::sun::star::animations::XAnimationNodeSupplier;
|
|
|
f085be |
@@ -410,7 +411,22 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
|
|
|
f085be |
{
|
|
|
f085be |
SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel();
|
|
|
f085be |
if( pDoc )
|
|
|
f085be |
+ {
|
|
|
f085be |
+ // #i119287# similar to the code in the SdrObject methods the graphic and ole
|
|
|
f085be |
+ // SdrObjects need another default style than the rest, see task. Adding here, too.
|
|
|
f085be |
+ // TTTT: Same as for #i119287#: Can be removed in branch aw080 again
|
|
|
f085be |
+ const bool bIsSdrGrafObj(0 != dynamic_cast< SdrGrafObj* >(pObj));
|
|
|
f085be |
+ const bool bIsSdrOle2Obj(0 != dynamic_cast< SdrOle2Obj* >(pObj));
|
|
|
f085be |
+
|
|
|
f085be |
+ if(bIsSdrGrafObj || bIsSdrOle2Obj)
|
|
|
f085be |
+ {
|
|
|
f085be |
+ pObj->NbcSetStyleSheet(pDoc->GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(), sal_True);
|
|
|
f085be |
+ }
|
|
|
f085be |
+ else
|
|
|
f085be |
+ {
|
|
|
f085be |
pObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), sal_True );
|
|
|
f085be |
+ }
|
|
|
f085be |
+ }
|
|
|
f085be |
}
|
|
|
f085be |
return pObj;
|
|
|
f085be |
}
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|