2010-10-12 15:53:47 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
2006-05-12 10:54:47 +00:00
|
|
|
*
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01: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/.
|
2006-05-12 10:54:47 +00:00
|
|
|
*
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01:00
|
|
|
* This file incorporates work covered by the following license notice:
|
2006-05-12 10:54:47 +00:00
|
|
|
*
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01: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 .
|
|
|
|
*/
|
2006-05-12 10:54:47 +00:00
|
|
|
|
|
|
|
#include <drawinglayer/primitive3d/sdrlatheprimitive3d.hxx>
|
2006-10-19 09:40:02 +00:00
|
|
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
2006-05-12 10:54:47 +00:00
|
|
|
#include <basegfx/polygon/b2dpolygontools.hxx>
|
|
|
|
#include <basegfx/polygon/b3dpolypolygontools.hxx>
|
2006-10-19 09:40:02 +00:00
|
|
|
#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
|
2017-09-22 14:12:07 +03:00
|
|
|
#include <basegfx/utils/canvastools.hxx>
|
2007-03-06 11:36:13 +00:00
|
|
|
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
|
2008-06-24 14:31:09 +00:00
|
|
|
#include <drawinglayer/geometry/viewinformation3d.hxx>
|
2010-01-27 11:51:56 +01:00
|
|
|
#include <drawinglayer/attribute/sdrfillattribute.hxx>
|
|
|
|
#include <drawinglayer/attribute/sdrlineattribute.hxx>
|
|
|
|
#include <drawinglayer/attribute/sdrshadowattribute.hxx>
|
2007-03-06 11:36:13 +00:00
|
|
|
|
2014-02-25 18:21:10 +01:00
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
using namespace com::sun::star;
|
|
|
|
|
2014-02-25 18:21:10 +01:00
|
|
|
|
2006-05-12 10:54:47 +00:00
|
|
|
namespace drawinglayer
|
|
|
|
{
|
2006-08-09 15:51:16 +00:00
|
|
|
namespace primitive3d
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2015-12-15 10:31:06 +02:00
|
|
|
Primitive3DContainer SdrLathePrimitive3D::create3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2015-12-15 10:31:06 +02:00
|
|
|
Primitive3DContainer aRetval;
|
2006-10-19 09:40:02 +00:00
|
|
|
|
2006-05-19 08:34:56 +00:00
|
|
|
// get slices
|
2006-10-19 09:40:02 +00:00
|
|
|
const Slice3DVector& rSliceVector = getSlices();
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2012-01-21 19:57:19 +01:00
|
|
|
if(!rSliceVector.empty())
|
2006-05-19 08:34:56 +00:00
|
|
|
{
|
2006-10-19 09:40:02 +00:00
|
|
|
const bool bBackScale(!basegfx::fTools::equal(getBackScale(), 1.0));
|
|
|
|
const bool bClosedRotation(!bBackScale && getHorizontalSegments() && basegfx::fTools::equal(getRotation(), F_2PI));
|
2008-10-17 08:40:10 +00:00
|
|
|
sal_uInt32 a;
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
// decide what to create
|
2015-09-11 14:46:52 +02:00
|
|
|
const css::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind());
|
|
|
|
const bool bCreateNormals(css::drawing::NormalsKind_SPECIFIC == eNormalsKind);
|
|
|
|
const bool bCreateTextureCoordinatesX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX());
|
|
|
|
const bool bCreateTextureCoordinatesY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY());
|
2008-10-17 08:40:10 +00:00
|
|
|
basegfx::B2DHomMatrix aTexTransform;
|
|
|
|
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getFill().isDefault()
|
2015-07-08 11:43:35 +03:00
|
|
|
&& (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY))
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2008-10-17 08:40:10 +00:00
|
|
|
aTexTransform.set(0, 0, 0.0);
|
|
|
|
aTexTransform.set(0, 1, 1.0);
|
|
|
|
aTexTransform.set(1, 0, 1.0);
|
|
|
|
aTexTransform.set(1, 1, 0.0);
|
|
|
|
|
|
|
|
aTexTransform.translate(0.0, -0.5);
|
|
|
|
aTexTransform.scale(1.0, -1.0);
|
|
|
|
aTexTransform.translate(0.0, 0.5);
|
|
|
|
}
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
// create geometry
|
2017-02-17 19:06:24 +02:00
|
|
|
std::vector< basegfx::B3DPolyPolygon > aFill;
|
2008-10-17 08:40:10 +00:00
|
|
|
extractPlanesFromSlice(aFill, rSliceVector,
|
2016-09-15 14:36:33 +02:00
|
|
|
bCreateNormals, true/*smoothHorizontalNormals*/, getSmoothNormals(), getSmoothLids(), bClosedRotation,
|
2015-07-08 11:43:35 +03:00
|
|
|
0.85, 0.6, bCreateTextureCoordinatesX || bCreateTextureCoordinatesY, aTexTransform);
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
// get full range
|
2009-03-15 14:43:10 +00:00
|
|
|
const basegfx::B3DRange aRange(getRangeFrom3DGeometry(aFill));
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
// normal creation
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getFill().isDefault())
|
2008-10-17 08:40:10 +00:00
|
|
|
{
|
2015-09-11 14:46:52 +02:00
|
|
|
if(css::drawing::NormalsKind_SPHERE == eNormalsKind)
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2009-03-15 14:43:10 +00:00
|
|
|
applyNormalsKindSphereTo3DGeometry(aFill, aRange);
|
2008-10-17 08:40:10 +00:00
|
|
|
}
|
2015-09-11 14:46:52 +02:00
|
|
|
else if(css::drawing::NormalsKind_FLAT == eNormalsKind)
|
2008-10-17 08:40:10 +00:00
|
|
|
{
|
2009-03-15 14:43:10 +00:00
|
|
|
applyNormalsKindFlatTo3DGeometry(aFill);
|
2008-10-17 08:40:10 +00:00
|
|
|
}
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
if(getSdr3DObjectAttribute().getNormalsInvert())
|
|
|
|
{
|
2009-03-15 14:43:10 +00:00
|
|
|
applyNormalsInvertTo3DGeometry(aFill);
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
2008-10-17 08:40:10 +00:00
|
|
|
}
|
2006-05-12 10:54:47 +00:00
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
// texture coordinates
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getFill().isDefault())
|
2008-10-17 08:40:10 +00:00
|
|
|
{
|
2009-03-15 14:43:10 +00:00
|
|
|
applyTextureTo3DGeometry(
|
|
|
|
getSdr3DObjectAttribute().getTextureProjectionX(),
|
|
|
|
getSdr3DObjectAttribute().getTextureProjectionY(),
|
|
|
|
aFill,
|
|
|
|
aRange,
|
|
|
|
getTextureSize());
|
2008-10-17 08:40:10 +00:00
|
|
|
}
|
|
|
|
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getFill().isDefault())
|
2008-10-17 08:40:10 +00:00
|
|
|
{
|
|
|
|
// add fill
|
2006-10-19 09:40:02 +00:00
|
|
|
aRetval = create3DPolyPolygonFillPrimitives(
|
2008-10-17 08:40:10 +00:00
|
|
|
aFill,
|
|
|
|
getTransform(),
|
|
|
|
getTextureSize(),
|
|
|
|
getSdr3DObjectAttribute(),
|
2010-01-27 11:51:56 +01:00
|
|
|
getSdrLFSAttribute().getFill(),
|
2006-05-12 10:54:47 +00:00
|
|
|
getSdrLFSAttribute().getFillFloatTransGradient());
|
|
|
|
}
|
2008-10-17 08:40:10 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// create simplified 3d hit test geometry
|
2010-01-27 11:51:56 +01:00
|
|
|
aRetval = createHiddenGeometryPrimitives3D(
|
2008-10-17 08:40:10 +00:00
|
|
|
aFill,
|
|
|
|
getTransform(),
|
|
|
|
getTextureSize(),
|
2010-01-27 11:51:56 +01:00
|
|
|
getSdr3DObjectAttribute());
|
2008-10-17 08:40:10 +00:00
|
|
|
}
|
2006-05-12 10:54:47 +00:00
|
|
|
|
|
|
|
// add line
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getLine().isDefault())
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2008-06-24 14:31:09 +00:00
|
|
|
if(getSdr3DObjectAttribute().getReducedLineGeometry())
|
|
|
|
{
|
|
|
|
// create geometric outlines with reduced line geometry for chart
|
|
|
|
const basegfx::B3DPolyPolygon aHorLine(extractHorizontalLinesFromSlice(rSliceVector, bClosedRotation));
|
|
|
|
const sal_uInt32 nCount(aHorLine.count());
|
|
|
|
basegfx::B3DPolyPolygon aNewLineGeometry;
|
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
for(a = 1; a < nCount; a++)
|
2008-06-24 14:31:09 +00:00
|
|
|
{
|
|
|
|
// for each loop pair create the connection edges
|
|
|
|
createReducedOutlines(
|
|
|
|
rViewInformation,
|
|
|
|
getTransform(),
|
|
|
|
aHorLine.getB3DPolygon(a - 1),
|
|
|
|
aHorLine.getB3DPolygon(a),
|
|
|
|
aNewLineGeometry);
|
|
|
|
}
|
|
|
|
|
2008-10-17 08:40:10 +00:00
|
|
|
for(a = 0; a < nCount; a++)
|
2008-06-24 14:31:09 +00:00
|
|
|
{
|
|
|
|
// filter hor lines for empty loops (those who have their defining point on the Y-Axis)
|
2008-10-17 08:40:10 +00:00
|
|
|
basegfx::B3DPolygon aCandidate(aHorLine.getB3DPolygon(a));
|
2008-06-24 14:31:09 +00:00
|
|
|
aCandidate.removeDoublePoints();
|
|
|
|
|
|
|
|
if(aCandidate.count())
|
|
|
|
{
|
|
|
|
aNewLineGeometry.append(aCandidate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(aNewLineGeometry.count())
|
|
|
|
{
|
2015-12-15 10:31:06 +02:00
|
|
|
const Primitive3DContainer aLines(create3DPolyPolygonLinePrimitives(
|
2010-01-27 11:51:56 +01:00
|
|
|
aNewLineGeometry, getTransform(), getSdrLFSAttribute().getLine()));
|
2015-12-15 10:31:06 +02:00
|
|
|
aRetval.append(aLines);
|
2008-06-24 14:31:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// extract line geometry from slices
|
|
|
|
const basegfx::B3DPolyPolygon aHorLine(extractHorizontalLinesFromSlice(rSliceVector, bClosedRotation));
|
|
|
|
const basegfx::B3DPolyPolygon aVerLine(extractVerticalLinesFromSlice(rSliceVector));
|
|
|
|
|
|
|
|
// add horizontal lines
|
2015-12-15 10:31:06 +02:00
|
|
|
const Primitive3DContainer aHorLines(create3DPolyPolygonLinePrimitives(
|
2010-01-27 11:51:56 +01:00
|
|
|
aHorLine, getTransform(), getSdrLFSAttribute().getLine()));
|
2015-12-15 10:31:06 +02:00
|
|
|
aRetval.append(aHorLines);
|
2008-06-24 14:31:09 +00:00
|
|
|
|
|
|
|
// add vertical lines
|
2015-12-15 10:31:06 +02:00
|
|
|
const Primitive3DContainer aVerLines(create3DPolyPolygonLinePrimitives(
|
2010-01-27 11:51:56 +01:00
|
|
|
aVerLine, getTransform(), getSdrLFSAttribute().getLine()));
|
2015-12-15 10:31:06 +02:00
|
|
|
aRetval.append(aVerLines);
|
2008-06-24 14:31:09 +00:00
|
|
|
}
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// add shadow
|
2010-01-27 11:51:56 +01:00
|
|
|
if(!getSdrLFSAttribute().getShadow().isDefault()
|
2015-12-15 10:31:06 +02:00
|
|
|
&& !aRetval.empty())
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2015-12-15 10:31:06 +02:00
|
|
|
const Primitive3DContainer aShadow(createShadowPrimitive3D(
|
2010-01-27 11:51:56 +01:00
|
|
|
aRetval, getSdrLFSAttribute().getShadow(), getSdr3DObjectAttribute().getShadow3D()));
|
2015-12-15 10:31:06 +02:00
|
|
|
aRetval.append(aShadow);
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
|
|
|
}
|
2006-10-19 09:40:02 +00:00
|
|
|
|
2008-05-27 13:11:34 +00:00
|
|
|
return aRetval;
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
void SdrLathePrimitive3D::impCreateSlices()
|
2006-05-19 08:34:56 +00:00
|
|
|
{
|
2008-05-27 13:11:34 +00:00
|
|
|
// prepare the polygon. No double points, correct orientations and a correct
|
|
|
|
// outmost polygon are needed
|
re-base on ALv2 code. Includes (at least) relevant parts of:
linecap: Reintegrating finished LineCap feature
Patch contributed by Regina Henschel
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patches contributed by Sven Jacobi
impress212: #i81610# fixed animation export
http://svn.apache.org/viewvc?view=revision&revision=1167620
impress212: drawinglayer gbuild environment changes
http://svn.apache.org/viewvc?view=revision&revision=1167627
http://svn.apache.org/viewvc?view=revision&revision=1167628
impress212: DffPropSet -> minor code improvements, removing table
http://svn.apache.org/viewvc?view=revision&revision=1167634
impress212: #158494# fixed excel import (text rotation)
http://svn.apache.org/viewvc?view=revision&revision=1167638
Patches contributed by Armin Le Grand
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement
http://svn.apache.org/viewvc?view=revision&revision=1220836
#118728# changed indentifying definitions for Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1229961
#118838# LineGeometry creation for complicated cases optimized to
create single Polygons
http://svn.apache.org/viewvc?view=revision&revision=1236232
#119176# corrected file type detection for SVG for svg files
without xml header
http://svn.apache.org/viewvc?view=revision&revision=1309445
#118728# Extended Svg file detection
http://svn.apache.org/viewvc?view=revision&revision=1230531
#118529# solve break converters and convert commands for OLEs and images
http://svn.apache.org/viewvc?view=revision&revision=1186168
svg: added WaE changes from branch svgreplacement to trunc
http://svn.apache.org/viewvc?view=revision&revision=1222974
svg: corrected missing member initialization
http://svn.apache.org/viewvc?view=revision&revision=1226134
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert
metafiles to bitmapEx ...
http://svn.apache.org/viewvc?view=revision&revision=1293316
fix for #118525#: removed no longer used variable maOriginalMapMode, one
more exception eliminated
http://svn.apache.org/viewvc?view=revision&revision=1227097
#16758# Added buffering to the VDev usages of the VclProcessor2D derivates...
http://svn.apache.org/viewvc?view=revision&revision=1229521
#116758# Secured VDev buffer device to Vcl deinit
http://svn.apache.org/viewvc?view=revision&revision=1230574
#116758# added remembering allocated VDevs for VDevBuffer to be able to also
delete these when vcl goes down; it should never happen, but You never know
http://svn.apache.org/viewvc?view=revision&revision=1230927
#118730# Changed SvgClipPathNode to use MaskPrimitive2D for primitive
representation instead of TransparencePrimitive2D
http://svn.apache.org/viewvc?view=revision&revision=1231198
#118822# secured 3D geometry creation (slices) by subdividing the 2D
source polyPolygon early
http://svn.apache.org/viewvc?view=revision&revision=1234749
#118829# enhanced Svg gradient quality, obstacles avoided
http://svn.apache.org/viewvc?view=revision&revision=1235361
#118834# Unified usage of TextBreakupHelper as single tooling class
for i18n text primitive breakup
http://svn.apache.org/viewvc?view=revision&revision=1236110
#118853# added square pixel size limit to conversion of
TransparencePrimitive2D to Metafile action
http://svn.apache.org/viewvc?view=revision&revision=1237656
#118824# coreccted mirroring and boundrect when the graphicmanager
is used for bitmap output
http://svn.apache.org/viewvc?view=revision&revision=1240097
#115092# Corrected VclProcessor2D::RenderPolygonStrokePrimitive2D for
various optimization scenarios
http://svn.apache.org/viewvc?view=revision&revision=1241434
#118783# Corrected errors in ID strings, corrected Svg line/fill export,
corrected polygon close state
http://svn.apache.org/viewvc?view=revision&revision=1232006
#118796# corrected null-pointer usage in SVG text exporter
http://svn.apache.org/viewvc?view=revision&revision=1240262
#118729# Use GraphicStreamUrl and GraphicUrl to allow multi image
import with linked graphics, too
http://svn.apache.org/viewvc?view=revision&revision=1229962
#118898# corrected error in GDIMetaFile::GetBoundRect in handling
MetaFloatTransparentAction
http://svn.apache.org/viewvc?view=revision&revision=1293349
#118855# Corrected handling of possibly created empty clipRegions
after PolyPolygon clipping
http://svn.apache.org/viewvc?view=revision&revision=1237725
#115962# Better (but not yet optimal, see comments in task) handling
of MetaFloatTransparentAction in PDF export
http://svn.apache.org/viewvc?view=revision&revision=1241078
IP clearance: #118466# This patch removes librsvg, libcroco, libgsf, ...
http://svn.apache.org/viewvc?view=revision&revision=1200879
118779# Added svg content streaming in/out to ImpGraphic stream operators
http://svn.apache.org/viewvc?view=revision&revision=1231908
linecap: correctons for WaE and mac drawing
http://svn.apache.org/viewvc?view=revision&revision=1232793
svg: uses current system Dpi for Svg replacement image creation
http://svn.apache.org/viewvc?view=revision&revision=1233948
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1394326
Remove duplicate header includes.
cws mba34issues01: #i117720#: convert assertion into warning
http://svn.apache.org/viewvc?view=revision&revision=1172352
118485 - Styles for OLEs are not saved. Submitted by Armin Le Grand.
http://svn.apache.org/viewvc?view=revision&revision=1182166
cws mba34issues01: #i117714#: remove assertion
http://svn.apache.org/viewvc?view=revision&revision=1172357
Patch contributed by Jurgen Schmidt
add some additional checks to ensure proper reading operations
http://svn.apache.org/viewvc?view=revision&revision=1209022
mostly prefer our stream / bounds checking work.
Patches contributed by Herbert Duerr
#i118816# add clarifying comment regarding Font::*Color*() methods
http://svn.apache.org/viewvc?view=revision&revision=1233833
extend macro->string handling for empty strings
http://svn.apache.org/viewvc?view=revision&revision=1175801
avoid magic constants for SALCOLOR_NONE
http://svn.apache.org/viewvc?view=revision&revision=1177543
initialize slant properly in ImplFontMetricData constructor (author=iorsh)
http://svn.apache.org/viewvc?view=revision&revision=1177551
#i118675# make check for extension updates more stable
http://svn.apache.org/viewvc?view=revision&revision=1214797
#a118617# remove VBasicEventListener.dll binary
There are no known users depending on its CLSID
http://svn.apache.org/viewvc?view=revision&revision=1203697
Patches contributed by Ariel Constenla-Haile
Fix build breaker on Linux/gcc
http://svn.apache.org/viewvc?view=revision&revision=1221104
Fix crash when trying to instantiate css.graphic.GraphicRasterizer_RSVG
http://svn.apache.org/viewvc?view=revision&revision=1215559
Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117962# - method <SwFlyFrm::IsPaint(..)> - consider
instances of <SwFlyDrawObj>
http://svn.apache.org/viewvc?view=revision&revision=1172120
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
gnumake4 work variously from Hans-Joachim Lankenau
http://svn.apache.org/viewvc?view=revision&revision=1397315
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1396782
http://svn.apache.org/viewvc?view=revision&revision=1394707
plus some amount of re-splitting of legacy headers.
Patch contributed by Pavel Janik
WaE: Remove unused variables.
http://svn.apache.org/viewvc?view=revision&revision=1230697
Patches contributed by Takashi Ono
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
mingwport35: i#117795: MinGW port fix for vcl2gnumake
http://svn.apache.org/viewvc?view=revision&revision=1172091
Patch contributed by Christian Lippka
impress212: #i98044# re enable Text menu for outline and title shapes
http://svn.apache.org/viewvc?view=revision&revision=1167639
Patch contributed by Andre Fischer
118674: Made category B code optional and disabled by default.
http://svn.apache.org/viewvc?view=revision&revision=1215131
118881: Ignore empty paragraphs after bullets.
http://svn.apache.org/viewvc?view=revision&revision=1296205
Patches contributed by Philipp Lohmann
ooo340fixes: #i117780# use rtl allocator
http://svn.apache.org/viewvc?view=revision&revision=1172087
ooo34gsl02: #i117807# fix an off by one error (index actually
inside the pfb section header)
http://svn.apache.org/viewvc?view=revision&revision=1167576
various cleanups, related compilation fixes, warning cleanups, re-working
of obsolete stl template pieces to use boost instead, changed string
classes, re-adapt KDE about data, about dialog, fixing warnings,
and other fixes & improvements.
Disable svg import / render for about/ branding code-paths for now.
Restore full icon theme set.
Remove OS/2 conditionals and sources.
Remove conflicting gtk/full-screen monitors support.
Retain existing svg rasterizer files - temporarily disabled.
Standardize stringificaiton and fixup dllpostfix issues.
Rename SvgGradientHelper::== to equalTo to avoid overloading issues.
Use the flat GdiPlus API for LineCaps calls.
2012-10-09 12:22:23 +01:00
|
|
|
// Also important: subdivide here to ensure equal point count for all slices (!)
|
2017-09-22 14:12:07 +03:00
|
|
|
maCorrectedPolyPolygon = basegfx::utils::adaptiveSubdivideByAngle(getPolyPolygon());
|
2008-06-24 14:31:09 +00:00
|
|
|
maCorrectedPolyPolygon.removeDoublePoints();
|
2017-09-22 14:12:07 +03:00
|
|
|
maCorrectedPolyPolygon = basegfx::utils::correctOrientations(maCorrectedPolyPolygon);
|
|
|
|
maCorrectedPolyPolygon = basegfx::utils::correctOutmostPolygon(maCorrectedPolyPolygon);
|
2006-05-19 08:34:56 +00:00
|
|
|
|
|
|
|
// check edge count of first sub-polygon. If different, reSegment polyPolygon. This ensures
|
2017-09-23 07:07:14 +05:30
|
|
|
// that for polyPolygons, the subPolys 1..n only get reSegmented when polygon 0 is different
|
2006-05-19 08:34:56 +00:00
|
|
|
// at all (and not always)
|
2008-06-24 14:31:09 +00:00
|
|
|
const basegfx::B2DPolygon aSubCandidate(maCorrectedPolyPolygon.getB2DPolygon(0));
|
2017-09-23 07:07:14 +05:30
|
|
|
const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1 : 0));
|
2006-05-19 08:34:56 +00:00
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
if(nSubEdgeCount != getVerticalSegments())
|
2006-05-19 08:34:56 +00:00
|
|
|
{
|
2017-09-22 14:12:07 +03:00
|
|
|
maCorrectedPolyPolygon = basegfx::utils::reSegmentPolyPolygon(maCorrectedPolyPolygon, getVerticalSegments());
|
2006-05-19 08:34:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// prepare slices as geometry
|
2008-06-24 14:31:09 +00:00
|
|
|
createLatheSlices(maSlices, maCorrectedPolyPolygon, getBackScale(), getDiagonal(), getRotation(), getHorizontalSegments(), getCharacterMode(), getCloseFront(), getCloseBack());
|
2006-05-19 08:34:56 +00:00
|
|
|
}
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
const Slice3DVector& SdrLathePrimitive3D::getSlices() const
|
2006-05-19 08:34:56 +00:00
|
|
|
{
|
2008-05-14 08:22:09 +00:00
|
|
|
// This can be made dependent of getSdrLFSAttribute().getFill() and getSdrLFSAttribute().getLine()
|
|
|
|
// again when no longer geometry is needed for non-visible 3D objects as it is now for chart
|
|
|
|
if(getPolyPolygon().count() && !maSlices.size())
|
2006-05-19 08:34:56 +00:00
|
|
|
{
|
2016-04-29 12:30:16 +02:00
|
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
const_cast< SdrLathePrimitive3D& >(*this).impCreateSlices();
|
2006-05-19 08:34:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return maSlices;
|
|
|
|
}
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
SdrLathePrimitive3D::SdrLathePrimitive3D(
|
2006-08-09 15:51:16 +00:00
|
|
|
const basegfx::B3DHomMatrix& rTransform,
|
|
|
|
const basegfx::B2DVector& rTextureSize,
|
2010-01-27 11:51:56 +01:00
|
|
|
const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute,
|
2006-10-19 09:40:02 +00:00
|
|
|
const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute,
|
2006-08-09 15:51:16 +00:00
|
|
|
const basegfx::B2DPolyPolygon& rPolyPolygon,
|
2006-05-12 10:54:47 +00:00
|
|
|
sal_uInt32 nHorizontalSegments,
|
|
|
|
sal_uInt32 nVerticalSegments,
|
|
|
|
double fDiagonal,
|
|
|
|
double fBackScale,
|
|
|
|
double fRotation,
|
|
|
|
bool bSmoothNormals,
|
|
|
|
bool bSmoothLids,
|
|
|
|
bool bCharacterMode,
|
|
|
|
bool bCloseFront,
|
|
|
|
bool bCloseBack)
|
2006-10-19 09:40:02 +00:00
|
|
|
: SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute),
|
2008-06-24 14:31:09 +00:00
|
|
|
maCorrectedPolyPolygon(),
|
|
|
|
maSlices(),
|
2006-05-12 10:54:47 +00:00
|
|
|
maPolyPolygon(rPolyPolygon),
|
|
|
|
mnHorizontalSegments(nHorizontalSegments),
|
|
|
|
mnVerticalSegments(nVerticalSegments),
|
|
|
|
mfDiagonal(fDiagonal),
|
|
|
|
mfBackScale(fBackScale),
|
|
|
|
mfRotation(fRotation),
|
2015-11-10 10:14:01 +01:00
|
|
|
mpLastRLGViewInformation(nullptr),
|
2006-05-12 10:54:47 +00:00
|
|
|
mbSmoothNormals(bSmoothNormals),
|
|
|
|
mbSmoothLids(bSmoothLids),
|
|
|
|
mbCharacterMode(bCharacterMode),
|
|
|
|
mbCloseFront(bCloseFront),
|
|
|
|
mbCloseBack(bCloseBack)
|
|
|
|
{
|
|
|
|
// make sure Rotation is positive
|
2006-10-19 09:40:02 +00:00
|
|
|
if(basegfx::fTools::lessOrEqual(getRotation(), 0.0))
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
|
|
|
mfRotation = 0.0;
|
|
|
|
}
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
// make sure the percentage value getDiagonal() is between 0.0 and 1.0
|
|
|
|
if(basegfx::fTools::lessOrEqual(getDiagonal(), 0.0))
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
|
|
|
mfDiagonal = 0.0;
|
|
|
|
}
|
2006-10-19 09:40:02 +00:00
|
|
|
else if(basegfx::fTools::moreOrEqual(getDiagonal(), 1.0))
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
|
|
|
mfDiagonal = 1.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// no close front/back when polygon is not closed
|
2017-08-16 14:45:49 +02:00
|
|
|
if(getPolyPolygon().count() && !getPolyPolygon().getB2DPolygon(0).isClosed())
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
|
|
|
mbCloseFront = mbCloseBack = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// no edge rounding when not closing
|
2006-10-19 09:40:02 +00:00
|
|
|
if(!getCloseFront() && !getCloseBack())
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
|
|
|
mfDiagonal = 0.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-06-24 14:31:09 +00:00
|
|
|
SdrLathePrimitive3D::~SdrLathePrimitive3D()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2006-10-19 09:40:02 +00:00
|
|
|
bool SdrLathePrimitive3D::operator==(const BasePrimitive3D& rPrimitive) const
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2006-10-19 09:40:02 +00:00
|
|
|
if(SdrPrimitive3D::operator==(rPrimitive))
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2006-10-19 09:40:02 +00:00
|
|
|
const SdrLathePrimitive3D& rCompare = static_cast< const SdrLathePrimitive3D& >(rPrimitive);
|
|
|
|
|
|
|
|
return (getPolyPolygon() == rCompare.getPolyPolygon()
|
|
|
|
&& getHorizontalSegments() == rCompare.getHorizontalSegments()
|
|
|
|
&& getVerticalSegments() == rCompare.getVerticalSegments()
|
|
|
|
&& getDiagonal() == rCompare.getDiagonal()
|
|
|
|
&& getBackScale() == rCompare.getBackScale()
|
|
|
|
&& getRotation() == rCompare.getRotation()
|
|
|
|
&& getSmoothNormals() == rCompare.getSmoothNormals()
|
|
|
|
&& getSmoothLids() == rCompare.getSmoothLids()
|
|
|
|
&& getCharacterMode() == rCompare.getCharacterMode()
|
|
|
|
&& getCloseFront() == rCompare.getCloseFront()
|
|
|
|
&& getCloseBack() == rCompare.getCloseBack());
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2008-06-10 08:29:56 +00:00
|
|
|
basegfx::B3DRange SdrLathePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const
|
2006-05-12 10:54:47 +00:00
|
|
|
{
|
2013-12-23 07:59:24 +01:00
|
|
|
// use default from sdrPrimitive3D which uses transformation expanded by line width/2
|
2006-06-02 12:58:03 +00:00
|
|
|
// The parent implementation which uses the ranges of the decomposition would be more
|
2013-12-23 07:59:24 +01:00
|
|
|
// correct, but for historical reasons it is necessary to do the old method: To get
|
2006-05-19 08:34:56 +00:00
|
|
|
// the range of the non-transformed geometry and transform it then. This leads to different
|
|
|
|
// ranges where the new method is more correct, but the need to keep the old behaviour
|
|
|
|
// has priority here.
|
2006-08-09 15:51:16 +00:00
|
|
|
return get3DRangeFromSlices(getSlices());
|
2006-05-12 10:54:47 +00:00
|
|
|
}
|
2006-10-19 09:40:02 +00:00
|
|
|
|
2015-12-15 10:31:06 +02:00
|
|
|
Primitive3DContainer SdrLathePrimitive3D::get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const
|
2008-06-24 14:31:09 +00:00
|
|
|
{
|
|
|
|
if(getSdr3DObjectAttribute().getReducedLineGeometry())
|
|
|
|
{
|
|
|
|
if(!mpLastRLGViewInformation ||
|
2015-12-15 10:31:06 +02:00
|
|
|
(!getBuffered3DDecomposition().empty()
|
2008-06-24 14:31:09 +00:00
|
|
|
&& *mpLastRLGViewInformation != rViewInformation))
|
|
|
|
{
|
2016-04-29 12:30:16 +02:00
|
|
|
::osl::MutexGuard aGuard( m_aMutex );
|
|
|
|
|
2008-06-24 14:31:09 +00:00
|
|
|
// conditions of last local decomposition with reduced lines have changed. Remember
|
|
|
|
// new one and clear current decompositiopn
|
|
|
|
SdrLathePrimitive3D* pThat = const_cast< SdrLathePrimitive3D* >(this);
|
2015-12-15 10:31:06 +02:00
|
|
|
pThat->setBuffered3DDecomposition(Primitive3DContainer());
|
2017-05-31 15:40:25 +02:00
|
|
|
pThat->mpLastRLGViewInformation.reset( new geometry::ViewInformation3D(rViewInformation) );
|
2008-06-24 14:31:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// no test for buffering needed, call parent
|
|
|
|
return SdrPrimitive3D::get3DDecomposition(rViewInformation);
|
|
|
|
}
|
|
|
|
|
2006-11-07 14:49:11 +00:00
|
|
|
// provide unique ID
|
2013-05-17 14:36:17 +02:00
|
|
|
ImplPrimitive3DIDBlock(SdrLathePrimitive3D, PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D)
|
2006-11-07 14:49:11 +00:00
|
|
|
|
2006-08-09 15:51:16 +00:00
|
|
|
} // end of namespace primitive3d
|
2006-05-12 10:54:47 +00:00
|
|
|
} // end of namespace drawinglayer
|
|
|
|
|
2010-10-12 15:53:47 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|