Files
libreoffice/svx/source/svdraw/svdoashp.cxx

3273 lines
122 KiB
C++
Raw Normal View History

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
/*
* This file is part of the LibreOffice project.
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
*
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
*
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
* This file incorporates work covered by the following license notice:
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
*
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svx/svdoashp.hxx>
#include "svx/unoapi.hxx"
#include <svx/unoshape.hxx>
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
#include <ucbhelper/content.hxx>
#include <unotools/datetime.hxx>
#include <sfx2/lnkbase.hxx>
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XCustomShapeEngine.hpp>
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <comphelper/processfactory.hxx>
#include <svl/urihelper.hxx>
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
#include <com/sun/star/uno/Sequence.h>
#include <svx/svdogrp.hxx>
#include <tools/helpers.hxx>
#include <svx/svddrag.hxx>
#include <svx/xpool.hxx>
#include <svx/xpoly.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpage.hxx>
#include "svx/svditer.hxx"
#include <svx/svdobj.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoedge.hxx>
#include "svdglob.hxx"
#include "svx/svdstr.hrc"
#include <editeng/eeitem.hxx>
#include "editeng/editstat.hxx"
#include <svx/svdoutl.hxx>
#include <editeng/outlobj.hxx>
#include <svx/sdtfchim.hxx>
#include "svx/EnhancedCustomShapeGeometry.hxx"
#include "svx/EnhancedCustomShapeTypeNames.hxx"
#include "svx/EnhancedCustomShape2d.hxx"
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
#include <editeng/writingmodeitem.hxx>
#include <svx/xlnclit.hxx>
#include <svx/svxids.hrc>
#include <svl/whiter.hxx>
#include <sdr/properties/customshapeproperties.hxx>
#include <sdr/contact/viewcontactofsdrobjcustomshape.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xfltrit.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <vcl/bmpacc.hxx>
#include <svx/svdview.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
2011-06-21 09:11:28 +02:00
#include <basegfx/tools/unotools.hxx>
#include "svdconv.hxx"
#include <svdobjplusdata.hxx>
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
2011-05-09 13:28:30 +02:00
static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, sal_uInt16 nSDat )
{
switch( nSDat >> 8 )
{
case 0x00 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::LINETO;
rSegInfo.Count = nSDat & 0xff;
if ( !rSegInfo.Count )
rSegInfo.Count = 1;
break;
case 0x20 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CURVETO;
rSegInfo.Count = nSDat & 0xff;
if ( !rSegInfo.Count )
rSegInfo.Count = 1;
break;
case 0x40 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::MOVETO;
rSegInfo.Count = nSDat & 0xff;
if ( !rSegInfo.Count )
rSegInfo.Count = 1;
break;
case 0x60 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOSESUBPATH;
rSegInfo.Count = 0;
break;
case 0x80 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
rSegInfo.Count = 0;
break;
case 0xa1 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSETO;
rSegInfo.Count = ( nSDat & 0xff ) / 3;
break;
case 0xa2 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ANGLEELLIPSE;
rSegInfo.Count = ( nSDat & 0xff ) / 3;
break;
case 0xa3 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARCTO;
rSegInfo.Count = ( nSDat & 0xff ) >> 2;
break;
case 0xa4 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ARC;
rSegInfo.Count = ( nSDat & 0xff ) >> 2;
break;
case 0xa5 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARCTO;
rSegInfo.Count = ( nSDat & 0xff ) >> 2;
break;
case 0xa6 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::CLOCKWISEARC;
rSegInfo.Count = ( nSDat & 0xff ) >> 2;
break;
case 0xa7 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTX;
rSegInfo.Count = nSDat & 0xff;
break;
case 0xa8 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::ELLIPTICALQUADRANTY;
rSegInfo.Count = nSDat & 0xff;
break;
case 0xaa :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOFILL;
rSegInfo.Count = 0;
break;
case 0xab :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::NOSTROKE;
rSegInfo.Count = 0;
break;
default:
case 0xf8 :
rSegInfo.Command = EnhancedCustomShapeSegmentCommand::UNKNOWN;
rSegInfo.Count = nSDat;
break;
}
return;
}
static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape )
{
MSO_SPT eRetValue = mso_sptNil;
OUString aEngine( static_cast<const SfxStringItem&>( rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE ) ).GetValue() );
if ( aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" )
{
OUString sShapeType;
const OUString sType( "Type" );
const SdrCustomShapeGeometryItem& rGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(rCustoShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
if ( pAny && ( *pAny >>= sShapeType ) )
eRetValue = EnhancedCustomShapeTypeNames::Get( sShapeType );
}
return eRetValue;
};
static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
{
bool bRet = false;
MSO_SPT eShapeType( ImpGetCustomShapeType( rCustoShape ) );
switch( eShapeType )
{
case mso_sptAccentBorderCallout90 : // 2 ortho
case mso_sptBorderCallout1 : // 2 diag
case mso_sptBorderCallout2 : // 3
{
bRet = true;
}
break;
default: break;
}
return bRet;
}
// #i37011# create a clone with all attributes changed to shadow attributes
// and translation executed, too.
SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet)
{
SdrObject* pRetval = 0L;
const bool bShadow(static_cast<const SdrOnOffItem&>(rOriginalSet.Get(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
// create a shadow representing object
const sal_Int32 nXDist(static_cast<const SdrMetricItem&>(rOriginalSet.Get(SDRATTR_SHADOWXDIST)).GetValue());
const sal_Int32 nYDist(static_cast<const SdrMetricItem&>(rOriginalSet.Get(SDRATTR_SHADOWYDIST)).GetValue());
const ::Color aShadowColor(static_cast<const XColorItem&>(rOriginalSet.Get(SDRATTR_SHADOWCOLOR)).GetColorValue());
const sal_uInt16 nShadowTransparence(static_cast<const SdrPercentItem&>(rOriginalSet.Get(SDRATTR_SHADOWTRANSPARENCE)).GetValue());
pRetval = rOriginal.Clone();
DBG_ASSERT(pRetval, "ImpCreateShadowObjectClone: Could not clone object (!)");
// look for used stuff
SdrObjListIter aIterator(rOriginal);
bool bLineUsed(false);
bool bAllFillUsed(false);
bool bSolidFillUsed(false);
bool bGradientFillUsed(false);
bool bHatchFillUsed(false);
bool bBitmapFillUsed(false);
while(aIterator.IsMore())
{
SdrObject* pObj = aIterator.Next();
drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem&>(pObj->GetMergedItem(XATTR_FILLSTYLE)).GetValue();
if(!bLineUsed)
{
drawing::LineStyle eLineStyle = static_cast<const XLineStyleItem&>(pObj->GetMergedItem(XATTR_LINESTYLE)).GetValue();
if(drawing::LineStyle_NONE != eLineStyle)
{
bLineUsed = true;
}
}
if(!bAllFillUsed)
{
if(!bSolidFillUsed && drawing::FillStyle_SOLID == eFillStyle)
{
bSolidFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bGradientFillUsed && drawing::FillStyle_GRADIENT == eFillStyle)
{
bGradientFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bHatchFillUsed && drawing::FillStyle_HATCH == eFillStyle)
{
bHatchFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bBitmapFillUsed && drawing::FillStyle_BITMAP == eFillStyle)
{
bBitmapFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
}
}
// translate to shadow coordinates
pRetval->NbcMove(Size(nXDist, nYDist));
// set items as needed
SfxItemSet aTempSet(rOriginalSet);
2011-05-09 13:28:30 +02:00
// if a SvxWritingModeItem (Top->Bottom) is set the text object
// is creating a paraobject, but paraobjects can not be created without model. So
// we are preventing the crash by setting the writing mode always left to right,
// this is not bad since our shadow geometry does not contain text.
aTempSet.Put( SvxWritingModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) );
// no shadow
aTempSet.Put(makeSdrShadowItem(false));
aTempSet.Put(makeSdrShadowXDistItem(0L));
aTempSet.Put(makeSdrShadowYDistItem(0L));
// line color and transparency like shadow
if(bLineUsed)
{
aTempSet.Put(XLineColorItem(OUString(), aShadowColor));
aTempSet.Put(XLineTransparenceItem(nShadowTransparence));
}
// fill color and transparency like shadow
if(bSolidFillUsed)
{
aTempSet.Put(XFillColorItem(OUString(), aShadowColor));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
// gradient and transparency like shadow
if(bGradientFillUsed)
{
XGradient aGradient(static_cast<const XFillGradientItem&>(rOriginalSet.Get(XATTR_FILLGRADIENT)).GetGradientValue());
sal_uInt8 nStartLuminance(aGradient.GetStartColor().GetLuminance());
sal_uInt8 nEndLuminance(aGradient.GetEndColor().GetLuminance());
if(aGradient.GetStartIntens() != 100)
{
nStartLuminance = (sal_uInt8)(nStartLuminance * ((double)aGradient.GetStartIntens() / 100.0));
}
if(aGradient.GetEndIntens() != 100)
{
nEndLuminance = (sal_uInt8)(nEndLuminance * ((double)aGradient.GetEndIntens() / 100.0));
}
::Color aStartColor(
(sal_uInt8)((nStartLuminance * aShadowColor.GetRed()) / 256),
(sal_uInt8)((nStartLuminance * aShadowColor.GetGreen()) / 256),
(sal_uInt8)((nStartLuminance * aShadowColor.GetBlue()) / 256));
::Color aEndColor(
(sal_uInt8)((nEndLuminance * aShadowColor.GetRed()) / 256),
(sal_uInt8)((nEndLuminance * aShadowColor.GetGreen()) / 256),
(sal_uInt8)((nEndLuminance * aShadowColor.GetBlue()) / 256));
aGradient.SetStartColor(aStartColor);
aGradient.SetEndColor(aEndColor);
aTempSet.Put(XFillGradientItem(aGradient));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
// hatch and transparency like shadow
if(bHatchFillUsed)
{
XHatch aHatch(static_cast<const XFillHatchItem&>(rOriginalSet.Get(XATTR_FILLHATCH)).GetHatchValue());
aHatch.SetColor(aShadowColor);
aTempSet.Put(XFillHatchItem(aTempSet.GetPool(), aHatch));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
// bitmap and transparency like shadow
if(bBitmapFillUsed)
{
GraphicObject aGraphicObject(static_cast<const XFillBitmapItem&>(rOriginalSet.Get(XATTR_FILLBITMAP)).GetGraphicObject());
const BitmapEx aBitmapEx(aGraphicObject.GetGraphic().GetBitmapEx());
Bitmap aBitmap(aBitmapEx.GetBitmap());
if(!aBitmap.IsEmpty())
{
BitmapReadAccess* pReadAccess = aBitmap.AcquireReadAccess();
if(pReadAccess)
{
Bitmap aDestBitmap(aBitmap.GetSizePixel(), 24L);
BitmapWriteAccess* pWriteAccess = aDestBitmap.AcquireWriteAccess();
if(pWriteAccess)
{
for(long y(0L); y < pReadAccess->Height(); y++)
{
for(long x(0L); x < pReadAccess->Width(); x++)
{
sal_uInt16 nLuminance((sal_uInt16)pReadAccess->GetLuminance(y, x) + 1);
const BitmapColor aDestColor(
(sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetRed()) >> 8L),
(sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetGreen()) >> 8L),
(sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetBlue()) >> 8L));
pWriteAccess->SetPixel(y, x, aDestColor);
}
}
Bitmap::ReleaseAccess(pWriteAccess);
}
Bitmap::ReleaseAccess(pReadAccess);
if(aBitmapEx.IsTransparent())
{
if(aBitmapEx.IsAlpha())
{
aGraphicObject.SetGraphic(Graphic(BitmapEx(aDestBitmap, aBitmapEx.GetAlpha())));
}
else
{
aGraphicObject.SetGraphic(Graphic(BitmapEx(aDestBitmap, aBitmapEx.GetMask())));
}
}
else
{
aGraphicObject.SetGraphic(Graphic(aDestBitmap));
}
}
}
aTempSet.Put(XFillBitmapItem(aTempSet.GetPool(), aGraphicObject));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
}
// set attributes and paint shadow object
pRetval->SetMergedItemSet( aTempSet );
}
return pRetval;
}
Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if (mxCustomShapeEngine.is())
return mxCustomShapeEngine;
OUString aEngine(static_cast<const SfxStringItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
if ( aEngine.isEmpty() )
aEngine = "com.sun.star.drawing.EnhancedCustomShapeEngine";
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Reference< XShape > aXShape = GetXShapeForSdrObject(const_cast<SdrObjCustomShape*>(this));
if ( aXShape.is() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Sequence< Any > aArgument( 1 );
Sequence< PropertyValue > aPropValues( 1 );
aPropValues[ 0 ].Name = "CustomShape";
aPropValues[ 0 ].Value <<= aXShape;
aArgument[ 0 ] <<= aPropValues;
Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) );
if ( xInterface.is() )
mxCustomShapeEngine = Reference< XCustomShapeEngine >( xInterface, UNO_QUERY );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
return mxCustomShapeEngine;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
const SdrObject* SdrObjCustomShape::GetSdrObjectFromCustomShape() const
{
if ( !mXRenderedCustomShape.is() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( xCustomShapeEngine.is() )
const_cast<SdrObjCustomShape*>(this)->mXRenderedCustomShape = xCustomShapeEngine->render();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrObject* pRenderedCustomShape = mXRenderedCustomShape.is()
? GetSdrObjectFromXShape( mXRenderedCustomShape )
: NULL;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
return pRenderedCustomShape;
}
// #i37011# Shadow geometry creation
const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
{
if(!mpLastShadowGeometry)
{
const SdrObject* pSdrObject = GetSdrObjectFromCustomShape();
if(pSdrObject)
{
const SfxItemSet& rOriginalSet = GetObjectItemSet();
const bool bShadow(static_cast<const SdrOnOffItem&>(rOriginalSet.Get( SDRATTR_SHADOW )).GetValue());
if(bShadow)
{
// create a clone with all attributes changed to shadow attributes
// and translation executed, too.
const_cast<SdrObjCustomShape*>(this)->mpLastShadowGeometry =
ImpCreateShadowObjectClone(*pSdrObject, rOriginalSet);
}
}
}
return mpLastShadowGeometry;
}
bool SdrObjCustomShape::IsTextPath() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const OUString sTextPath( "TextPath" );
bool bTextPathOn = false;
const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
const Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( pAny )
*pAny >>= bTextPathOn;
return bTextPathOn;
}
bool SdrObjCustomShape::UseNoFillStyle() const
{
bool bRet = false;
OUString sShapeType;
const OUString sType( "Type" );
const SdrCustomShapeGeometryItem& rGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
if ( pAny )
*pAny >>= sShapeType;
bRet = !IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) );
return bRet;
}
bool SdrObjCustomShape::IsMirroredX() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
bool bMirroredX = false;
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const OUString sMirroredX( "MirroredX" );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX );
if ( pAny )
*pAny >>= bMirroredX;
return bMirroredX;
}
bool SdrObjCustomShape::IsMirroredY() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
bool bMirroredY = false;
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const OUString sMirroredY( "MirroredY" );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY );
if ( pAny )
*pAny >>= bMirroredY;
return bMirroredY;
}
void SdrObjCustomShape::SetMirroredX( const bool bMirrorX )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const OUString sMirroredX( "MirroredX" );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
PropertyValue aPropVal;
aPropVal.Name = sMirroredX;
aPropVal.Value <<= bMirrorX;
aGeometryItem.SetPropertyValue( aPropVal );
SetMergedItem( aGeometryItem );
}
void SdrObjCustomShape::SetMirroredY( const bool bMirrorY )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const OUString sMirroredY( "MirroredY" );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
PropertyValue aPropVal;
aPropVal.Name = sMirroredY;
aPropVal.Value <<= bMirrorY;
aGeometryItem.SetPropertyValue( aPropVal );
SetMergedItem( aGeometryItem );
}
bool SdrObjCustomShape::IsPostRotate() const
{
const com::sun::star::uno::Any* pAny;
bool bPostRotate = false;
const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
pAny = rGeometryItem.GetPropertyValueByName( "IsPostRotateAngle" );
if ( pAny )
*pAny >>= bPostRotate;
return bPostRotate;
}
double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const com::sun::star::uno::Any* pAny;
const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
const OUString sTextRotateAngle( "TextRotateAngle" );
const OUString sTextPreRotateAngle( "TextPreRotateAngle" );
pAny = rGeometryItem.GetPropertyValueByName( bPreRotation ? sTextPreRotateAngle : sTextRotateAngle );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
double fExtraTextRotateAngle = 0.0;
if ( pAny )
*pAny >>= fExtraTextRotateAngle;
return fExtraTextRotateAngle;
}
bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
bool bRet = false;
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( xCustomShapeEngine.is() )
{
awt::Rectangle aR( xCustomShapeEngine->getTextBounds() );
if ( aR.Width > 1 && aR.Height > 1 )
{
rTextBound = Rectangle( Point( aR.X, aR.Y ), Size( aR.Width, aR.Height ) );
bRet = true;
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
return bRet;
}
basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const bool bBezierAllowed ) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
basegfx::B2DPolyPolygon aRetval;
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( xCustomShapeEngine.is() )
{
com::sun::star::drawing::PolyPolygonBezierCoords aBezierCoords = xCustomShapeEngine->getLineGeometry();
try
{
2011-06-21 09:11:28 +02:00
aRetval = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( aBezierCoords );
if ( !bBezierAllowed && aRetval.areControlPointsUsed())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
aRetval = basegfx::tools::adaptiveSubdivideByAngle(aRetval);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
2012-01-06 00:03:58 +09:00
catch ( const com::sun::star::lang::IllegalArgumentException & )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
}
}
return aRetval;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandles() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
std::vector< SdrCustomShapeInteraction > xRet;
try
{
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() );
if ( xCustomShapeEngine.is() )
{
int i;
Sequence< Reference< XCustomShapeHandle > > xInteractionHandles( xCustomShapeEngine->getInteraction() );
for ( i = 0; i < xInteractionHandles.getLength(); i++ )
{
if ( xInteractionHandles[ i ].is() )
{
SdrCustomShapeInteraction aSdrCustomShapeInteraction;
aSdrCustomShapeInteraction.xInteraction = xInteractionHandles[ i ];
aSdrCustomShapeInteraction.aPosition = xInteractionHandles[ i ]->getPosition();
CustomShapeHandleModes nMode = CustomShapeHandleModes::NONE;
switch( ImpGetCustomShapeType( *this ) )
{
case mso_sptAccentBorderCallout90 : // 2 ortho
{
if (i == 0)
nMode |= CustomShapeHandleModes::RESIZE_FIXED | CustomShapeHandleModes::CREATE_FIXED;
else if (i == 1)
nMode |= CustomShapeHandleModes::RESIZE_ABSOLUTE_X | CustomShapeHandleModes::RESIZE_ABSOLUTE_Y | CustomShapeHandleModes::MOVE_SHAPE | CustomShapeHandleModes::ORTHO4;
}
break;
case mso_sptWedgeRectCallout :
case mso_sptWedgeRRectCallout :
case mso_sptCloudCallout :
case mso_sptWedgeEllipseCallout :
{
if (i == 0)
nMode |= CustomShapeHandleModes::RESIZE_FIXED;
}
break;
case mso_sptBorderCallout1 : // 2 diag
{
if (i == 0)
nMode |= CustomShapeHandleModes::RESIZE_FIXED | CustomShapeHandleModes::CREATE_FIXED;
else if (i == 1)
nMode |= CustomShapeHandleModes::RESIZE_ABSOLUTE_X | CustomShapeHandleModes::RESIZE_ABSOLUTE_Y | CustomShapeHandleModes::MOVE_SHAPE;
}
break;
case mso_sptBorderCallout2 : // 3
{
if (i == 0)
nMode |= CustomShapeHandleModes::RESIZE_FIXED | CustomShapeHandleModes::CREATE_FIXED;
else if (i == 2)
nMode |= CustomShapeHandleModes::RESIZE_ABSOLUTE_X | CustomShapeHandleModes::RESIZE_ABSOLUTE_Y | CustomShapeHandleModes::MOVE_SHAPE;
}
break;
case mso_sptCallout90 :
case mso_sptAccentCallout90 :
case mso_sptBorderCallout90 :
case mso_sptCallout1 :
case mso_sptCallout2 :
case mso_sptCallout3 :
case mso_sptAccentCallout1 :
case mso_sptAccentCallout2 :
case mso_sptAccentCallout3 :
case mso_sptBorderCallout3 :
case mso_sptAccentBorderCallout1 :
case mso_sptAccentBorderCallout2 :
case mso_sptAccentBorderCallout3 :
{
if (i == 0)
nMode |= CustomShapeHandleModes::RESIZE_FIXED | CustomShapeHandleModes::CREATE_FIXED;
}
break;
default: break;
}
aSdrCustomShapeInteraction.nMode = nMode;
xRet.push_back( aSdrCustomShapeInteraction );
}
}
}
}
catch( const uno::RuntimeException& )
{
}
return xRet;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// BaseProperties section
#define DEFAULT_MINIMUM_SIGNED_COMPARE ((sal_Int32)0x80000000)
#define DEFAULT_MAXIMUM_SIGNED_COMPARE ((sal_Int32)0x7fffffff)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
2011-05-09 13:28:30 +02:00
static sal_Int32 GetNumberOfProperties ( const SvxMSDffHandle* pData )
{
sal_Int32 nPropertiesNeeded=1; // position is always needed
SvxMSDffHandleFlags nFlags = pData->nFlags;
2011-05-09 13:28:30 +02:00
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_X )
2011-05-09 13:28:30 +02:00
nPropertiesNeeded++;
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_Y )
2011-05-09 13:28:30 +02:00
nPropertiesNeeded++;
if ( nFlags & SvxMSDffHandleFlags::SWITCHED )
2011-05-09 13:28:30 +02:00
nPropertiesNeeded++;
if ( nFlags & SvxMSDffHandleFlags::POLAR )
2011-05-09 13:28:30 +02:00
{
nPropertiesNeeded++;
if ( nFlags & SvxMSDffHandleFlags::RADIUS_RANGE )
2011-05-09 13:28:30 +02:00
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
}
}
else if ( nFlags & SvxMSDffHandleFlags::RANGE )
2011-05-09 13:28:30 +02:00
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
nPropertiesNeeded++;
}
return nPropertiesNeeded;
}
static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::star::beans::PropertyValues& rPropValues )
{
SvxMSDffHandleFlags nFlags = pData->nFlags;
sal_Int32 n=0;
2011-05-09 13:28:30 +02:00
// POSITION
{
const OUString sPosition( "Position" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true );
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sPosition;
rPropValues[ n++ ].Value <<= aPosition;
}
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_X )
2011-05-09 13:28:30 +02:00
{
const OUString sMirroredX( "MirroredX" );
bool bMirroredX = true;
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sMirroredX;
rPropValues[ n++ ].Value <<= bMirroredX;
}
if ( nFlags & SvxMSDffHandleFlags::MIRRORED_Y )
2011-05-09 13:28:30 +02:00
{
const OUString sMirroredY( "MirroredY" );
bool bMirroredY = true;
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sMirroredY;
rPropValues[ n++ ].Value <<= bMirroredY;
}
if ( nFlags & SvxMSDffHandleFlags::SWITCHED )
2011-05-09 13:28:30 +02:00
{
const OUString sSwitched( "Switched" );
bool bSwitched = true;
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sSwitched;
rPropValues[ n++ ].Value <<= bSwitched;
}
if ( nFlags & SvxMSDffHandleFlags::POLAR )
2011-05-09 13:28:30 +02:00
{
const OUString sPolar( "Polar" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX,
bool( nFlags & SvxMSDffHandleFlags::CENTER_X_IS_SPECIAL ), true );
2011-05-09 13:28:30 +02:00
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY,
bool( nFlags & SvxMSDffHandleFlags::CENTER_Y_IS_SPECIAL ), false );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sPolar;
rPropValues[ n++ ].Value <<= aCenter;
if ( nFlags & SvxMSDffHandleFlags::RADIUS_RANGE )
2011-05-09 13:28:30 +02:00
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
const OUString sRadiusRangeMinimum( "RadiusRangeMinimum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRadiusRangeMinimum;
rPropValues[ n++ ].Value <<= aRadiusRangeMinimum;
}
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
const OUString sRadiusRangeMaximum( "RadiusRangeMaximum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRadiusRangeMaximum;
rPropValues[ n++ ].Value <<= aRadiusRangeMaximum;
}
}
}
else if ( nFlags & SvxMSDffHandleFlags::RANGE )
2011-05-09 13:28:30 +02:00
{
if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
const OUString sRangeXMinimum( "RangeXMinimum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRangeXMinimum;
rPropValues[ n++ ].Value <<= aRangeXMinimum;
}
if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
const OUString sRangeXMaximum( "RangeXMaximum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRangeXMaximum;
rPropValues[ n++ ].Value <<= aRangeXMaximum;
}
if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE )
{
const OUString sRangeYMinimum( "RangeYMinimum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin,
bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL ), true );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRangeYMinimum;
rPropValues[ n++ ].Value <<= aRangeYMinimum;
}
if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE )
{
const OUString sRangeYMaximum( "RangeYMaximum" );
2011-05-09 13:28:30 +02:00
::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum;
EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax,
bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL ), false );
2011-05-09 13:28:30 +02:00
rPropValues[ n ].Name = sRangeYMaximum;
rPropValues[ n++ ].Value <<= aRangeYMaximum;
}
}
return;
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperties()
{
return new sdr::properties::CustomShapeProperties(*this);
}
TYPEINIT1(SdrObjCustomShape,SdrTextObj);
SdrObjCustomShape::SdrObjCustomShape() :
SdrTextObj(),
fObjectRotation( 0.0 ),
mpLastShadowGeometry(0L)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
bClosedObj = true; // custom shapes may be filled
bTextFrame = true;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrObjCustomShape::~SdrObjCustomShape()
{
// delete buffered display geometry
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
{
PropertyValue aPropVal;
OUString sShapeType;
const OUString sType( "Type" );
SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
if ( pType && !pType->isEmpty() )
{
sal_Int32 nType = pType->toInt32();
if ( nType )
sShapeType = EnhancedCustomShapeTypeNames::Get( static_cast< MSO_SPT >( nType ) );
else
sShapeType = *pType;
aPropVal.Name = sType;
aPropVal.Value <<= sShapeType;
aGeometryItem.SetPropertyValue( aPropVal );
}
else
{
Any *pAny = aGeometryItem.GetPropertyValueByName( sType );
if ( pAny )
*pAny >>= sShapeType;
}
MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
const sal_Int32* pDefData = NULL;
const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
if ( pDefCustomShape )
pDefData = pDefCustomShape->pDefData;
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues;
// AdjustmentValues
const OUString sAdjustmentValues( "AdjustmentValues" );
const Any* pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sAdjustmentValues );
if ( pAny )
*pAny >>= seqAdjustmentValues;
if ( pDefCustomShape && pDefData ) // now check if we have to default some adjustment values
{
// first check if there are adjustment values are to be appended
sal_Int32 i, nAdjustmentValues = seqAdjustmentValues.getLength();
sal_Int32 nAdjustmentDefaults = *pDefData++;
if ( nAdjustmentDefaults > nAdjustmentValues )
{
seqAdjustmentValues.realloc( nAdjustmentDefaults );
for ( i = nAdjustmentValues; i < nAdjustmentDefaults; i++ )
{
seqAdjustmentValues[ i ].Value <<= pDefData[ i ];
2012-01-24 12:43:39 +05:30
seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
}
}
// check if there are defaulted adjustment values that should be filled the hard coded defaults (pDefValue)
sal_Int32 nCount = nAdjustmentValues > nAdjustmentDefaults ? nAdjustmentDefaults : nAdjustmentValues;
for ( i = 0; i < nCount; i++ )
{
if ( seqAdjustmentValues[ i ].State != com::sun::star::beans::PropertyState_DIRECT_VALUE )
{
seqAdjustmentValues[ i ].Value <<= pDefData[ i ];
seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
}
}
}
aPropVal.Name = sAdjustmentValues;
aPropVal.Value <<= seqAdjustmentValues;
aGeometryItem.SetPropertyValue( aPropVal );
// Coordsize
const OUString sViewBox( "ViewBox" );
const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox );
com::sun::star::awt::Rectangle aViewBox;
if ( !pViewBox || !(*pViewBox >>= aViewBox ) )
{
if ( pDefCustomShape )
{
aViewBox.X = 0;
aViewBox.Y = 0;
aViewBox.Width = pDefCustomShape->nCoordWidth;
aViewBox.Height= pDefCustomShape->nCoordHeight;
aPropVal.Name = sViewBox;
aPropVal.Value <<= aViewBox;
aGeometryItem.SetPropertyValue( aPropVal );
}
}
const OUString sPath( "Path" );
// Path/Coordinates
const OUString sCoordinates( "Coordinates" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates );
if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates;
sal_Int32 i, nCount = pDefCustomShape->nVertices;
seqCoordinates.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates[ i ].First, pDefCustomShape->pVertices[ i ].nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates[ i ].Second, pDefCustomShape->pVertices[ i ].nValB );
}
aPropVal.Name = sCoordinates;
aPropVal.Value <<= seqCoordinates;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
// Path/GluePoints
const OUString sGluePoints( "GluePoints" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints );
if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqGluePoints;
sal_Int32 i, nCount = pDefCustomShape->nGluePoints;
seqGluePoints.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints[ i ].First, pDefCustomShape->pGluePoints[ i ].nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints[ i ].Second, pDefCustomShape->pGluePoints[ i ].nValB );
}
aPropVal.Name = sGluePoints;
aPropVal.Value <<= seqGluePoints;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
// Path/Segments
const OUString sSegments( "Segments" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments );
if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments;
sal_Int32 i, nCount = pDefCustomShape->nElements;
seqSegments.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShapeSegment& rSegInfo = seqSegments[ i ];
sal_uInt16 nSDat = pDefCustomShape->pElements[ i ];
2011-05-09 13:28:30 +02:00
lcl_ShapeSegmentFromBinary( rSegInfo, nSDat );
}
aPropVal.Name = sSegments;
aPropVal.Value <<= seqSegments;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
// Path/StretchX
const OUString sStretchX( "StretchX" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX );
if ( !pAny && pDefCustomShape )
{
sal_Int32 nXRef = pDefCustomShape->nXRef;
if ( ( nXRef != DEFAULT_MINIMUM_SIGNED_COMPARE ) )
{
aPropVal.Name = sStretchX;
aPropVal.Value <<= nXRef;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
}
// Path/StretchY
const OUString sStretchY( "StretchY" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY );
if ( !pAny && pDefCustomShape )
{
sal_Int32 nYRef = pDefCustomShape->nYRef;
if ( ( nYRef != DEFAULT_MINIMUM_SIGNED_COMPARE ) )
{
aPropVal.Name = sStretchY;
aPropVal.Value <<= nYRef;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
}
// Path/TextFrames
const OUString sTextFrames( "TextFrames" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames );
if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > seqTextFrames;
sal_Int32 i, nCount = pDefCustomShape->nTextRect;
seqTextFrames.realloc( nCount );
const SvxMSDffTextRectangles* pRectangles = pDefCustomShape->pTextRect;
for ( i = 0; i < nCount; i++, pRectangles++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames[ i ].TopLeft.First, pRectangles->nPairA.nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames[ i ].TopLeft.Second, pRectangles->nPairA.nValB );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames[ i ].BottomRight.First, pRectangles->nPairB.nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames[ i ].BottomRight.Second, pRectangles->nPairB.nValB );
}
aPropVal.Name = sTextFrames;
aPropVal.Value <<= seqTextFrames;
aGeometryItem.SetPropertyValue( sPath, aPropVal );
}
// Equations
const OUString sEquations( "Equations" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations );
if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
{
com::sun::star::uno::Sequence< OUString > seqEquations;
sal_Int32 i, nCount = pDefCustomShape->nCalculation;
seqEquations.realloc( nCount );
const SvxMSDffCalculationData* pData = pDefCustomShape->pCalculation;
for ( i = 0; i < nCount; i++, pData++ )
seqEquations[ i ] = EnhancedCustomShape2d::GetEquation( pData->nFlags, pData->nVal[ 0 ], pData->nVal[ 1 ], pData->nVal[ 2 ] );
aPropVal.Name = sEquations;
aPropVal.Value <<= seqEquations;
aGeometryItem.SetPropertyValue( aPropVal );
}
// Handles
const OUString sHandles( "Handles" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles );
if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
{
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles;
2011-05-09 13:28:30 +02:00
sal_Int32 i, nCount = pDefCustomShape->nHandles;
const SvxMSDffHandle* pData = pDefCustomShape->pHandles;
seqHandles.realloc( nCount );
for ( i = 0; i < nCount; i++, pData++ )
{
2011-05-09 13:28:30 +02:00
sal_Int32 nPropertiesNeeded;
com::sun::star::beans::PropertyValues& rPropValues = seqHandles[ i ];
2011-05-09 13:28:30 +02:00
nPropertiesNeeded = GetNumberOfProperties( pData );
rPropValues.realloc( nPropertiesNeeded );
2011-05-09 13:28:30 +02:00
lcl_ShapePropertiesFromDFF( pData, rPropValues );
}
aPropVal.Name = sHandles;
aPropVal.Value <<= seqHandles;
aGeometryItem.SetPropertyValue( aPropVal );
}
SetMergedItem( aGeometryItem );
}
bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) const
{
bool bIsDefaultGeometry = false;
PropertyValue aPropVal;
OUString sShapeType;
const OUString sType( "Type" );
const SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )) );
const Any *pAny = aGeometryItem.GetPropertyValueByName( sType );
if ( pAny )
*pAny >>= sShapeType;
MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
const OUString sPath( "Path" );
switch( eDefaultType )
{
case DEFAULT_VIEWBOX :
{
const OUString sViewBox( "ViewBox" );
const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox );
com::sun::star::awt::Rectangle aViewBox;
if ( pViewBox && ( *pViewBox >>= aViewBox ) )
{
if ( ( aViewBox.Width == pDefCustomShape->nCoordWidth )
&& ( aViewBox.Height == pDefCustomShape->nCoordHeight ) )
bIsDefaultGeometry = true;
}
}
break;
case DEFAULT_PATH :
{
const OUString sCoordinates( "Coordinates" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates );
if ( pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2;
if ( *pAny >>= seqCoordinates1 )
{
sal_Int32 i, nCount = pDefCustomShape->nVertices;
seqCoordinates2.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ i ].First, pDefCustomShape->pVertices[ i ].nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ i ].Second, pDefCustomShape->pVertices[ i ].nValB );
}
if ( seqCoordinates1 == seqCoordinates2 )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nVertices == 0 ) || ( pDefCustomShape->pVertices == 0 ) ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_GLUEPOINTS :
{
const OUString sGluePoints( "GluePoints" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints );
if ( pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqGluePoints1, seqGluePoints2;
if ( *pAny >>= seqGluePoints1 )
{
sal_Int32 i, nCount = pDefCustomShape->nGluePoints;
seqGluePoints2.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints2[ i ].First, pDefCustomShape->pGluePoints[ i ].nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints2[ i ].Second, pDefCustomShape->pGluePoints[ i ].nValB );
}
if ( seqGluePoints1 == seqGluePoints2 )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nGluePoints == 0 ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_SEGMENTS :
{
// Path/Segments
const OUString sSegments( "Segments" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments );
if ( pAny )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments1, seqSegments2;
if ( *pAny >>= seqSegments1 )
{
if ( pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements )
{
sal_Int32 i, nCount = pDefCustomShape->nElements;
if ( nCount )
{
seqSegments2.realloc( nCount );
for ( i = 0; i < nCount; i++ )
{
EnhancedCustomShapeSegment& rSegInfo = seqSegments2[ i ];
sal_uInt16 nSDat = pDefCustomShape->pElements[ i ];
2011-05-09 13:28:30 +02:00
lcl_ShapeSegmentFromBinary( rSegInfo, nSDat );
}
if ( seqSegments1 == seqSegments2 )
bIsDefaultGeometry = true;
}
}
else
{
// check if its the default segment description ( M L Z N )
if ( seqSegments1.getLength() == 4 )
{
if ( ( seqSegments1[ 0 ].Command == EnhancedCustomShapeSegmentCommand::MOVETO )
&& ( seqSegments1[ 1 ].Command == EnhancedCustomShapeSegmentCommand::LINETO )
&& ( seqSegments1[ 2 ].Command == EnhancedCustomShapeSegmentCommand::CLOSESUBPATH )
&& ( seqSegments1[ 3 ].Command == EnhancedCustomShapeSegmentCommand::ENDSUBPATH ) )
bIsDefaultGeometry = true;
}
}
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nElements == 0 ) || ( pDefCustomShape->pElements == 0 ) ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_STRETCHX :
{
const OUString sStretchX( "StretchX" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX );
if ( pAny && pDefCustomShape )
{
sal_Int32 nStretchX = 0;
if ( *pAny >>= nStretchX )
{
if ( pDefCustomShape->nXRef == nStretchX )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nXRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_STRETCHY :
{
const OUString sStretchY( "StretchY" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY );
if ( pAny && pDefCustomShape )
{
sal_Int32 nStretchY = 0;
if ( *pAny >>= nStretchY )
{
if ( pDefCustomShape->nYRef == nStretchY )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nYRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_EQUATIONS :
{
const OUString sEquations( "Equations" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations );
if ( pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
{
com::sun::star::uno::Sequence< OUString > seqEquations1, seqEquations2;
if ( *pAny >>= seqEquations1 )
{
sal_Int32 i, nCount = pDefCustomShape->nCalculation;
seqEquations2.realloc( nCount );
const SvxMSDffCalculationData* pData = pDefCustomShape->pCalculation;
for ( i = 0; i < nCount; i++, pData++ )
seqEquations2[ i ] = EnhancedCustomShape2d::GetEquation( pData->nFlags, pData->nVal[ 0 ], pData->nVal[ 1 ], pData->nVal[ 2 ] );
if ( seqEquations1 == seqEquations2 )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nCalculation == 0 ) || ( pDefCustomShape->pCalculation == 0 ) ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_TEXTFRAMES :
{
const OUString sTextFrames( "TextFrames" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames );
if ( pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect )
{
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > seqTextFrames1, seqTextFrames2;
if ( *pAny >>= seqTextFrames1 )
{
sal_Int32 i, nCount = pDefCustomShape->nTextRect;
seqTextFrames2.realloc( nCount );
const SvxMSDffTextRectangles* pRectangles = pDefCustomShape->pTextRect;
for ( i = 0; i < nCount; i++, pRectangles++ )
{
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].TopLeft.First, pRectangles->nPairA.nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].TopLeft.Second, pRectangles->nPairA.nValB );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].BottomRight.First, pRectangles->nPairB.nValA );
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].BottomRight.Second, pRectangles->nPairB.nValB );
}
if ( seqTextFrames1 == seqTextFrames2 )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nTextRect == 0 ) || ( pDefCustomShape->pTextRect == 0 ) ) )
bIsDefaultGeometry = true;
}
break;
case DEFAULT_HANDLES :
{
const OUString sHandles( "Handles" );
pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles );
if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
{
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles1, seqHandles2;
if ( *pAny >>= seqHandles1 )
{
2011-05-09 13:28:30 +02:00
sal_Int32 i, nCount = pDefCustomShape->nHandles;
const SvxMSDffHandle* pData = pDefCustomShape->pHandles;
seqHandles2.realloc( nCount );
for ( i = 0; i < nCount; i++, pData++ )
{
2011-05-09 13:28:30 +02:00
sal_Int32 nPropertiesNeeded;
com::sun::star::beans::PropertyValues& rPropValues = seqHandles2[ i ];
2011-05-09 13:28:30 +02:00
nPropertiesNeeded = GetNumberOfProperties( pData );
rPropValues.realloc( nPropertiesNeeded );
2011-05-09 13:28:30 +02:00
lcl_ShapePropertiesFromDFF( pData, rPropValues );
}
if ( seqHandles1 == seqHandles2 )
bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == 0 ) ) )
bIsDefaultGeometry = true;
}
break;
}
return bIsDefaultGeometry;
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
rInfo.bResizePropAllowed=true;
rInfo.bRotateFreeAllowed=true;
rInfo.bRotate90Allowed =true;
rInfo.bMirrorFreeAllowed=true;
rInfo.bMirror45Allowed =true;
rInfo.bMirror90Allowed =true;
rInfo.bTransparenceAllowed = false;
rInfo.bGradientAllowed = false;
rInfo.bShearAllowed =true;
rInfo.bEdgeRadiusAllowed=false;
rInfo.bNoContortion =true;
// #i37011#
if ( mXRenderedCustomShape.is() )
{
const SdrObject* pRenderedCustomShape = GetSdrObjectFromXShape( mXRenderedCustomShape );
if ( pRenderedCustomShape )
{
// #i37262#
// Iterate self over the contained objects, since there are combinations of
// polygon and curve objects. In that case, aInfo.bCanConvToPath and
// aInfo.bCanConvToPoly would be false. What is needed here is an or, not an and.
SdrObjListIter aIterator(*pRenderedCustomShape);
while(aIterator.IsMore())
{
SdrObject* pCandidate = aIterator.Next();
SdrObjTransformInfoRec aInfo;
pCandidate->TakeObjInfo(aInfo);
// set path and poly conversion if one is possible since
// this object will first be broken
const bool bCanConvToPathOrPoly(aInfo.bCanConvToPath || aInfo.bCanConvToPoly);
if(rInfo.bCanConvToPath != bCanConvToPathOrPoly)
{
rInfo.bCanConvToPath = bCanConvToPathOrPoly;
}
if(rInfo.bCanConvToPoly != bCanConvToPathOrPoly)
{
rInfo.bCanConvToPoly = bCanConvToPathOrPoly;
}
if(rInfo.bCanConvToContour != aInfo.bCanConvToContour)
{
rInfo.bCanConvToContour = aInfo.bCanConvToContour;
}
if(rInfo.bShearAllowed != aInfo.bShearAllowed)
{
rInfo.bShearAllowed = aInfo.bShearAllowed;
}
}
}
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
{
SdrTextObj::SetModel(pNewModel);
mXRenderedCustomShape.clear();
}
CWS-TOOLING: integrate CWS impress178 2009-10-16 19:54:41 +0200 sj r276995 : removed warning 2009-10-16 17:46:12 +0200 sj r276993 : #i103757# applied patch (fixed crash if model changes) 2009-10-16 16:06:07 +0200 sj r276985 : CWS-TOOLING: rebase CWS impress178 to branches/OOO320@276942 (milestone: OOO320:m2) 2009-10-08 13:51:23 +0200 sj r276790 : #i105654# fixed closing of line geometry 2009-10-07 17:26:56 +0200 sj r276762 : #i105606# fixed object shadow 2009-10-07 17:25:39 +0200 sj r276761 : minor improvements 2009-10-07 11:48:26 +0200 af r276745 : #i103047# Prevent context menu of LayoutMenu from being shown when user clicks on background. 2009-10-07 11:33:59 +0200 af r276743 : #i99866# Set position of the design control manually. 2009-10-06 17:18:23 +0200 sj r276721 : minor improvements 2009-10-05 18:34:23 +0200 sj r276692 : #105606# fixed fontsize problem 2009-10-05 17:26:21 +0200 af r276691 : #i105354# Never process more than one request in a row. 2009-10-02 13:24:25 +0200 af r276639 : #i94242# Taking insertion position of slide sorter correctly into account. 2009-10-01 13:46:47 +0200 aw r276602 : #i102224# some Polygon/PolyPolygon usages in SVMConverter ignored the possible curve status of tools::Polygon; added at least an AdaptiveSubdivide 2009-10-01 12:33:56 +0200 aw r276588 : #i102224# ImplWritePolyPolygon killed the curve information at the PolyPolygon by NOT copying the flags 2009-09-30 17:48:56 +0200 aw r276567 : #i102224# removed GetSimple() from Polygon and PolyPolygon, replaced completely with AdaptiveSubdivide 2009-09-30 15:45:46 +0200 aw r276559 : #i102048# secured primitive creation for dimension lines with linestyle none 2009-09-30 14:56:41 +0200 af r276556 : #i105471# Reordered statements in ~SdModule. 2009-09-30 14:47:12 +0200 aw r276555 : #i105373# corrected curve ignoring places in MetaFile export
2009-10-27 15:01:25 +00:00
sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return sal_uInt16(OBJ_CUSTOMSHAPE);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::RecalcSnapRect()
{
SdrTextObj::RecalcSnapRect();
}
const Rectangle& SdrObjCustomShape::GetSnapRect() const
{
return SdrTextObj::GetSnapRect();
}
const Rectangle& SdrObjCustomShape::GetCurrentBoundRect() const
{
return SdrTextObj::GetCurrentBoundRect();
}
const Rectangle& SdrObjCustomShape::GetLogicRect() const
{
return SdrTextObj::GetLogicRect();
}
// #115391# This implementation is based on the TextFrame size of the CustomShape and the
// state of the ResizeShapeToFitText flag to correctly set TextMinFrameWidth/Height
void SdrObjCustomShape::AdaptTextMinSize()
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if(!pModel || !pModel->IsPasteResize())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const bool bResizeShapeToFitText(static_cast< const SdrOnOffItem& >(GetObjectItem(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue());
SfxItemSet aSet(
*GetObjectItemSet().GetPool(),
SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH, // contains SDRATTR_TEXT_MAXFRAMEWIDTH
0, 0);
bool bChanged(false);
if(bResizeShapeToFitText)
{
// always reset MinWidthHeight to zero to only rely on text size and frame size
// to allow resizing being completely dependent on text size only
aSet.Put(makeSdrTextMinFrameWidthItem(0));
aSet.Put(makeSdrTextMinFrameHeightItem(0));
bChanged = true;
}
else
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// recreate from CustomShape-specific TextBounds
Rectangle aTextBound(maRect);
if(GetTextBounds(aTextBound))
{
const long nHDist(GetTextLeftDistance() + GetTextRightDistance());
const long nVDist(GetTextUpperDistance() + GetTextLowerDistance());
const long nTWdt(std::max(long(0), (long)(aTextBound.GetWidth() - 1 - nHDist)));
const long nTHgt(std::max(long(0), (long)(aTextBound.GetHeight() - 1 - nVDist)));
aSet.Put(makeSdrTextMinFrameWidthItem(nTWdt));
aSet.Put(makeSdrTextMinFrameHeightItem(nTHgt));
bChanged = true;
}
}
if(bChanged)
SetObjectItemSet(aSet);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
void SdrObjCustomShape::NbcSetSnapRect( const Rectangle& rRect )
{
maRect = rRect;
ImpJustifyRect(maRect);
InvalidateRenderGeometry();
// #115391#
AdaptTextMinSize();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
ImpCheckShear();
SetRectsDirty();
SetChanged();
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::SetSnapRect( const Rectangle& rRect )
{
Rectangle aBoundRect0;
if ( pUserCall )
aBoundRect0 = GetLastBoundRect();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
NbcSetSnapRect( rRect );
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::NbcSetLogicRect( const Rectangle& rRect )
{
maRect = rRect;
ImpJustifyRect(maRect);
InvalidateRenderGeometry();
// #115391#
AdaptTextMinSize();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
SetRectsDirty();
SetChanged();
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::SetLogicRect( const Rectangle& rRect )
{
Rectangle aBoundRect0;
if ( pUserCall )
aBoundRect0 = GetLastBoundRect();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
NbcSetLogicRect(rRect);
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::Move( const Size& rSiz )
{
if ( rSiz.Width() || rSiz.Height() )
{
Rectangle aBoundRect0;
if ( pUserCall )
aBoundRect0 = GetLastBoundRect();
NbcMove(rSiz);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_MOVEONLY,aBoundRect0);
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcMove( const Size& rSiz )
{
SdrTextObj::NbcMove( rSiz );
if ( mXRenderedCustomShape.is() )
{
SdrObject* pRenderedCustomShape = GetSdrObjectFromXShape( mXRenderedCustomShape );
if ( pRenderedCustomShape )
CWS-TOOLING: integrate CWS aw061 2009-01-13 19:18:08 +0100 aw r266250 : #i96669# changed initialisation order in Embedded3DPrimitive2D::Embedded3DPrimitive2D due to TinderBox 2009-01-13 19:15:37 +0100 aw r266249 : #i96669# changed initialisation order in Embedded3DPrimitive2D::Embedded3DPrimitive2D due to TinderBox 2009-01-12 11:53:37 +0100 aw r266141 : #i97874# corrected include for TinderBox build 2009-01-08 17:48:23 +0100 aw r266029 : #i97874# extended SdrTextObj::ImpConvertAddText to copy needed attributes from original object 2009-01-08 14:59:08 +0100 aw r266015 : #i96350# added fallback to solid fill in shadow TabPage when no fill is defined to get a reasonable shadow preview 2009-01-08 12:40:49 +0100 aw r265995 : #i94832# remuved not needed E3DModifySceneSnapRectUpdater usages 2009-01-08 01:53:46 +0100 thb r265982 : #i94860# Blacklisting another ATI card/driver that causes blank screens 2009-01-08 01:46:38 +0100 thb r265981 : #i97853# Changed all gradient texture methods to use basegfx gradienttools. consolidated quite some code 2009-01-08 01:45:09 +0100 thb r265980 : #i97853# Added lerp methods, slight changes to have everything necessary contained in the ODFGradientInfo struct 2009-01-08 00:01:54 +0100 thb r265979 : #i97853# First part of the move - duplicated the stuff to basegfx 2009-01-06 16:23:09 +0100 aw r265930 : #i97197# Changed SwDrawVirtObj to work well with changed aOutRect and bBoundRectValid functionality 2009-01-06 12:41:24 +0100 aw r265909 : #i97784# corrected regression with connectors 2009-01-05 17:30:31 +0100 aw r265881 : #i97772# added missing usage of reduce factor for BitmapPrimitive creation 2009-01-05 12:24:01 +0100 aw r265863 : #i97321# added direct handling of HatchTexturePrimitive3D to not use it's decomposition for HitTest 2008-12-23 13:57:27 +0100 aw r265782 : #i96669# changed SW's FlyFrame paint fallback with primitives to use createLocalDecomposition since get2Decomposition does not have to stay virtual on the long run 2008-12-23 13:47:59 +0100 aw r265781 : #i96669# optimized impCreateTextPortionPrimitive to only create TextDecoratedPortionPrimitive2D when needed 2008-12-23 13:44:45 +0100 aw r265780 : #i96669# added B2DRange buffering to some primitive implementations where it is most necessary 2008-12-19 15:45:45 +0100 aw r265729 : #i96669# prepared TextPrimitives to work without DXarray, too. Had to rework impSplitSingleWords which gets active when a text portion has some word-wise decorations. Tested before committing 2008-12-19 15:44:16 +0100 aw r265728 : #i96669# corrected error in createPolygonFromUnitEllipseSegment which popped up when investigating 2008-12-18 17:45:58 +0100 aw r265708 : #i97149# added ActionChanged() call when visualisation object is modified 2008-12-18 15:34:42 +0100 aw r265695 : #i96598# corrected SdrPageObj's usage of aOutRect 2008-12-17 16:59:37 +0100 aw r265647 : #i96537# exchanged the marker for point number in string with correct one 2008-12-16 17:50:33 +0100 aw r265566 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:50:17 +0100 aw r265565 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:50:00 +0100 aw r265564 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:49:48 +0100 aw r265563 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:49:35 +0100 aw r265562 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer
2009-01-20 09:49:16 +00:00
{
// #i97149# the visualisation shape needs to be informed
// about change, too
pRenderedCustomShape->ActionChanged();
pRenderedCustomShape->NbcMove( rSiz );
CWS-TOOLING: integrate CWS aw061 2009-01-13 19:18:08 +0100 aw r266250 : #i96669# changed initialisation order in Embedded3DPrimitive2D::Embedded3DPrimitive2D due to TinderBox 2009-01-13 19:15:37 +0100 aw r266249 : #i96669# changed initialisation order in Embedded3DPrimitive2D::Embedded3DPrimitive2D due to TinderBox 2009-01-12 11:53:37 +0100 aw r266141 : #i97874# corrected include for TinderBox build 2009-01-08 17:48:23 +0100 aw r266029 : #i97874# extended SdrTextObj::ImpConvertAddText to copy needed attributes from original object 2009-01-08 14:59:08 +0100 aw r266015 : #i96350# added fallback to solid fill in shadow TabPage when no fill is defined to get a reasonable shadow preview 2009-01-08 12:40:49 +0100 aw r265995 : #i94832# remuved not needed E3DModifySceneSnapRectUpdater usages 2009-01-08 01:53:46 +0100 thb r265982 : #i94860# Blacklisting another ATI card/driver that causes blank screens 2009-01-08 01:46:38 +0100 thb r265981 : #i97853# Changed all gradient texture methods to use basegfx gradienttools. consolidated quite some code 2009-01-08 01:45:09 +0100 thb r265980 : #i97853# Added lerp methods, slight changes to have everything necessary contained in the ODFGradientInfo struct 2009-01-08 00:01:54 +0100 thb r265979 : #i97853# First part of the move - duplicated the stuff to basegfx 2009-01-06 16:23:09 +0100 aw r265930 : #i97197# Changed SwDrawVirtObj to work well with changed aOutRect and bBoundRectValid functionality 2009-01-06 12:41:24 +0100 aw r265909 : #i97784# corrected regression with connectors 2009-01-05 17:30:31 +0100 aw r265881 : #i97772# added missing usage of reduce factor for BitmapPrimitive creation 2009-01-05 12:24:01 +0100 aw r265863 : #i97321# added direct handling of HatchTexturePrimitive3D to not use it's decomposition for HitTest 2008-12-23 13:57:27 +0100 aw r265782 : #i96669# changed SW's FlyFrame paint fallback with primitives to use createLocalDecomposition since get2Decomposition does not have to stay virtual on the long run 2008-12-23 13:47:59 +0100 aw r265781 : #i96669# optimized impCreateTextPortionPrimitive to only create TextDecoratedPortionPrimitive2D when needed 2008-12-23 13:44:45 +0100 aw r265780 : #i96669# added B2DRange buffering to some primitive implementations where it is most necessary 2008-12-19 15:45:45 +0100 aw r265729 : #i96669# prepared TextPrimitives to work without DXarray, too. Had to rework impSplitSingleWords which gets active when a text portion has some word-wise decorations. Tested before committing 2008-12-19 15:44:16 +0100 aw r265728 : #i96669# corrected error in createPolygonFromUnitEllipseSegment which popped up when investigating 2008-12-18 17:45:58 +0100 aw r265708 : #i97149# added ActionChanged() call when visualisation object is modified 2008-12-18 15:34:42 +0100 aw r265695 : #i96598# corrected SdrPageObj's usage of aOutRect 2008-12-17 16:59:37 +0100 aw r265647 : #i96537# exchanged the marker for point number in string with correct one 2008-12-16 17:50:33 +0100 aw r265566 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:50:17 +0100 aw r265565 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:50:00 +0100 aw r265564 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:49:48 +0100 aw r265563 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer 2008-12-16 17:49:35 +0100 aw r265562 : #i93170# added a bool to EndDrawLayer() and corresponding mechanisms to allow to end without drawing FormLayer
2009-01-20 09:49:16 +00:00
}
}
// #i37011# adapt geometry shadow
if(mpLastShadowGeometry)
{
mpLastShadowGeometry->NbcMove( rSiz );
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::Resize( const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SdrTextObj::Resize( rRef, xFact, yFact, bUnsetRelative );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, const Fraction& ryFact )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Fraction xFact( rxFact );
Fraction yFact( ryFact );
// taking care of handles that should not been changed
Rectangle aOld( maRect );
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
SdrTextObj::NbcResize( rRef, xFact, yFact );
if ( ( xFact.GetNumerator() != xFact.GetDenominator() )
|| ( yFact.GetNumerator()!= yFact.GetDenominator() ) )
{
if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) ||
( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) )
{
SetMirroredX( !IsMirroredX() );
}
if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) ||
( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) )
{
SetMirroredY( !IsMirroredY() );
}
}
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() );
aIter != aEnd; ++aIter )
{
try
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_X )
{
sal_Int32 nX = ( aIter->aPosition.X - aOld.Left() ) + maRect.Left();
aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( nX, aIter->xInteraction->getPosition().Y ) );
}
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_Y )
{
sal_Int32 nY = ( aIter->aPosition.Y - aOld.Top() ) + maRect.Top();
aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( aIter->xInteraction->getPosition().X, nY ) );
}
}
catch ( const uno::RuntimeException& )
{
}
}
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcRotate( const Point& rRef, long nAngle, double sn, double cs )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
bool bMirroredX = IsMirroredX();
bool bMirroredY = IsMirroredY();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
fObjectRotation = fmod( fObjectRotation, 360.0 );
if ( fObjectRotation < 0 )
fObjectRotation = 360 + fObjectRotation;
// the rotation angle for ashapes is stored in fObjectRotation, this rotation
// has to be applied to the text object (which is internally using aGeo.nAngle).
SdrTextObj::NbcRotate( maRect.TopLeft(), -aGeo.nRotationAngle, // retrieving the unrotated text object
sin( (-aGeo.nRotationAngle) * F_PI18000 ),
cos( (-aGeo.nRotationAngle) * F_PI18000 ) );
aGeo.nRotationAngle = 0; // resetting aGeo data
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
aGeo.RecalcSinCos();
long nW = (long)( fObjectRotation * 100 ); // applying our object rotation
if ( bMirroredX )
nW = 36000 - nW;
if ( bMirroredY )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
nW = 18000 - nW;
nW = nW % 36000;
if ( nW < 0 )
nW = 36000 + nW;
SdrTextObj::NbcRotate( maRect.TopLeft(), nW, // applying text rotation
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
sin( nW * F_PI18000 ),
cos( nW * F_PI18000 ) );
int nSwap = 0;
if ( bMirroredX )
nSwap ^= 1;
if ( bMirroredY )
nSwap ^= 1;
double fAngle = nAngle; // updating to our new object rotation
fAngle /= 100.0;
fObjectRotation = fmod( nSwap ? fObjectRotation - fAngle : fObjectRotation + fAngle, 360.0 );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( fObjectRotation < 0 )
fObjectRotation = 360 + fObjectRotation;
SdrTextObj::NbcRotate( rRef, nAngle, sn, cs ); // applying text rotation
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
{
// TTTT: Fix for old mirroring, can be removed again in aw080
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// storing horizontal and vertical flipping without modifying the rotate angle
// decompose other flipping to rotation and MirrorX.
long ndx = rRef2.X()-rRef1.X();
long ndy = rRef2.Y()-rRef1.Y();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if(!ndx) // MirroredX
{
SetMirroredX(!IsMirroredX());
SdrTextObj::NbcMirror( rRef1, rRef2 );
}
else
{
if(!ndy) // MirroredY
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SetMirroredY(!IsMirroredY());
SdrTextObj::NbcMirror( rRef1, rRef2 );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
else // neither horizontal nor vertical
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SetMirroredX(!IsMirroredX());
// call parent
SdrTextObj::NbcMirror( rRef1, rRef2 );
// update fObjectRotation
long nTextObjRotation = aGeo.nRotationAngle;
double fAngle = nTextObjRotation;
fAngle /= 100.0;
bool bSingleFlip = (IsMirroredX()!= IsMirroredY());
fObjectRotation = fmod( bSingleFlip ? -fAngle : fAngle, 360.0 );
if ( fObjectRotation < 0 )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
fObjectRotation = 360.0 + fObjectRotation;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::Shear( const Point& rRef, long nAngle, double tn, bool bVShear )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SdrTextObj::Shear( rRef, nAngle, tn, bVShear );
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcShear( const Point& rRef, long nAngle, double tn, bool bVShear )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// TTTT: Fix for old mirroring, can be removed again in aw080
SdrTextObj::NbcShear(rRef,nAngle,tn,bVShear);
// updating fObjectRotation
long nTextObjRotation = aGeo.nRotationAngle;
double fAngle = nTextObjRotation;
fAngle /= 100.0;
bool bSingleFlip = (IsMirroredX()!= IsMirroredY());
fObjectRotation = fmod( bSingleFlip ? -fAngle : fAngle, 360.0 );
if ( fObjectRotation < 0 )
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
{
fObjectRotation = 360.0 + fObjectRotation;
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
}
InvalidateRenderGeometry();
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
}
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
{
2012-01-24 12:43:39 +05:30
sal_Int32 nWdt = ImpGetLineWdt(); // #i25616#
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
// #i25616#
if(!LineIsOutsideGeometry())
{
nWdt++;
nWdt /= 2;
}
Point aPt;
switch (nPosNum) {
case 0: aPt=maRect.TopCenter(); aPt.Y()-=nWdt; break;
case 1: aPt=maRect.RightCenter(); aPt.X()+=nWdt; break;
case 2: aPt=maRect.BottomCenter(); aPt.Y()+=nWdt; break;
case 3: aPt=maRect.LeftCenter(); aPt.X()-=nWdt; break;
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
}
if (aGeo.nShearAngle!=0) ShearPoint(aPt,maRect.TopLeft(),aGeo.nTan);
if (aGeo.nRotationAngle!=0) RotatePoint(aPt,maRect.TopLeft(),aGeo.nSin,aGeo.nCos);
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
aGP.SetPercent(false);
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
return aGP;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
// #i38892#
void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
{
const SdrObject* pSdrObject = GetSdrObjectFromCustomShape();
if(pSdrObject)
{
const SdrGluePointList* pSource = pSdrObject->GetGluePointList();
if(pSource && pSource->GetCount())
{
if(!SdrTextObj::GetGluePointList())
{
SdrTextObj::ForceGluePointList();
}
const SdrGluePointList* pList = SdrTextObj::GetGluePointList();
if(pList)
{
SdrGluePointList aNewList;
sal_uInt16 a;
for(a = 0; a < pSource->GetCount(); a++)
{
SdrGluePoint aCopy((*pSource)[a]);
aCopy.SetUserDefined(false);
aNewList.Insert(aCopy);
}
bool bMirroredX = IsMirroredX();
bool bMirroredY = IsMirroredY();
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
long nShearAngle = aGeo.nShearAngle;
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
double fTan = aGeo.nTan;
if ( aGeo.nRotationAngle || nShearAngle || bMirroredX || bMirroredY )
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
{
Polygon aPoly( maRect );
if( nShearAngle )
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
{
sal_uInt16 nPointCount=aPoly.GetSize();
for (sal_uInt16 i=0; i<nPointCount; i++)
ShearPoint(aPoly[i],maRect.Center(), fTan, false );
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
}
if ( aGeo.nRotationAngle )
aPoly.Rotate( maRect.Center(), aGeo.nRotationAngle / 10 );
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
Rectangle aBoundRect( aPoly.GetBoundRect() );
sal_Int32 nXDiff = aBoundRect.Left() - maRect.Left();
sal_Int32 nYDiff = aBoundRect.Top() - maRect.Top();
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
if (nShearAngle&&((bMirroredX&&!bMirroredY)||(bMirroredY&&!bMirroredX)))
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
{
nShearAngle = -nShearAngle;
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
fTan = -fTan;
}
Point aRef( maRect.GetWidth() / 2, maRect.GetHeight() / 2 );
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
for ( a = 0; a < aNewList.GetCount(); a++ )
{
SdrGluePoint& rPoint = aNewList[ a ];
Point aGlue( rPoint.GetPos() );
if ( nShearAngle )
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
ShearPoint( aGlue, aRef, fTan );
RotatePoint( aGlue, aRef, sin( fObjectRotation * F_PI180 ), cos( fObjectRotation * F_PI180 ) );
if ( bMirroredX )
aGlue.X() = maRect.GetWidth() - aGlue.X();
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
if ( bMirroredY )
aGlue.Y() = maRect.GetHeight() - aGlue.Y();
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
aGlue.X() -= nXDiff;
aGlue.Y() -= nYDiff;
rPoint.SetPos( aGlue );
}
}
for(a = 0; a < pList->GetCount(); a++)
{
const SdrGluePoint& rCandidate = (*pList)[a];
if(rCandidate.IsUserDefined())
{
aNewList.Insert(rCandidate);
}
}
// copy new list to local. This is NOT very convenient behavior, the local
// GluePointList should not be set, but we delivered by using GetGluePointList(),
// maybe on demand. Since the local object is changed here, this is assumed to
// be a result of GetGluePointList and thus the list is copied
if(pPlusData)
{
2012-01-31 13:39:16 -05:00
pPlusData->SetGluePoints(aNewList);
}
}
}
}
}
// #i38892#
const SdrGluePointList* SdrObjCustomShape::GetGluePointList() const
{
const_cast<SdrObjCustomShape*>(this)->ImpCheckCustomGluePointsAreAdded();
return SdrTextObj::GetGluePointList();
}
// #i38892#
SdrGluePointList* SdrObjCustomShape::ForceGluePointList()
{
if(SdrTextObj::ForceGluePointList())
{
ImpCheckCustomGluePointsAreAdded();
return SdrTextObj::ForceGluePointList();
}
else
{
return 0L;
}
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
sal_uInt32 SdrObjCustomShape::GetHdlCount() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount());
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
return ( aInteractionHandles.size() + nBasicHdlCount );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SdrHdl* pH = NULL;
const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount());
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( nHdlNum < nBasicHdlCount )
pH = SdrTextObj::GetHdl( nHdlNum );
else
{
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
const sal_uInt32 nCustomShapeHdlNum(nHdlNum - nBasicHdlCount);
if ( nCustomShapeHdlNum < aInteractionHandles.size() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if ( aInteractionHandles[ nCustomShapeHdlNum ].xInteraction.is() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
try
{
com::sun::star::awt::Point aPosition( aInteractionHandles[ nCustomShapeHdlNum ].xInteraction->getPosition() );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
pH = new SdrHdl( Point( aPosition.X, aPosition.Y ), HDL_CUSTOMSHAPE1 );
pH->SetPointNum( nCustomShapeHdlNum );
pH->SetObj( const_cast<SdrObjCustomShape*>(this) );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
catch ( const uno::RuntimeException& )
{
}
}
}
}
return pH;
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
bool SdrObjCustomShape::hasSpecialDrag() const
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
return true;
}
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
bool SdrObjCustomShape::beginSpecialDrag(SdrDragStat& rDrag) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const SdrHdl* pHdl = rDrag.GetHdl();
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
if(pHdl && HDL_CUSTOMSHAPE1 == pHdl->GetKind())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
rDrag.SetEndDragChangesAttributes(true);
rDrag.SetNoSnap(true);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
else
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
const SdrHdl* pHdl2 = rDrag.GetHdl();
const SdrHdlKind eHdl((pHdl2 == NULL) ? HDL_MOVE : pHdl2->GetKind());
switch( eHdl )
{
case HDL_UPLFT :
case HDL_UPPER :
case HDL_UPRGT :
case HDL_LEFT :
case HDL_RIGHT :
case HDL_LWLFT :
case HDL_LOWER :
case HDL_LWRGT :
case HDL_MOVE :
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
break;
}
default:
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
{
return false;
}
}
}
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
return true;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Rectangle aOld( maRect );
bool bOldMirroredX( IsMirroredX() );
bool bOldMirroredY( IsMirroredY() );
Rectangle aNewRect( rNewRect );
aNewRect.Justify();
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
GeoStat aGeoStat( GetGeoStat() );
if ( aNewRect.TopLeft()!= maRect.TopLeft() &&
( aGeo.nRotationAngle || aGeo.nShearAngle ) )
{
Point aNewPos( aNewRect.TopLeft() );
if ( aGeo.nShearAngle ) ShearPoint( aNewPos, aOld.TopLeft(), aGeoStat.nTan );
if ( aGeo.nRotationAngle ) RotatePoint(aNewPos, aOld.TopLeft(), aGeoStat.nSin, aGeoStat.nCos );
aNewRect.SetPos( aNewPos );
}
if ( aNewRect != maRect )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
SetLogicRect( aNewRect );
InvalidateRenderGeometry();
if ( rNewRect.Left() > rNewRect.Right() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Point aTop( ( GetSnapRect().Left() + GetSnapRect().Right() ) >> 1, GetSnapRect().Top() );
Point aBottom( aTop.X(), aTop.Y() + 1000 );
NbcMirror( aTop, aBottom );
}
if ( rNewRect.Top() > rNewRect.Bottom() )
{
Point aLeft( GetSnapRect().Left(), ( GetSnapRect().Top() + GetSnapRect().Bottom() ) >> 1 );
Point aRight( aLeft.X() + 1000, aLeft.Y() );
NbcMirror( aLeft, aRight );
}
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() );
aIter != aEnd ; ++aIter )
{
try
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_X )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
sal_Int32 nX;
if ( bOldMirroredX )
{
nX = ( aIter->aPosition.X - aOld.Right() );
if ( rNewRect.Left() > rNewRect.Right() )
nX = maRect.Left() - nX;
else
nX += maRect.Right();
}
else
{
nX = ( aIter->aPosition.X - aOld.Left() );
if ( rNewRect.Left() > rNewRect.Right() )
nX = maRect.Right() - nX;
else
nX += maRect.Left();
}
aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( nX, aIter->xInteraction->getPosition().Y ) );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_Y )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
sal_Int32 nY;
if ( bOldMirroredY )
{
nY = ( aIter->aPosition.Y - aOld.Bottom() );
if ( rNewRect.Top() > rNewRect.Bottom() )
nY = maRect.Top() - nY;
else
nY += maRect.Bottom();
}
else
{
nY = ( aIter->aPosition.Y - aOld.Top() );
if ( rNewRect.Top() > rNewRect.Bottom() )
nY = maRect.Bottom() - nY;
else
nY += maRect.Top();
}
aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( aIter->xInteraction->getPosition().X, nY ) );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
catch ( const uno::RuntimeException& )
{
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
}
void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point& rDestination,
const sal_uInt16 nCustomShapeHdlNum, bool bMoveCalloutRectangle )
{
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
if ( nCustomShapeHdlNum < aInteractionHandles.size() )
{
SdrCustomShapeInteraction aInteractionHandle( aInteractionHandles[ nCustomShapeHdlNum ] );
if ( aInteractionHandle.xInteraction.is() )
{
try
{
com::sun::star::awt::Point aPt( rDestination.X(), rDestination.Y() );
if ( aInteractionHandle.nMode & CustomShapeHandleModes::MOVE_SHAPE && bMoveCalloutRectangle )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
sal_Int32 nXDiff = aPt.X - aInteractionHandle.aPosition.X;
sal_Int32 nYDiff = aPt.Y - aInteractionHandle.aPosition.Y;
maRect.Move( nXDiff, nYDiff );
aOutRect.Move( nXDiff, nYDiff );
maSnapRect.Move( nXDiff, nYDiff );
SetRectsDirty(true);
InvalidateRenderGeometry();
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() ) ;
aIter != aEnd; ++aIter)
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
{
if ( aIter->xInteraction.is() )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
}
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
aInteractionHandle.xInteraction->setControllerPosition( aPt );
}
catch ( const uno::RuntimeException& )
{
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
}
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag)
{
const SdrHdl* pHdl = rDrag.GetHdl();
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
const SdrHdlKind eHdl((pHdl == NULL) ? HDL_MOVE : pHdl->GetKind());
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
switch(eHdl)
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
case HDL_CUSTOMSHAPE1 :
{
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
rDrag.SetEndDragChangesGeoAndAttributes(true);
DragMoveCustomShapeHdl( rDrag.GetNow(), (sal_uInt16)pHdl->GetPointNum(), !rDrag.GetDragMethod()->IsShiftPressed() );
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
SetRectsDirty();
InvalidateRenderGeometry();
SetChanged();
break;
}
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
case HDL_UPLFT :
case HDL_UPPER :
case HDL_UPRGT :
case HDL_LEFT :
case HDL_RIGHT :
case HDL_LWLFT :
case HDL_LOWER :
case HDL_LWRGT :
{
DragResizeCustomShape( ImpDragCalcRect(rDrag) );
break;
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
}
case HDL_MOVE :
{
Move(Size(rDrag.GetDX(), rDrag.GetDY()));
break;
}
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
default: break;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
return true;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
{
Rectangle aRect1;
rStat.TakeCreateRect( aRect1 );
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
sal_uInt32 nDefaultObjectSizeWidth = 3000; // default width from SDOptions ?
sal_uInt32 nDefaultObjectSizeHeight= 3000;
if ( ImpVerticalSwitch( *this ) )
{
SetMirroredX( aRect1.Left() > aRect1.Right() );
aRect1 = Rectangle( rStat.GetNow(), Size( nDefaultObjectSizeWidth, nDefaultObjectSizeHeight ) );
// subtracting the horizontal difference of the latest handle from shape position
if ( !aInteractionHandles.empty() )
{
sal_Int32 nHandlePos = aInteractionHandles[ aInteractionHandles.size() - 1 ].xInteraction->getPosition().X;
aRect1.Move( maRect.Left() - nHandlePos, 0 );
}
}
ImpJustifyRect( aRect1 );
rStat.SetActionRect( aRect1 );
maRect = aRect1;
SetRectsDirty();
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() );
aIter != aEnd ; ++aIter)
{
try
{
if ( aIter->nMode & CustomShapeHandleModes::CREATE_FIXED )
aIter->xInteraction->setControllerPosition( awt::Point( rStat.GetStart().X(), rStat.GetStart().Y() ) );
}
catch ( const uno::RuntimeException& )
{
}
}
SetBoundRectDirty();
bSnapRectDirty=true;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return SdrTextObj::BegCreate( rDrag );
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
{
SdrView* pView = rStat.GetView(); // #i37448#
if( pView && pView->IsSolidDragging() )
{
InvalidateRenderGeometry();
}
DragCreateObject( rStat );
SetRectsDirty();
return true;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
DragCreateObject( rStat );
// #115391#
AdaptTextMinSize();
SetRectsDirty();
return ( eCmd == SDRCREATE_FORCEEND || rStat.GetPointAnz() >= 2 );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const
{
return GetLineGeometry( false );
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text,
// the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::IsAutoGrowHeight() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const SfxItemSet& rSet = GetMergedItemSet();
bool bIsAutoGrowHeight = static_cast<const SdrOnOffItem&>(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( bIsAutoGrowHeight && IsVerticalWriting() )
bIsAutoGrowHeight = !static_cast<const SdrOnOffItem&>(rSet.Get(SDRATTR_TEXT_WORDWRAP)).GetValue();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
return bIsAutoGrowHeight;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::IsAutoGrowWidth() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const SfxItemSet& rSet = GetMergedItemSet();
bool bIsAutoGrowWidth = static_cast<const SdrOnOffItem&>(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( bIsAutoGrowWidth && !IsVerticalWriting() )
bIsAutoGrowWidth = !static_cast<const SdrOnOffItem&>(rSet.Get(SDRATTR_TEXT_WORDWRAP)).GetValue();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
return bIsAutoGrowWidth;
}
/* The following method is identical to the SdrTextObj::SetVerticalWriting method, the only difference
is that the SdrAutoGrowWidthItem and SdrAutoGrowHeightItem are not exchanged if the vertical writing
mode has been changed */
void SdrObjCustomShape::SetVerticalWriting( bool bVertical )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
ForceOutlinerParaObject();
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
DBG_ASSERT( pOutlinerParaObject, "SdrTextObj::SetVerticalWriting() without OutlinerParaObject!" );
if( pOutlinerParaObject )
{
CWS-TOOLING: integrate CWS aw063 2009-02-12 13:10:24 +0100 aw r267649 : #i99123# when a primitive is invisible, it is not sufficient to produce no output when decomposing, but to add invisible data using HitTestPrimitive2D. This is needed for the slideshow which relies on geometry data in MetaFiles when painting invisible objects 2009-02-12 13:08:39 +0100 aw r267648 : #i99123# do not ignore HitTestPrimitive2D, but draw empty rectangles instead. This is needed since Slideshow is based on getting MetaFile content when painting invisible objects 2009-02-11 16:04:28 +0100 aw r267620 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:04:10 +0100 aw r267619 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:03:56 +0100 aw r267618 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:03:39 +0100 aw r267617 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:03:21 +0100 aw r267615 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:02:48 +0100 aw r267614 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:02:24 +0100 aw r267613 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:02:01 +0100 aw r267612 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:01:32 +0100 aw r267611 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:01:05 +0100 aw r267610 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 16:00:15 +0100 aw r267608 : #i98788# made SfxItemPool destructor protected, added static ::Free method 2009-02-11 11:27:33 +0100 aw r267585 : #i98788# added missing include for STL 2009-02-10 17:46:50 +0100 aw r267570 : #i98788# added reaction on pool destruction 2009-02-10 17:11:58 +0100 aw r267562 : #i98788# added messaging mechanism to register for pool destruction 2009-02-10 13:35:35 +0100 aw r267549 : #i98788# removing changes, too complicated and risky for 3.1 2009-02-10 12:13:48 +0100 aw r267546 : #i98788# 4th round 2009-02-10 12:13:37 +0100 aw r267545 : #i98788# 4th round 2009-02-10 12:13:26 +0100 aw r267544 : #i98788# 4th round 2009-02-10 12:13:14 +0100 aw r267543 : #i98788# 4th round 2009-02-10 12:13:03 +0100 aw r267542 : #i98788# 4th round 2009-02-10 12:12:50 +0100 aw r267541 : #i98788# 4th round 2009-02-10 12:12:37 +0100 aw r267540 : #i98788# 4th round 2009-02-08 14:38:22 +0100 aw r267495 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:38:06 +0100 aw r267494 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:37:48 +0100 aw r267493 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:37:17 +0100 aw r267492 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:36:56 +0100 aw r267491 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:36:44 +0100 aw r267490 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:36:29 +0100 aw r267489 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:36:16 +0100 aw r267488 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:36:02 +0100 aw r267487 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-08 14:35:46 +0100 aw r267486 : #i98788# 3rd round of changes to SfxItemPool handling 2009-02-05 12:20:39 +0100 aw r267415 : #i98788# 2nd batch of adaptions for SfxItemPoolHolder addition 2009-02-04 15:12:54 +0100 aw r267385 : #i98788# added newline at EOF 2009-02-04 13:26:04 +0100 aw r267379 : #i98788# make SfxItemPool holdable 2009-02-04 13:25:40 +0100 aw r267378 : #i98788# make SfxItemPool holdable 2009-02-04 13:25:08 +0100 aw r267377 : #i98788# make SfxItemPool holdable 2009-02-04 13:24:42 +0100 aw r267376 : #i98788# make SfxItemPool holdable 2009-02-04 13:23:14 +0100 aw r267375 : #i98788# make SfxItemPool holdable 2009-02-04 13:23:02 +0100 aw r267374 : #i98788# make SfxItemPool holdable 2009-01-29 17:08:31 +0100 aw r267159 : #i97628# completed the fix 2009-01-29 17:08:15 +0100 aw r267158 : #i97628# completed the fix 2009-01-29 14:09:07 +0100 aw r267132 : #i97628# Corrected usage of ParagraphData in headers 2009-01-29 14:06:58 +0100 iha r267131 : #i98344# incorrect font size in charts 2009-01-29 12:13:46 +0100 aw r267115 : #i97628# back to old state; triggers too many errors in other modules 2009-01-29 12:03:51 +0100 aw r267114 : #i97628# enabled exceptions due to STL vector include 2009-01-29 11:21:37 +0100 aw r267107 : #i97628# added needed include 2009-01-28 17:58:29 +0100 aw r267077 : #i97628# first version of newly implemented OutlinerParaObject and adaptions 2009-01-28 17:58:12 +0100 aw r267076 : #i97628# first version of newly implemented OutlinerParaObject and adaptions 2009-01-28 17:57:51 +0100 aw r267074 : #i97628# first version of newly implemented OutlinerParaObject and adaptions 2009-01-28 17:57:21 +0100 aw r267073 : #i97628# first version of newly implemented OutlinerParaObject and adaptions 2009-01-27 17:07:33 +0100 aw r267011 : #i98402# added support for ViewRange when exporting MetaFiles in ObjectContactOfPageView::DoProcessDisplay to avoid to paint too much 2009-01-27 11:45:48 +0100 aw r266973 : #i98404# Added a warning to a place where a conversion to rectangle should not be copied from 2009-01-26 21:44:36 +0100 iha r266949 : #i98497# 3D charts are rendered with wrong size 2009-01-26 20:47:07 +0100 aw r266947 : #i98404# handle BackgroundColorPrimitive2D directly in PixelRenderers and avoid AA under all circumstances 2009-01-26 14:50:36 +0100 aw r266926 : #i98386# secured cloning of SdrObject in IMapUserData by boost::shared_prt usage 2009-01-26 12:51:30 +0100 aw r266916 : #i96581# added separated FontStretching and fallback for small X!=Y scale differences 2009-01-23 16:14:55 +0100 aw r266834 : #i96475# added missing implementation of TextDecoratedPortionPrimitive2D::getB2DRange 2009-01-23 15:24:34 +0100 aw r266826 : #i98405# fixed fallback to DrawAlphaRect to use the correctly sized rectangle 2009-01-23 13:34:43 +0100 aw r266813 : #i96474# fixed impSplitSingleWords for an unexpected case 2009-01-23 10:47:31 +0100 aw r266786 : #i98289#,#i96474# tooling and new flags for tasks 2009-01-23 10:47:20 +0100 aw r266785 : #i98289#,#i96474# tooling and new flags for tasks 2009-01-23 10:47:09 +0100 aw r266783 : #i98289#,#i96474# tooling and new flags for tasks 2009-01-23 10:46:58 +0100 aw r266782 : #i98289#,#i96474# tooling and new flags for tasks 2009-01-23 10:46:48 +0100 aw r266781 : #i98289#,#i96474# tooling and new flags for tasks
2009-03-04 14:16:02 +00:00
if(pOutlinerParaObject->IsVertical() != (bool)bVertical)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// get item settings
const SfxItemSet& rSet = GetObjectItemSet();
// Also exchange horizontal and vertical adjust items
SdrTextHorzAdjust eHorz = static_cast<const SdrTextHorzAdjustItem&>(rSet.Get(SDRATTR_TEXT_HORZADJUST)).GetValue();
SdrTextVertAdjust eVert = static_cast<const SdrTextVertAdjustItem&>(rSet.Get(SDRATTR_TEXT_VERTADJUST)).GetValue();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// rescue object size
Rectangle aObjectRect = GetSnapRect();
// prepare ItemSet to set exchanged width and height items
SfxItemSet aNewSet(*rSet.GetPool(),
SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
// Expanded item ranges to also support horizontal and vertical adjust.
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST,
SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST,
0, 0);
aNewSet.Put(rSet);
// Exchange horizontal and vertical adjusts
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
switch(eVert)
{
case SDRTEXTVERTADJUST_TOP: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); break;
case SDRTEXTVERTADJUST_CENTER: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_CENTER)); break;
case SDRTEXTVERTADJUST_BOTTOM: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT)); break;
case SDRTEXTVERTADJUST_BLOCK: aNewSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_BLOCK)); break;
}
switch(eHorz)
{
case SDRTEXTHORZADJUST_LEFT: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BOTTOM)); break;
case SDRTEXTHORZADJUST_CENTER: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_CENTER)); break;
case SDRTEXTHORZADJUST_RIGHT: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP)); break;
case SDRTEXTHORZADJUST_BLOCK: aNewSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); break;
}
pOutlinerParaObject = GetOutlinerParaObject();
if ( pOutlinerParaObject )
pOutlinerParaObject->SetVertical(bVertical);
SetObjectItemSet( aNewSet );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// restore object size
SetSnapRect(aObjectRect);
}
}
}
void SdrObjCustomShape::SuggestTextFrameSize(Size aSuggestedTextFrameSize)
{
m_aSuggestedTextFrameSize = aSuggestedTextFrameSize;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bWdt) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// Either we have text or the application has native text and suggested its size to us.
bool bHasText = HasText() || (m_aSuggestedTextFrameSize.Width() != 0 && m_aSuggestedTextFrameSize.Height() != 0);
if ( pModel && bHasText && !rR.IsEmpty() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
2010-10-05 07:57:54 -05:00
bool bWdtGrow=bWdt && IsAutoGrowWidth();
bool bHgtGrow=bHgt && IsAutoGrowHeight();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( bWdtGrow || bHgtGrow )
{
Rectangle aR0(rR);
long nHgt=0,nMinHgt=0,nMaxHgt=0;
long nWdt=0,nMinWdt=0,nMaxWdt=0;
Size aSiz(rR.GetSize()); aSiz.Width()--; aSiz.Height()--;
Size aMaxSiz(100000,100000);
Size aTmpSiz(pModel->GetMaxObjSize());
if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();
if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height();
if (bWdtGrow)
{
nMinWdt=GetMinTextFrameWidth();
nMaxWdt=GetMaxTextFrameWidth();
if (nMaxWdt==0 || nMaxWdt>aMaxSiz.Width()) nMaxWdt=aMaxSiz.Width();
if (nMinWdt<=0) nMinWdt=1;
aSiz.Width()=nMaxWdt;
}
if (bHgtGrow)
{
nMinHgt=GetMinTextFrameHeight();
nMaxHgt=GetMaxTextFrameHeight();
if (nMaxHgt==0 || nMaxHgt>aMaxSiz.Height()) nMaxHgt=aMaxSiz.Height();
if (nMinHgt<=0) nMinHgt=1;
aSiz.Height()=nMaxHgt;
}
long nHDist=GetTextLeftDistance()+GetTextRightDistance();
long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
aSiz.Width()-=nHDist;
aSiz.Height()-=nVDist;
if ( aSiz.Width() < 2 )
aSiz.Width() = 2; // minimum size=2
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( aSiz.Height() < 2 )
aSiz.Height() = 2; // minimum size=2
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if (HasText())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if(pEdtOutl)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
pEdtOutl->SetMaxAutoPaperSize( aSiz );
if (bWdtGrow)
{
Size aSiz2(pEdtOutl->CalcTextSize());
nWdt=aSiz2.Width()+1; // a little more tolerance
if (bHgtGrow) nHgt=aSiz2.Height()+1; // a little more tolerance
} else
{
nHgt=pEdtOutl->GetTextHeight()+1; // a little more tolerance
}
}
else
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
rOutliner.SetUpdateMode(true);
// TODO: add the optimization with bPortionInfoChecked again.
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if( pOutlinerParaObject != NULL )
{
rOutliner.SetText(*pOutlinerParaObject);
rOutliner.SetFixedCellHeight(static_cast<const SdrTextFixedCellHeightItem&>(GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
if ( bWdtGrow )
{
Size aSiz2(rOutliner.CalcTextSize());
nWdt=aSiz2.Width()+1; // a little more tolerance
if ( bHgtGrow )
nHgt=aSiz2.Height()+1; // a little more tolerance
}
else
nHgt = rOutliner.GetTextHeight()+1; // a little more tolerance
rOutliner.Clear();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
else
{
nHgt = m_aSuggestedTextFrameSize.Height();
nWdt = m_aSuggestedTextFrameSize.Width();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
if ( nWdt < nMinWdt )
nWdt = nMinWdt;
if ( nWdt > nMaxWdt )
nWdt = nMaxWdt;
nWdt += nHDist;
if ( nWdt < 1 )
nWdt = 1; // nHDist may also be negative
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( nHgt < nMinHgt )
nHgt = nMinHgt;
if ( nHgt > nMaxHgt )
nHgt = nMaxHgt;
nHgt+=nVDist;
if ( nHgt < 1 )
nHgt = 1; // nVDist may also be negative
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
long nWdtGrow = nWdt-(rR.Right()-rR.Left());
long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
if ( nWdtGrow == 0 )
bWdtGrow = false;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( nHgtGrow == 0 )
bHgtGrow=false;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( bWdtGrow || bHgtGrow )
{
if ( bWdtGrow )
{
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
if ( eHAdj == SDRTEXTHORZADJUST_LEFT )
rR.Right()+=nWdtGrow;
else if ( eHAdj == SDRTEXTHORZADJUST_RIGHT )
rR.Left()-=nWdtGrow;
else
{
long nWdtGrow2=nWdtGrow/2;
rR.Left()-=nWdtGrow2;
rR.Right()=rR.Left()+nWdt;
}
}
if ( bHgtGrow )
{
SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
if ( eVAdj == SDRTEXTVERTADJUST_TOP )
rR.Bottom()+=nHgtGrow;
else if ( eVAdj == SDRTEXTVERTADJUST_BOTTOM )
rR.Top()-=nHgtGrow;
else
{
long nHgtGrow2=nHgtGrow/2;
rR.Top()-=nHgtGrow2;
rR.Bottom()=rR.Top()+nHgt;
}
}
if ( aGeo.nRotationAngle )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Point aD1(rR.TopLeft());
aD1-=aR0.TopLeft();
Point aD2(aD1);
RotatePoint(aD2,Point(),aGeo.nSin,aGeo.nCos);
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
return true;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
}
return false;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
2010-10-05 07:57:54 -05:00
Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Rectangle aReturnValue;
Rectangle aOldTextRect( maRect ); // <- initial text rectangle
Rectangle aNewTextRect( maRect ); // <- new text rectangle returned from the custom shape renderer,
GetTextBounds( aNewTextRect ); // it depends to the current logical shape size
Rectangle aAdjustedTextRect( aNewTextRect ); // <- new text rectangle is being tested by AdjustTextFrameWidthAndHeight to ensure
if ( AdjustTextFrameWidthAndHeight( aAdjustedTextRect, bHgt, bWdt ) ) // that the new text rectangle is matching the current text size from the outliner
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if (aAdjustedTextRect != aNewTextRect && aOldTextRect != aAdjustedTextRect &&
aNewTextRect.GetWidth() && aNewTextRect.GetHeight())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
aReturnValue = maRect;
double fXScale = (double)aOldTextRect.GetWidth() / (double)aNewTextRect.GetWidth();
double fYScale = (double)aOldTextRect.GetHeight() / (double)aNewTextRect.GetHeight();
double fRightDiff = (double)( aAdjustedTextRect.Right() - aNewTextRect.Right() ) * fXScale;
double fLeftDiff = (double)( aAdjustedTextRect.Left() - aNewTextRect.Left() ) * fXScale;
double fTopDiff = (double)( aAdjustedTextRect.Top() - aNewTextRect.Top() ) * fYScale;
double fBottomDiff= (double)( aAdjustedTextRect.Bottom()- aNewTextRect.Bottom()) * fYScale;
aReturnValue.Left() += (sal_Int32)fLeftDiff;
aReturnValue.Right() += (sal_Int32)fRightDiff;
aReturnValue.Top() += (sal_Int32)fTopDiff;
aReturnValue.Bottom() += (sal_Int32)fBottomDiff;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
return aReturnValue;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != maRect );
if ( bRet )
{
// taking care of handles that should not been changed
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
maRect = aNewTextRect;
SetRectsDirty();
SetChanged();
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd ( aInteractionHandles.end() );
aIter != aEnd ; ++aIter)
{
try
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
}
catch ( const uno::RuntimeException& )
{
}
}
InvalidateRenderGeometry();
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
return bRet;
}
2010-10-05 07:57:54 -05:00
bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != maRect );
if ( bRet )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Rectangle aBoundRect0;
if ( pUserCall )
aBoundRect0 = GetCurrentBoundRect();
// taking care of handles that should not been changed
std::vector< SdrCustomShapeInteraction > aInteractionHandles( GetInteractionHandles() );
maRect = aNewTextRect;
SetRectsDirty();
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() ) ;
aIter != aEnd ; ++aIter)
{
try
{
if ( aIter->nMode & CustomShapeHandleModes::RESIZE_FIXED )
aIter->xInteraction->setControllerPosition( aIter->aPosition );
}
catch ( const uno::RuntimeException& )
{
}
}
InvalidateRenderGeometry();
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
return bRet;
}
bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return SdrTextObj::BegTextEdit( rOutl );
}
void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
{
Size aPaperMin,aPaperMax;
Rectangle aViewInit;
TakeTextAnchorRect( aViewInit );
if ( aGeo.nRotationAngle )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Point aCenter(aViewInit.Center());
aCenter-=aViewInit.TopLeft();
Point aCenter0(aCenter);
RotatePoint(aCenter,Point(),aGeo.nSin,aGeo.nCos);
aCenter-=aCenter0;
aViewInit.Move(aCenter.X(),aCenter.Y());
}
Size aAnkSiz(aViewInit.GetSize());
aAnkSiz.Width()--; aAnkSiz.Height()--; // because GetSize() adds 1
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Size aMaxSiz(1000000,1000000);
if (pModel!=NULL) {
Size aTmpSiz(pModel->GetMaxObjSize());
if (aTmpSiz.Width()!=0) aMaxSiz.Width()=aTmpSiz.Width();
if (aTmpSiz.Height()!=0) aMaxSiz.Height()=aTmpSiz.Height();
}
SdrTextHorzAdjust eHAdj(GetTextHorizontalAdjust());
SdrTextVertAdjust eVAdj(GetTextVerticalAdjust());
long nMinWdt = GetMinTextFrameWidth();
long nMinHgt = GetMinTextFrameHeight();
long nMaxWdt = GetMaxTextFrameWidth();
long nMaxHgt = GetMaxTextFrameHeight();
if (nMinWdt<1) nMinWdt=1;
if (nMinHgt<1) nMinHgt=1;
if ( nMaxWdt == 0 || nMaxWdt > aMaxSiz.Width() )
nMaxWdt = aMaxSiz.Width();
if ( nMaxHgt == 0 || nMaxHgt > aMaxSiz.Height() )
nMaxHgt=aMaxSiz.Height();
if (static_cast<const SdrOnOffItem&>(GetMergedItem(SDRATTR_TEXT_WORDWRAP)).GetValue())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if ( IsVerticalWriting() )
{
nMaxHgt = aAnkSiz.Height();
nMinHgt = nMaxHgt;
}
else
{
nMaxWdt = aAnkSiz.Width();
nMinWdt = nMaxWdt;
}
}
aPaperMax.Width()=nMaxWdt;
aPaperMax.Height()=nMaxHgt;
aPaperMin.Width()=nMinWdt;
aPaperMin.Height()=nMinHgt;
if ( pViewMin )
{
*pViewMin = aViewInit;
long nXFree = aAnkSiz.Width() - aPaperMin.Width();
if ( eHAdj == SDRTEXTHORZADJUST_LEFT )
pViewMin->Right() -= nXFree;
else if ( eHAdj == SDRTEXTHORZADJUST_RIGHT )
pViewMin->Left() += nXFree;
else { pViewMin->Left() += nXFree / 2; pViewMin->Right() = pViewMin->Left() + aPaperMin.Width(); }
long nYFree = aAnkSiz.Height() - aPaperMin.Height();
if ( eVAdj == SDRTEXTVERTADJUST_TOP )
pViewMin->Bottom() -= nYFree;
else if ( eVAdj == SDRTEXTVERTADJUST_BOTTOM )
pViewMin->Top() += nYFree;
else { pViewMin->Top() += nYFree / 2; pViewMin->Bottom() = pViewMin->Top() + aPaperMin.Height(); }
}
if( IsVerticalWriting() )
aPaperMin.Width() = 0;
else
2011-05-09 13:28:30 +02:00
aPaperMin.Height() = 0;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if( eHAdj != SDRTEXTHORZADJUST_BLOCK )
aPaperMin.Width()=0;
// For complete vertical adjust support, set paper min height to 0, here.
if(SDRTEXTVERTADJUST_BLOCK != eVAdj )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
aPaperMin.Height() = 0;
if (pPaperMin!=NULL) *pPaperMin=aPaperMin;
if (pPaperMax!=NULL) *pPaperMax=aPaperMax;
if (pViewInit!=NULL) *pViewInit=aViewInit;
}
void SdrObjCustomShape::EndTextEdit( SdrOutliner& rOutl )
{
SdrTextObj::EndTextEdit( rOutl );
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
{
if ( GetTextBounds( rAnchorRect ) )
{
Point aRotateRef( maSnapRect.Center() );
rAnchorRect.Left() += GetTextLeftDistance();
rAnchorRect.Top() += GetTextUpperDistance();
rAnchorRect.Right() -= GetTextRightDistance();
rAnchorRect.Bottom() -= GetTextLowerDistance();
ImpJustifyRect( rAnchorRect );
if ( rAnchorRect.GetWidth() < 2 )
rAnchorRect.Right() = rAnchorRect.Left() + 1; // minimal width is 2
if ( rAnchorRect.GetHeight() < 2 )
rAnchorRect.Bottom() = rAnchorRect.Top() + 1; // minimal height is 2
if ( aGeo.nRotationAngle )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Point aP( rAnchorRect.TopLeft() );
RotatePoint( aP, aRotateRef, aGeo.nSin, aGeo. nCos );
rAnchorRect.SetPos( aP );
}
}
else
SdrTextObj::TakeTextAnchorRect( rAnchorRect );
}
2010-10-05 07:57:54 -05:00
void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
Rectangle* pAnchorRect, bool /*bLineWidth*/) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Rectangle aAnkRect; // Rect in which we anchor
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
TakeTextAnchorRect(aAnkRect);
SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
EEControlBits nStat0=rOutliner.GetControlWord();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Size aNullSize;
rOutliner.SetControlWord(nStat0|EEControlBits::AUTOPAGESIZE);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
rOutliner.SetMinAutoPaperSize(aNullSize);
sal_Int32 nMaxAutoPaperWidth = 1000000;
sal_Int32 nMaxAutoPaperHeight= 1000000;
long nAnkWdt=aAnkRect.GetWidth();
long nAnkHgt=aAnkRect.GetHeight();
if (static_cast<const SdrOnOffItem&>(GetMergedItem(SDRATTR_TEXT_WORDWRAP)).GetValue())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if ( IsVerticalWriting() )
nMaxAutoPaperHeight = nAnkHgt;
else
nMaxAutoPaperWidth = nAnkWdt;
}
if(SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting())
{
rOutliner.SetMinAutoPaperSize(Size(nAnkWdt, 0));
}
if(SDRTEXTVERTADJUST_BLOCK == eVAdj && IsVerticalWriting())
{
rOutliner.SetMinAutoPaperSize(Size(0, nAnkHgt));
}
rOutliner.SetMaxAutoPaperSize( Size( nMaxAutoPaperWidth, nMaxAutoPaperHeight ) );
rOutliner.SetPaperSize( aNullSize );
// put text into the Outliner - if necessary the use the text from the EditOutliner
OutlinerParaObject* pPara= GetOutlinerParaObject();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if (pEdtOutl && !bNoEditText)
pPara=pEdtOutl->CreateParaObject();
if (pPara)
{
bool bHitTest = false;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
const SdrTextObj* pTestObj = rOutliner.GetTextObj();
if( !pTestObj || !bHitTest || pTestObj != this ||
pTestObj->GetOutlinerParaObject() != GetOutlinerParaObject() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if( bHitTest )
rOutliner.SetTextObj( this );
rOutliner.SetUpdateMode(true);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
rOutliner.SetText(*pPara);
}
}
else
{
rOutliner.SetTextObj( NULL );
}
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
rOutliner.SetUpdateMode(true);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
rOutliner.SetControlWord(nStat0);
SdrText* pText = getActiveText();
if( pText )
pText->CheckPortionInfo( rOutliner );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Point aTextPos(aAnkRect.TopLeft());
Size aTextSiz(rOutliner.GetPaperSize()); // GetPaperSize() has a little added tolerance, no?
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// For draw objects containing text correct horizontal/vertical alignment if text is bigger
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// than the object itself. Without that correction, the text would always be
// formatted to the left edge (or top edge when vertical) of the draw object.
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if( !IsTextFrame() )
{
if(aAnkRect.GetWidth() < aTextSiz.Width() && !IsVerticalWriting())
{
// Horizontal case here. Correct only if eHAdj == SDRTEXTHORZADJUST_BLOCK,
// else the alignment is wanted.
if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
{
eHAdj = SDRTEXTHORZADJUST_CENTER;
}
}
if(aAnkRect.GetHeight() < aTextSiz.Height() && IsVerticalWriting())
{
// Vertical case here. Correct only if eHAdj == SDRTEXTVERTADJUST_BLOCK,
// else the alignment is wanted.
if(SDRTEXTVERTADJUST_BLOCK == eVAdj)
{
eVAdj = SDRTEXTVERTADJUST_CENTER;
}
}
}
if (eHAdj==SDRTEXTHORZADJUST_CENTER || eHAdj==SDRTEXTHORZADJUST_RIGHT)
{
long nFreeWdt=aAnkRect.GetWidth()-aTextSiz.Width();
if (eHAdj==SDRTEXTHORZADJUST_CENTER)
aTextPos.X()+=nFreeWdt/2;
if (eHAdj==SDRTEXTHORZADJUST_RIGHT)
aTextPos.X()+=nFreeWdt;
}
if (eVAdj==SDRTEXTVERTADJUST_CENTER || eVAdj==SDRTEXTVERTADJUST_BOTTOM)
{
long nFreeHgt=aAnkRect.GetHeight()-aTextSiz.Height();
if (eVAdj==SDRTEXTVERTADJUST_CENTER)
aTextPos.Y()+=nFreeHgt/2;
if (eVAdj==SDRTEXTVERTADJUST_BOTTOM)
aTextPos.Y()+=nFreeHgt;
}
if (aGeo.nRotationAngle!=0)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
RotatePoint(aTextPos,aAnkRect.TopLeft(),aGeo.nSin,aGeo.nCos);
if (pAnchorRect)
*pAnchorRect=aAnkRect;
// using rTextRect together with ContourFrame doesn't always work correctly
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
rTextRect=Rectangle(aTextPos,aTextSiz);
}
void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
{
SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
SetBoundRectDirty();
SetRectsDirty(true);
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrObjCustomShape* SdrObjCustomShape::Clone() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return CloneHelper< SdrObjCustomShape >();
}
SdrObjCustomShape& SdrObjCustomShape::operator=(const SdrObjCustomShape& rObj)
{
if( this == &rObj )
return *this;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
SdrTextObj::operator=( rObj );
aName = rObj.aName;
fObjectRotation = rObj.fObjectRotation;
InvalidateRenderGeometry();
return *this;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
OUString SdrObjCustomShape::TakeObjNameSingul() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulCUSTOMSHAPE));
OUString aNm(GetName());
if (!aNm.isEmpty())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
sName.append(' ');
sName.append('\'');
sName.append(aNm);
sName.append('\'');
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
return sName.makeStringAndClear();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
OUString SdrObjCustomShape::TakeObjNamePlural() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return ImpGetResStr(STR_ObjNamePluralCUSTOMSHAPE);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
2008-10-17 08:40:10 +00:00
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeXorPoly() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
return GetLineGeometry( false );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
const SdrObject* pSdrObject = GetSdrObjectFromCustomShape();
if ( pSdrObject )
return pSdrObject->TakeContour();
return basegfx::B2DPolyPolygon();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrObject* SdrObjCustomShape::DoConvertToPolyObj(bool bBezier, bool bAddText) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// #i37011#
SdrObject* pRetval = 0L;
SdrObject* pRenderedCustomShape = 0L;
if ( !mXRenderedCustomShape.is() )
{
// force CustomShape
GetSdrObjectFromCustomShape();
}
if ( mXRenderedCustomShape.is() )
{
pRenderedCustomShape = GetSdrObjectFromXShape( mXRenderedCustomShape );
}
if ( pRenderedCustomShape )
{
SdrObject* pCandidate = pRenderedCustomShape->Clone();
DBG_ASSERT(pCandidate, "SdrObjCustomShape::DoConvertToPolyObj: Could not clone SdrObject (!)");
pCandidate->SetModel(GetModel());
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
pRetval = pCandidate->DoConvertToPolyObj(bBezier, bAddText);
SdrObject::Free( pCandidate );
if(pRetval)
{
const bool bShadow(static_cast<const SdrOnOffItem&>(GetMergedItem(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
pRetval->SetMergedItem(makeSdrShadowItem(true));
}
}
re-base on ALv2 code. Includes: Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
2012-11-21 22:06:52 +00:00
if(bAddText && HasText() && !IsTextPath())
{
pRetval = ImpConvertAddText(pRetval, bBezier);
}
}
return pRetval;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr )
{
// #i40944#
InvalidateRenderGeometry();
SdrObject::NbcSetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
void SdrObjCustomShape::SetPage( SdrPage* pNewPage )
{
SdrTextObj::SetPage( pNewPage );
if( pNewPage )
{
// invalidating rectangles by SetRectsDirty is not sufficient,
// AdjustTextFrameWidthAndHeight() also has to be made, both
// actions are done by NbcSetSnapRect
Rectangle aTmp( maRect ); //creating temporary rectangle #i61108#
NbcSetSnapRect( aTmp );
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
SdrObjGeoData* SdrObjCustomShape::NewGeoData() const
{
return new SdrAShapeObjGeoData;
}
void SdrObjCustomShape::SaveGeoData(SdrObjGeoData& rGeo) const
{
SdrTextObj::SaveGeoData( rGeo );
SdrAShapeObjGeoData& rAGeo=static_cast<SdrAShapeObjGeoData&>(rGeo);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
rAGeo.fObjectRotation = fObjectRotation;
rAGeo.bMirroredX = IsMirroredX();
rAGeo.bMirroredY = IsMirroredY();
const OUString sAdjustmentValues( "AdjustmentValues" );
const Any* pAny = static_cast<const SdrCustomShapeGeometryItem&>( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ).GetPropertyValueByName( sAdjustmentValues );
if ( pAny )
*pAny >>= rAGeo.aAdjustmentSeq;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::RestGeoData(const SdrObjGeoData& rGeo)
{
SdrTextObj::RestGeoData( rGeo );
const SdrAShapeObjGeoData& rAGeo=static_cast<const SdrAShapeObjGeoData&>(rGeo);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
fObjectRotation = rAGeo.fObjectRotation;
SetMirroredX( rAGeo.bMirroredX );
SetMirroredY( rAGeo.bMirroredY );
SdrCustomShapeGeometryItem rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
const OUString sAdjustmentValues( "AdjustmentValues" );
PropertyValue aPropVal;
aPropVal.Name = sAdjustmentValues;
aPropVal.Value <<= rAGeo.aAdjustmentSeq;
rGeometryItem.SetPropertyValue( aPropVal );
SetMergedItem( rGeometryItem );
InvalidateRenderGeometry();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& /*rPolyPolygon*/)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// break up matrix
basegfx::B2DTuple aScale;
basegfx::B2DTuple aTranslate;
double fRotate, fShearX;
rMatrix.decompose(aScale, aTranslate, fRotate, fShearX);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// #i75086# Old DrawingLayer (GeoStat and geometry) does not support holding negative scalings
// in X and Y which equal a 180 degree rotation. Recognize it and react accordingly
if(basegfx::fTools::less(aScale.getX(), 0.0) && basegfx::fTools::less(aScale.getY(), 0.0))
{
aScale.setX(fabs(aScale.getX()));
aScale.setY(fabs(aScale.getY()));
fRotate = fmod(fRotate + F_PI, F_2PI);
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// reset object shear and rotations
fObjectRotation = 0.0;
aGeo.nRotationAngle = 0;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
aGeo.RecalcSinCos();
aGeo.nShearAngle = 0;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
aGeo.RecalcTan();
// force metric to pool metric
Resolves: #i121420# merge sidebar feature (cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
2013-04-10 08:20:16 +00:00
const SfxMapUnit eMapUnit(GetObjectMapUnit());
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if(eMapUnit != SFX_MAPUNIT_100TH_MM)
{
switch(eMapUnit)
{
case SFX_MAPUNIT_TWIP :
{
// position
aTranslate.setX(ImplMMToTwips(aTranslate.getX()));
aTranslate.setY(ImplMMToTwips(aTranslate.getY()));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// size
aScale.setX(ImplMMToTwips(aScale.getX()));
aScale.setY(ImplMMToTwips(aScale.getY()));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
break;
}
default:
{
2011-03-01 19:07:44 +01:00
OSL_FAIL("TRSetBaseGeometry: Missing unit translation to PoolMetric!");
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
}
// if anchor is used, make position relative to it
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
if( pModel && pModel->IsWriter() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if(GetAnchorPos().X() || GetAnchorPos().Y())
{
aTranslate += basegfx::B2DTuple(GetAnchorPos().X(), GetAnchorPos().Y());
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
// build and set BaseRect (use scale)
Point aPoint = Point();
Size aSize(FRound(aScale.getX()), FRound(aScale.getY()));
// fdo#47434 We need a valid rectangle here
if( !aSize.Height() ) aSize.setHeight( 1 );
if( !aSize.Width() ) aSize.setWidth( 1 );
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Rectangle aBaseRect(aPoint, aSize);
SetSnapRect(aBaseRect);
// shear?
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
if(!basegfx::fTools::equalZero(fShearX))
{
GeoStat aGeoStat;
// #i123181# The fix for #121932# here was wrong, the trunk version does not correct the
// mirrored shear values, neither at the object level, nor on the API or XML level. Taking
// back the mirroring of the shear angle
aGeoStat.nShearAngle = FRound((atan(fShearX) / F_PI180) * 100.0);
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
aGeoStat.RecalcTan();
Shear(Point(), aGeoStat.nShearAngle, aGeoStat.nTan, false);
CWS-TOOLING: integrate CWS impress171 2009-06-02 16:32:02 +0200 cl r272511 : fixed build error 2009-05-29 16:40:09 +0200 cl r272471 : CWS-TOOLING: rebase CWS impress171 to trunk@272291 (milestone: DEV300:m49) 2009-05-19 15:14:08 +0200 sj r272082 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:31 +0200 sj r272081 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-19 15:09:14 +0200 sj r272080 : #i101459# applied patch (writing out StyleTextProperties even if no chars given) 2009-05-18 13:34:05 +0200 sj r272015 : #i47689# fixed rectangles toolbar 2009-05-13 14:59:08 +0200 sj r271862 : #i101563# fixed crash when loading pptx document 2009-05-12 19:31:58 +0200 sj r271835 : #101684# fixed rotation of customshapes 2009-05-08 16:37:01 +0200 sj r271724 : #i101683,i101584,i48160# added shearing of customshapes, fixed rotation problem 2009-04-28 17:32:14 +0200 sj r271335 : #i48160# fixed gluepoint rotation of customshapes 2009-04-27 16:31:54 +0200 cl r271291 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:30:52 +0200 cl r271290 : #i100138# applied patch for japanese reconversion feature 2009-04-27 16:28:55 +0200 cl r271289 : #i100138# applied patch for japanese reconversion feature 2009-04-23 14:22:59 +0200 cl r271170 : #i95342# #i96820# #i97298# multiple table handling fixes 2009-04-23 14:18:54 +0200 sj r271169 : #i60368# ignoring gamma values for toolbar/menu icons 2009-04-23 11:54:28 +0200 cl r271146 : #i97298# set style to text even during text edit 2009-04-23 11:46:38 +0200 cl r271145 : fixed compiler error with debug 2009-04-22 19:09:37 +0200 sj r271135 : #i101051# applied patch (proper import of notes page object) 2009-04-22 11:07:54 +0200 cl r271082 : #i96820# modify doc after merging cells 2009-04-22 10:57:35 +0200 cl r271081 : #i100307# applied patch from jlcheng to correctly set modfiy state 2009-04-22 10:31:11 +0200 cl r271079 : #i96736# copy merge information on clone 2009-04-21 08:27:22 +0200 cl r271016 : #i89541# use SfxErrorContext to make the ErrorHandler dialog modal 2009-04-20 17:52:56 +0200 cl r271003 : #i98480# removed 'EndPosition' and 'StartPosition' from styles 2009-04-20 16:41:55 +0200 cl r270994 : #i98403# fixed state handling for selected motion path 2009-04-17 11:35:25 +0200 cl r270931 : #i61274# export to pdf should behave like printing considering layer visibility 2009-04-17 10:00:17 +0200 cl r270924 : #i98967# set default style on any new shape except a page obj 2009-04-16 16:28:20 +0200 cl r270893 : #i98859# use percentage type for relative font height
2009-06-17 10:58:14 +00:00
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// rotation?
if(!basegfx::fTools::equalZero(fRotate))
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
GeoStat aGeoStat;
// #i78696#
// fRotate is mathematically correct, but aGeoStat.nRotationAngle is
// mirrored -> mirror value here
aGeoStat.nRotationAngle = NormAngle360(FRound(-fRotate / F_PI18000));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
aGeoStat.RecalcSinCos();
Rotate(Point(), aGeoStat.nRotationAngle, aGeoStat.nSin, aGeoStat.nCos);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
// translate?
if(!aTranslate.equalZero())
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
Move(Size(FRound(aTranslate.getX()), FRound(aTranslate.getY())));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
// taking fObjectRotation instead of aGeo.nAngle
bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
// get turn and shear
double fRotate = fObjectRotation * F_PI180;
double fShearX = (aGeo.nShearAngle / 100.0) * F_PI180;
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// get aRect, this is the unrotated snaprect
Rectangle aRectangle(maRect);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
bool bMirroredX = IsMirroredX();
bool bMirroredY = IsMirroredY();
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if ( bMirroredX || bMirroredY )
{ // we have to retrieve the unmirrored rect
GeoStat aNewGeo( aGeo );
if ( bMirroredX )
{
Polygon aPol = Rect2Poly(maRect, aNewGeo);
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Rectangle aBoundRect( aPol.GetBoundRect() );
Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
sal_uInt16 i;
sal_uInt16 nPointCount=aPol.GetSize();
for (i=0; i<nPointCount; i++)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
MirrorPoint(aPol[i],aRef1,aRef2);
}
// mirror polygon and move it a bit
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Polygon aPol0(aPol);
aPol[0]=aPol0[1];
aPol[1]=aPol0[0];
aPol[2]=aPol0[3];
aPol[3]=aPol0[2];
aPol[4]=aPol0[1];
Poly2Rect(aPol,aRectangle,aNewGeo);
}
if ( bMirroredY )
{
Polygon aPol( Rect2Poly( aRectangle, aNewGeo ) );
Rectangle aBoundRect( aPol.GetBoundRect() );
Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
Point aRef2( aRef1.X() + 1000, aRef1.Y() );
sal_uInt16 i;
sal_uInt16 nPointCount=aPol.GetSize();
for (i=0; i<nPointCount; i++)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
MirrorPoint(aPol[i],aRef1,aRef2);
}
// mirror polygon and move it a bit
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Polygon aPol0(aPol);
aPol[0]=aPol0[1]; // This was WRONG for vertical (!)
aPol[1]=aPol0[0]; // #i121932# Despite my own comment above
aPol[2]=aPol0[3]; // it was *not* wrong even when the reordering
aPol[3]=aPol0[2]; // *seems* to be specific for X-Mirrorings. Oh
aPol[4]=aPol0[1]; // will I be happy when this old stuff is |gone| with aw080 (!)
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
Poly2Rect(aPol,aRectangle,aNewGeo);
}
}
// fill other values
basegfx::B2DTuple aScale(aRectangle.GetWidth(), aRectangle.GetHeight());
basegfx::B2DTuple aTranslate(aRectangle.Left(), aRectangle.Top());
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// position may be relative to anchorpos, convert
CWS-TOOLING: integrate CWS aw059 2008-12-16 16:15:40 +0100 aw r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways 2008-12-15 16:49:58 +0100 wg r265512 : i97278 2008-12-12 16:02:15 +0100 aw r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks! 2008-12-12 15:49:06 +0100 aw r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas 2008-12-12 14:51:26 +0100 aw r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case 2008-12-12 13:23:00 +0100 aw r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes. 2008-12-11 19:35:59 +0100 aw r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly 2008-12-11 16:05:17 +0100 thb r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed 2008-12-10 13:40:38 +0100 aw r265180 : #i95645# changed pixel snap to basegfx::fround 2008-12-10 13:25:45 +0100 aw r265177 : corrected linux warning 2008-12-10 12:28:02 +0100 aw r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW 2008-12-09 18:44:39 +0100 aw r265136 : #i95645# corrected filled path construction 2008-12-09 18:12:40 +0100 aw r265133 : #i95645# added support for non-AAd transparent paints 2008-12-09 18:11:58 +0100 aw r265132 : #i95645# forced selection without AA 2008-12-09 18:11:29 +0100 aw r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA 2008-12-09 15:21:39 +0100 aw r265094 : #i95645# corrected FormControl full drag 2008-12-09 15:11:26 +0100 aw r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected 2008-12-09 14:30:09 +0100 aw r265085 : #i95645# added GDIPlus support 2008-12-09 13:41:06 +0100 aw r265081 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:46 +0100 aw r265080 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:40:29 +0100 aw r265079 : #i95645# added simple AA using GDIPlis to VCL 2008-12-09 13:33:16 +0100 aw r265078 : #i95645# changes to requirements, discussed with FPE 2008-12-08 14:11:39 +0100 aw r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border 2008-12-08 14:11:00 +0100 aw r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D 2008-12-08 12:15:10 +0100 ufi r264987 : aw059 2008-12-08 12:14:40 +0100 ufi r264986 : aw059 2008-12-05 13:16:18 +0100 aw r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 11:29:48 +0100 aw r264827 : #i95645# corrected warning 2008-12-03 14:43:39 +0100 aw r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32 2008-12-03 14:42:43 +0100 aw r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available 2008-12-03 14:42:13 +0100 aw r264781 : #i95645# removed unused options for writer selection overlay 2008-12-03 14:41:51 +0100 aw r264780 : #i95645# removed unused options for calc overlay 2008-12-03 14:41:21 +0100 aw r264779 : #i95645# small corrections in canvas renderer 2008-12-02 18:32:31 +0100 aw r264730 : #i95646# merged cairo version from THB's CWS cairosource01 2008-12-02 15:25:45 +0100 aw r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers 2008-12-02 12:50:01 +0100 aw r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check. 2008-12-02 12:48:51 +0100 aw r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA 2008-12-02 12:47:53 +0100 aw r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive 2008-11-28 17:11:12 +0100 thb r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:03:27 +0100 thb r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 17:00:07 +0100 thb r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-28 16:59:51 +0100 thb r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities 2008-11-27 19:13:42 +0100 aw r264519 : #i95646# optimized getLength() a little bit 2008-11-27 19:12:50 +0100 aw r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM 2008-11-27 18:50:05 +0100 aw r264516 : #i95646# corrected fit to frame texts for WIN32 2008-11-27 15:32:15 +0100 aw r264496 : #i95646# helplines corrected 2008-11-27 15:32:05 +0100 aw r264495 : #i95646# helplines corrected 2008-11-27 15:01:30 +0100 aw r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output 2008-11-27 14:33:28 +0100 aw r264489 : #i95646# AA support for wireframe overlays 2008-11-27 13:40:54 +0100 aw r264485 : #i95646# added full repaint when AA option changes 2008-11-27 13:29:19 +0100 aw r264482 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 13:29:08 +0100 aw r264481 : #i95646# corrected handling of bSolidDragging config entries 2008-11-27 11:30:12 +0100 aw r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation 2008-11-26 16:33:04 +0100 aw r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel 2008-11-26 15:49:19 +0100 aw r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging 2008-11-26 15:48:11 +0100 aw r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation 2008-11-26 14:11:37 +0100 aw r264385 : #i88893# added new look for selection in sw 2008-11-26 11:32:33 +0100 aw r264360 : corrected compiler warning 2008-11-25 18:46:29 +0100 aw r264328 : #i95646# snapshot with FullDrag clones 2008-11-25 18:46:07 +0100 aw r264327 : #i95646# snapshot with FullDrag clones 2008-11-25 18:45:43 +0100 aw r264326 : #i95646# snapshot with FullDrag clones 2008-11-25 18:19:04 +0100 thb r264324 : #i96585# Added missing inline specifier 2008-11-25 13:16:25 +0100 aw r264285 : #i95646# next snapshot 2008-11-25 13:15:33 +0100 aw r264284 : #i95646# next snapshot 2008-11-25 13:15:12 +0100 aw r264283 : #i95646# next snapshot 2008-11-25 13:14:51 +0100 aw r264282 : #i95646# next snapshot 2008-11-20 13:40:49 +0100 aw r264045 : #i95646# stable snapshot 2008-11-20 13:40:29 +0100 aw r264044 : #i95646# stable snapshot 2008-11-20 13:40:06 +0100 aw r264043 : #i95646# stable snapshot 2008-11-20 13:39:45 +0100 aw r264042 : #i95646# stable snapshot 2008-11-18 11:53:39 +0100 aw r263758 : #i95646# snapshot for linux test build 2008-11-18 11:52:54 +0100 aw r263757 : #i95646# snapshot for linux test build 2008-11-18 11:52:02 +0100 aw r263756 : #i95646# snapshot for linux test build 2008-11-14 18:17:49 +0100 aw r263692 : #i95646# snapshot with most stuff working 2008-11-14 18:14:26 +0100 aw r263691 : #i95646# snapshot with most stuff working 2008-11-14 18:12:50 +0100 aw r263690 : #i95646# snapshot with most stuff working 2008-11-14 18:12:16 +0100 aw r263689 : #i95646# snapshot with most stuff working 2008-11-14 18:11:41 +0100 aw r263688 : #i95646# snapshot with most stuff working 2008-11-07 18:44:22 +0100 aw r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing 2008-11-05 17:39:15 +0100 aw r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 17:39:02 +0100 aw r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment 2008-11-05 12:28:32 +0100 aw r263350 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:27:51 +0100 aw r263349 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:58 +0100 aw r263348 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:26:17 +0100 aw r263347 : #i95644# #i95645# #i95646# in-between state before bigger change 2008-11-05 12:25:55 +0100 aw r263346 : #i95644# #i95645# #i95646# in-between state before bigger change
2009-01-05 13:44:12 +00:00
if( pModel && pModel->IsWriter() )
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
{
if(GetAnchorPos().X() || GetAnchorPos().Y())
{
aTranslate -= basegfx::B2DTuple(GetAnchorPos().X(), GetAnchorPos().Y());
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
// force MapUnit to 100th mm
Resolves: #i121420# merge sidebar feature (cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
2013-04-10 08:20:16 +00:00
const SfxMapUnit eMapUnit(GetObjectMapUnit());
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
if(eMapUnit != SFX_MAPUNIT_100TH_MM)
{
switch(eMapUnit)
{
case SFX_MAPUNIT_TWIP :
{
// position
aTranslate.setX(ImplTwipsToMM(aTranslate.getX()));
aTranslate.setY(ImplTwipsToMM(aTranslate.getY()));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
// size
aScale.setX(ImplTwipsToMM(aScale.getX()));
aScale.setY(ImplTwipsToMM(aScale.getY()));
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
break;
}
default:
{
2011-03-01 19:07:44 +01:00
OSL_FAIL("TRGetBaseGeometry: Missing unit translation to 100th mm!");
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
}
}
}
// build matrix
rMatrix = basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix(
aScale,
basegfx::fTools::equalZero(fShearX) ? 0.0 : tan(fShearX),
basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate,
aTranslate);
return false;
}
INTEGRATION: CWS sj05 (1.1.2); FILE ADDED 2004/03/30 12:18:18 sj 1.1.2.23: added ui name for custom shape 2004/03/25 14:39:00 sj 1.1.2.22: now first trying to get the xshape from the page, otherwise there are some problems with weak references to existing svxshapes 2004/03/17 13:00:09 sj 1.1.2.21: now creating XShape not requires shape to be inserted into page 2004/03/11 11:34:31 sj 1.1.2.20: improved creation of line geometry 2004/02/09 18:08:55 sj 1.1.2.19: now setting layer 2004/02/05 17:24:21 sj 1.1.2.18: name changes 2004/01/23 16:57:24 cl 1.1.2.17: #i20484# adding autoshape ui 2004/01/22 15:33:54 sj 1.1.2.16: hittest has been improved for group and 3d objects 2004/01/20 18:48:20 sj 1.1.2.15: added wordwrap and autogrowsize items 2004/01/13 09:19:32 sj 1.1.2.14: added contact object for sdrobjashp 2003/12/18 19:00:29 sj 1.1.2.13: added TextRotateAngle property 2003/12/17 14:15:57 sj 1.1.2.12: added support of mirroring and vertical writing 2003/12/11 19:13:22 sj 1.1.2.11: defaulting autoshape engine 2003/12/10 19:34:12 sj 1.1.2.10: added handles for autoshapes 2003/12/09 11:17:43 sj 1.1.2.9: autoshape changes 2003/12/05 15:57:41 sj 1.1.2.8: added takedragpoly for autoshapes 2003/12/04 17:46:15 sj 1.1.2.7: added support for handles 2003/11/28 16:41:02 sj 1.1.2.6: solved merge conflicts 2003/11/25 18:31:00 sj 1.1.2.5: minor changes for autoshape support 2003/10/17 17:10:20 sj 1.1.2.4: some minor changes 2003/10/10 17:08:10 sj 1.1.2.3: adding autoshape functionality 2003/09/24 15:00:01 sj 1.1.2.2: text support improved 2003/09/12 16:51:56 sj 1.1.2.1: added autoshape functionality
2004-04-02 13:13:28 +00:00
sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact()
{
return new sdr::contact::ViewContactOfSdrObjCustomShape(*this);
}
// #i33136#
bool SdrObjCustomShape::doConstructOrthogonal(const OUString& rName)
{
bool bRetval(false);
static const char Imps_sNameASOrtho_quadrat[] = "quadrat";
static const char Imps_sNameASOrtho_round_quadrat[] = "round-quadrat";
static const char Imps_sNameASOrtho_circle[] = "circle";
static const char Imps_sNameASOrtho_circle_pie[] = "circle-pie";
static const char Imps_sNameASOrtho_ring[] = "ring";
if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_quadrat))
{
bRetval = true;
}
else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_round_quadrat))
{
bRetval = true;
}
else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle))
{
bRetval = true;
}
else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_circle_pie))
{
bRetval = true;
}
else if(rName.equalsIgnoreAsciiCase(Imps_sNameASOrtho_ring))
{
bRetval = true;
}
return bRetval;
}
// #i37011# centralize throw-away of render geometry
void SdrObjCustomShape::InvalidateRenderGeometry()
{
mXRenderedCustomShape = 0L;
SdrObject::Free( mpLastShadowGeometry );
mpLastShadowGeometry = 0L;
}
void SdrObjCustomShape::impl_setUnoShape(const uno::Reference<uno::XInterface>& rxUnoShape)
{
SdrTextObj::impl_setUnoShape(rxUnoShape);
// The shape engine is created with _current_ shape. This means we
// _must_ reset it when the shape changes.
mxCustomShapeEngine.set(0);
}
OUString SdrObjCustomShape::GetCustomShapeName()
{
OUString sShapeName;
OUString aEngine( static_cast<const SfxStringItem&>(GetMergedItem( SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue() );
if ( aEngine.isEmpty()
|| aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine" )
{
OUString sShapeType;
const OUString sType("Type");
const SdrCustomShapeGeometryItem& rGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) );
const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
if ( pAny && ( *pAny >>= sShapeType ) )
sShapeName = EnhancedCustomShapeTypeNames::GetAccName( sShapeType );
}
return sShapeName;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */