diff options
author | Armin Le Grand <alg@apache.org> | 2013-07-17 12:07:18 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-17 17:28:19 +0100 |
commit | add80418d0cc7cf799a5b8fbb511d290437aaaf0 (patch) | |
tree | f36c595d9e7ab0fd8baa2a03a9d70dc0a16da4c6 /svx | |
parent | 3e312f729b2109380a713aa37418e92b81dad75d (diff) |
Resolves: #i122720# Adapted HasText() to SdrObject
(cherry picked from commit 880138a7794e7e641cdcf49277ed01b54ca93c59)
Conflicts:
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/transfrm.cxx
svx/inc/svx/svdobj.hxx
svx/inc/svx/svdotable.hxx
svx/inc/svx/svdotext.hxx
svx/source/svdraw/svdobj.cxx
Change-Id: Ic2564b845425ba63e6ae2ad6a80f3bfdb8a2f287
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 571b7296bb4a..b6e760f07060 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3270,6 +3270,11 @@ bool SdrObject::IsDoNotInsertIntoPageAutomatically() const return mbDoNotInsertIntoPageAutomatically; } +// #i121917# +bool SdrObject::HasText() const +{ + return false; +} SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) { |