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.
|
2001-02-02 10:14:37 +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/.
|
2001-02-02 10:14:37 +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:
|
2001-02-02 10:14:37 +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 .
|
|
|
|
*/
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2011-07-20 22:27:51 +02:00
|
|
|
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
|
2001-02-02 10:14:37 +00:00
|
|
|
#include <com/sun/star/text/XText.hpp>
|
2001-02-21 17:04:45 +00:00
|
|
|
#include <com/sun/star/container/XNamed.hpp>
|
2004-03-30 15:15:15 +00:00
|
|
|
#include <com/sun/star/container/XEnumerationAccess.hpp>
|
2001-02-02 10:14:37 +00:00
|
|
|
#include <com/sun/star/drawing/CircleKind.hpp>
|
|
|
|
#include <com/sun/star/drawing/ConnectorType.hpp>
|
|
|
|
#include <com/sun/star/drawing/XControlShape.hpp>
|
|
|
|
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
|
2001-02-07 15:26:36 +00:00
|
|
|
#include <com/sun/star/document/XEventsSupplier.hpp>
|
2001-02-09 12:38:53 +00:00
|
|
|
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
|
2011-12-03 00:00:08 +01:00
|
|
|
#include <com/sun/star/embed/ElementModes.hpp>
|
|
|
|
#include <com/sun/star/embed/XTransactedObject.hpp>
|
2004-08-12 07:50:21 +00:00
|
|
|
#include <com/sun/star/media/ZoomLevel.hpp>
|
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
2011-10-11 14:19:00 +02:00
|
|
|
|
|
|
|
#include <sax/tools/converter.hxx>
|
|
|
|
|
2011-12-06 04:36:22 +01:00
|
|
|
#include <comphelper/storagehelper.hxx>
|
|
|
|
|
2001-02-07 15:26:36 +00:00
|
|
|
#include "anim.hxx"
|
|
|
|
|
2007-06-27 14:06:20 +00:00
|
|
|
#include <xmloff/shapeexport.hxx>
|
2001-02-02 10:14:37 +00:00
|
|
|
#include "sdpropls.hxx"
|
|
|
|
#include <tools/debug.hxx>
|
2012-07-01 01:06:04 +02:00
|
|
|
#include <tools/helpers.hxx>
|
2001-02-02 10:14:37 +00:00
|
|
|
#include <rtl/ustrbuf.hxx>
|
2007-06-27 14:06:20 +00:00
|
|
|
#include <xmloff/xmlexp.hxx>
|
|
|
|
#include <xmloff/xmluconv.hxx>
|
2001-03-29 15:48:43 +00:00
|
|
|
#include "XMLImageMapExport.hxx"
|
2001-02-02 10:14:37 +00:00
|
|
|
#include "xexptran.hxx"
|
2007-06-27 14:06:20 +00:00
|
|
|
#include <xmloff/xmltoken.hxx>
|
|
|
|
#include <xmloff/nmspmap.hxx>
|
2001-03-29 15:48:43 +00:00
|
|
|
|
2010-04-16 23:04:00 +02:00
|
|
|
#include "xmloff/xmlnmspe.hxx"
|
2006-11-14 13:14:30 +00:00
|
|
|
#include <basegfx/matrix/b2dhommatrix.hxx>
|
|
|
|
#include <basegfx/tuple/b2dtuple.hxx>
|
|
|
|
|
2008-03-12 09:35:39 +00:00
|
|
|
using ::rtl::OUString;
|
|
|
|
using ::rtl::OUStringBuffer;
|
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
using namespace ::com::sun::star;
|
2001-06-29 20:07:26 +00:00
|
|
|
using namespace ::xmloff::token;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
void XMLShapeExport::ImpExportNewTrans(const uno::Reference< beans::XPropertySet >& xPropSet,
|
|
|
|
sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
// get matrix
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DHomMatrix aMatrix;
|
|
|
|
ImpExportNewTrans_GetB2DHomMatrix(aMatrix, xPropSet);
|
2001-02-09 12:38:53 +00:00
|
|
|
|
|
|
|
// decompose and correct abour pRefPoint
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRScale;
|
2001-02-09 12:38:53 +00:00
|
|
|
double fTRShear(0.0);
|
|
|
|
double fTRRotate(0.0);
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRTranslate;
|
|
|
|
ImpExportNewTrans_DecomposeAndRefPoint(aMatrix, aTRScale, fTRShear, fTRRotate, aTRTranslate, pRefPoint);
|
2001-02-09 12:38:53 +00:00
|
|
|
|
|
|
|
// use features and write
|
|
|
|
ImpExportNewTrans_FeaturesAndWrite(aTRScale, fTRShear, fTRRotate, aTRTranslate, nFeatures);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
2006-11-14 13:14:30 +00:00
|
|
|
void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix,
|
2001-02-09 12:38:53 +00:00
|
|
|
const uno::Reference< beans::XPropertySet >& xPropSet)
|
|
|
|
{
|
2010-11-09 01:42:14 +05:00
|
|
|
/* Get <TransformationInHoriL2R>, if it exist
|
|
|
|
and if the document is exported into the OpenOffice.org file format.
|
|
|
|
This property only exists at service com::sun::star::text::Shape - the
|
|
|
|
Writer UNO service for shapes.
|
|
|
|
This code is needed, because the positioning attributes in the
|
|
|
|
OpenOffice.org file format are given in horizontal left-to-right layout
|
|
|
|
regardless the layout direction the shape is in. In the OASIS Open Office
|
|
|
|
file format the positioning attributes are correctly given in the layout
|
|
|
|
direction the shape is in. Thus, this code provides the conversion from
|
|
|
|
the OASIS Open Office file format to the OpenOffice.org file format. (#i28749#)
|
|
|
|
*/
|
2004-08-23 06:58:31 +00:00
|
|
|
uno::Any aAny;
|
|
|
|
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
|
|
|
|
xPropSet->getPropertySetInfo()->hasPropertyByName(
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString("TransformationInHoriL2R")) )
|
2004-08-23 06:58:31 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xPropSet->getPropertyValue(OUString("TransformationInHoriL2R"));
|
2004-08-23 06:58:31 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xPropSet->getPropertyValue(OUString("Transformation"));
|
2004-08-23 06:58:31 +00:00
|
|
|
}
|
2001-02-09 12:38:53 +00:00
|
|
|
drawing::HomogenMatrix3 aMatrix;
|
|
|
|
aAny >>= aMatrix;
|
2006-11-14 13:14:30 +00:00
|
|
|
|
|
|
|
rMatrix.set(0, 0, aMatrix.Line1.Column1);
|
|
|
|
rMatrix.set(0, 1, aMatrix.Line1.Column2);
|
|
|
|
rMatrix.set(0, 2, aMatrix.Line1.Column3);
|
|
|
|
rMatrix.set(1, 0, aMatrix.Line2.Column1);
|
|
|
|
rMatrix.set(1, 1, aMatrix.Line2.Column2);
|
|
|
|
rMatrix.set(1, 2, aMatrix.Line2.Column3);
|
|
|
|
rMatrix.set(2, 0, aMatrix.Line3.Column1);
|
|
|
|
rMatrix.set(2, 1, aMatrix.Line3.Column2);
|
|
|
|
rMatrix.set(2, 2, aMatrix.Line3.Column3);
|
2001-02-09 12:38:53 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-11-14 13:14:30 +00:00
|
|
|
void XMLShapeExport::ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMatrix, ::basegfx::B2DTuple& rTRScale,
|
|
|
|
double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
// decompose matrix
|
2006-11-14 13:14:30 +00:00
|
|
|
rMatrix.decompose(rTRScale, rTRTranslate, fTRRotate, fTRShear);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// correct translation about pRefPoint
|
|
|
|
if(pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2006-11-14 13:14:30 +00:00
|
|
|
rTRTranslate -= ::basegfx::B2DTuple(pRefPoint->X, pRefPoint->Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
2001-02-09 12:38:53 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-11-14 13:14:30 +00:00
|
|
|
void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear,
|
|
|
|
double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const sal_Int32 nFeatures)
|
2001-02-09 12:38:53 +00:00
|
|
|
{
|
2001-02-22 11:27:36 +00:00
|
|
|
// allways write Size (rTRScale) since this statement carries the union
|
|
|
|
// of the object
|
|
|
|
OUString aStr;
|
|
|
|
OUStringBuffer sStringBuffer;
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRScale(rTRScale);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
// svg: width
|
2001-02-09 12:38:53 +00:00
|
|
|
if(!(nFeatures & SEF_EXPORT_WIDTH))
|
2004-11-17 09:34:17 +00:00
|
|
|
{
|
2006-11-14 13:14:30 +00:00
|
|
|
aTRScale.setX(1.0);
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-11-14 13:14:30 +00:00
|
|
|
if( aTRScale.getX() > 0.0 )
|
|
|
|
aTRScale.setX(aTRScale.getX() - 1.0);
|
|
|
|
else if( aTRScale.getX() < 0.0 )
|
|
|
|
aTRScale.setX(aTRScale.getX() + 1.0);
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
FRound(aTRScale.getX()));
|
2001-02-22 11:27:36 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_WIDTH, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
// svg: height
|
2001-02-09 12:38:53 +00:00
|
|
|
if(!(nFeatures & SEF_EXPORT_HEIGHT))
|
2004-11-17 09:34:17 +00:00
|
|
|
{
|
2006-11-14 13:14:30 +00:00
|
|
|
aTRScale.setY(1.0);
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-11-14 13:14:30 +00:00
|
|
|
if( aTRScale.getY() > 0.0 )
|
|
|
|
aTRScale.setY(aTRScale.getY() - 1.0);
|
|
|
|
else if( aTRScale.getY() < 0.0 )
|
|
|
|
aTRScale.setY(aTRScale.getY() + 1.0);
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
FRound(aTRScale.getY()));
|
2001-02-22 11:27:36 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr);
|
2001-02-22 11:27:36 +00:00
|
|
|
|
|
|
|
// decide if transformation is neccessary
|
2010-11-10 13:50:33 +08:00
|
|
|
sal_Bool bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
if(bTransformationIsNeccessary)
|
|
|
|
{
|
|
|
|
// write transformation, but WITHOUT scale which is exported as size above
|
|
|
|
SdXMLImExTransform2D aTransform;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-26 09:26:58 +00:00
|
|
|
aTransform.AddSkewX(atan(fTRShear));
|
2007-08-02 16:23:07 +00:00
|
|
|
|
|
|
|
// #i78696#
|
|
|
|
// fTRRotate is mathematically correct, but due to the error
|
|
|
|
// we export/import it mirrored. Since the API implementation is fixed and
|
|
|
|
// uses the correctly oriented angle, it is necessary for compatibility to
|
|
|
|
// mirror the angle here to stay at the old behaviour. There is a follow-up
|
|
|
|
// task (#i78698#) to fix this in the next ODF FileFormat version
|
|
|
|
aTransform.AddRotate(-fTRRotate);
|
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
aTransform.AddTranslate(rTRTranslate);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
// does transformation need to be exported?
|
|
|
|
if(aTransform.NeedsAction())
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter()));
|
2001-02-22 11:27:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// no shear, no rotate; just add object position to export and we are done
|
|
|
|
if(nFeatures & SEF_EXPORT_X)
|
|
|
|
{
|
|
|
|
// svg: x
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
FRound(rTRTranslate.getX()));
|
2001-02-22 11:27:36 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X, aStr);
|
2001-02-22 11:27:36 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-22 11:27:36 +00:00
|
|
|
if(nFeatures & SEF_EXPORT_Y)
|
|
|
|
{
|
|
|
|
// svg: y
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
FRound(rTRTranslate.getY()));
|
2001-02-22 11:27:36 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y, aStr);
|
2001-02-22 11:27:36 +00:00
|
|
|
}
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const rtl::OUString& rClass )
|
|
|
|
{
|
|
|
|
sal_Bool bIsEmpty = sal_False;
|
|
|
|
|
|
|
|
// write presentation class entry
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS, rClass);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
if( xPropSet.is() )
|
|
|
|
{
|
|
|
|
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
|
|
|
|
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Bool bTemp = false;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// is empty pes shape?
|
2012-06-02 08:58:21 -05:00
|
|
|
if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsEmptyPresentationObject")))
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("IsEmptyPresentationObject")) >>= bIsEmpty;
|
2001-02-02 10:14:37 +00:00
|
|
|
if( bIsEmpty )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TRUE);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// is user-transformed?
|
2012-06-02 08:58:21 -05:00
|
|
|
if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsPlaceholderDependent")))
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("IsPlaceholderDependent")) >>= bTemp;
|
2001-02-02 10:14:37 +00:00
|
|
|
if(!bTemp)
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TRUE);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bIsEmpty;
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape )
|
|
|
|
{
|
|
|
|
uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY );
|
2004-03-30 15:15:15 +00:00
|
|
|
if( xText.is() )
|
|
|
|
{
|
|
|
|
uno::Reference< container::XEnumerationAccess > xEnumAccess( xShape, uno::UNO_QUERY );
|
|
|
|
if( xEnumAccess.is() && xEnumAccess->hasElements() )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.GetTextParagraphExport()->exportText( xText );
|
2004-03-30 15:15:15 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
2001-02-07 15:26:36 +00:00
|
|
|
#include <com/sun/star/presentation/ClickAction.hpp>
|
|
|
|
#include <com/sun/star/presentation/AnimationSpeed.hpp>
|
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
const sal_Int32 FOUND_CLICKACTION = 0x00000001;
|
|
|
|
const sal_Int32 FOUND_BOOKMARK = 0x00000002;
|
|
|
|
const sal_Int32 FOUND_EFFECT = 0x00000004;
|
|
|
|
const sal_Int32 FOUND_PLAYFULL = 0x00000008;
|
|
|
|
const sal_Int32 FOUND_VERB = 0x00000010;
|
|
|
|
const sal_Int32 FOUND_SOUNDURL = 0x00000020;
|
|
|
|
const sal_Int32 FOUND_SPEED = 0x00000040;
|
|
|
|
const sal_Int32 FOUND_CLICKEVENTTYPE = 0x00000080;
|
|
|
|
const sal_Int32 FOUND_MACRO = 0x00000100;
|
|
|
|
const sal_Int32 FOUND_LIBRARY = 0x00000200;
|
|
|
|
const sal_Int32 FOUND_ACTIONEVENTTYPE = 0x00000400;
|
|
|
|
|
|
|
|
} // namespace
|
2001-02-07 15:26:36 +00:00
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& xShape )
|
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
uno::Reference< document::XEventsSupplier > xEventsSupplier( xShape, uno::UNO_QUERY );
|
|
|
|
if( !xEventsSupplier.is() )
|
|
|
|
return;
|
|
|
|
|
|
|
|
uno::Reference< container::XNameAccess > xEvents( xEventsSupplier->getEvents(), uno::UNO_QUERY );
|
|
|
|
DBG_ASSERT( xEvents.is(), "XEventsSupplier::getEvents() returned NULL" );
|
|
|
|
if( !xEvents.is() )
|
|
|
|
return;
|
|
|
|
|
|
|
|
sal_Int32 nFound = 0;
|
|
|
|
|
|
|
|
// extract properties from "OnClick" event --------------------------------
|
|
|
|
|
|
|
|
OUString aClickEventType;
|
|
|
|
presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
|
|
|
|
presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
|
|
|
|
presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_SLOW;
|
|
|
|
OUString aStrSoundURL;
|
|
|
|
sal_Bool bPlayFull = false;
|
|
|
|
sal_Int32 nVerb = 0;
|
|
|
|
OUString aStrMacro;
|
|
|
|
OUString aStrLibrary;
|
|
|
|
OUString aStrBookmark;
|
|
|
|
|
|
|
|
uno::Sequence< beans::PropertyValue > aClickProperties;
|
|
|
|
if( xEvents->hasByName( msOnClick ) && (xEvents->getByName( msOnClick ) >>= aClickProperties) )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
const beans::PropertyValue* pProperty = aClickProperties.getConstArray();
|
|
|
|
const beans::PropertyValue* pPropertyEnd = pProperty + aClickProperties.getLength();
|
|
|
|
for( ; pProperty != pPropertyEnd; ++pProperty )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( ( ( nFound & FOUND_CLICKEVENTTYPE ) == 0 ) && pProperty->Name == msEventType )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= aClickEventType )
|
|
|
|
nFound |= FOUND_CLICKEVENTTYPE;
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && pProperty->Name == msClickAction )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= eClickAction )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_CLICKACTION;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperty->Name == msMacroName || pProperty->Name == msScript ) )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= aStrMacro )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_MACRO;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperty->Name == msLibrary )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= aStrLibrary )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_LIBRARY;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperty->Name == msEffect )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= eEffect )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_EFFECT;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperty->Name == msBookmark )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= aStrBookmark )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_BOOKMARK;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperty->Name == msSpeed )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= eSpeed )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_SPEED;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_SOUNDURL ) == 0 ) && pProperty->Name == msSoundURL )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= aStrSoundURL )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_SOUNDURL;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_PLAYFULL ) == 0 ) && pProperty->Name == msPlayFull )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= bPlayFull )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_PLAYFULL;
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else if( ( ( nFound & FOUND_VERB ) == 0 ) && pProperty->Name == msVerb )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( pProperty->Value >>= nVerb )
|
2001-02-07 15:26:36 +00:00
|
|
|
nFound |= FOUND_VERB;
|
|
|
|
}
|
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
}
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
// create the XML elements
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( aClickEventType == msPresentation )
|
|
|
|
{
|
|
|
|
if( ((nFound & FOUND_CLICKACTION) == 0) || (eClickAction == presentation::ClickAction_NONE) )
|
|
|
|
return;
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
enum XMLTokenEnum eStrAction;
|
|
|
|
|
|
|
|
switch( eClickAction )
|
|
|
|
{
|
2001-06-29 20:07:26 +00:00
|
|
|
case presentation::ClickAction_PREVPAGE: eStrAction = XML_PREVIOUS_PAGE; break;
|
|
|
|
case presentation::ClickAction_NEXTPAGE: eStrAction = XML_NEXT_PAGE; break;
|
|
|
|
case presentation::ClickAction_FIRSTPAGE: eStrAction = XML_FIRST_PAGE; break;
|
|
|
|
case presentation::ClickAction_LASTPAGE: eStrAction = XML_LAST_PAGE; break;
|
|
|
|
case presentation::ClickAction_INVISIBLE: eStrAction = XML_HIDE; break;
|
|
|
|
case presentation::ClickAction_STOPPRESENTATION:eStrAction = XML_STOP; break;
|
|
|
|
case presentation::ClickAction_PROGRAM: eStrAction = XML_EXECUTE; break;
|
|
|
|
case presentation::ClickAction_BOOKMARK: eStrAction = XML_SHOW; break;
|
|
|
|
case presentation::ClickAction_DOCUMENT: eStrAction = XML_SHOW; break;
|
|
|
|
case presentation::ClickAction_MACRO: eStrAction = XML_EXECUTE_MACRO; break;
|
|
|
|
case presentation::ClickAction_VERB: eStrAction = XML_VERB; break;
|
|
|
|
case presentation::ClickAction_VANISH: eStrAction = XML_FADE_OUT; break;
|
|
|
|
case presentation::ClickAction_SOUND: eStrAction = XML_SOUND; break;
|
2001-02-07 15:26:36 +00:00
|
|
|
default:
|
2011-03-01 19:07:44 +01:00
|
|
|
OSL_FAIL( "unknown presentation::ClickAction found!" );
|
2004-09-08 13:58:05 +00:00
|
|
|
eStrAction = XML_UNKNOWN;
|
2007-07-06 11:28:29 +00:00
|
|
|
}
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
OUString aEventQName(
|
|
|
|
mrExport.GetNamespaceMap().GetQNameByKey(
|
2012-06-02 08:58:21 -05:00
|
|
|
XML_NAMESPACE_DOM, OUString( "click" ) ) );
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( eClickAction == presentation::ClickAction_VANISH )
|
|
|
|
{
|
|
|
|
if( nFound & FOUND_EFFECT )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
XMLEffect eKind;
|
|
|
|
XMLEffectDirection eDirection;
|
|
|
|
sal_Int16 nStartScale;
|
|
|
|
sal_Bool bIn;
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
SdXMLImplSetEffect( eEffect, eKind, eDirection, nStartScale, bIn );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( eKind != EK_none )
|
|
|
|
{
|
|
|
|
SvXMLUnitConverter::convertEnum( msBuffer, eKind, aXML_AnimationEffect_EnumMap );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_EFFECT, msBuffer.makeStringAndClear() );
|
|
|
|
}
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( eDirection != ED_none )
|
|
|
|
{
|
|
|
|
SvXMLUnitConverter::convertEnum( msBuffer, eDirection, aXML_AnimationDirection_EnumMap );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_DIRECTION, msBuffer.makeStringAndClear() );
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( nStartScale != -1 )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
2011-10-11 14:19:00 +02:00
|
|
|
::sax::Converter::convertPercent( msBuffer, nStartScale );
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_START_SCALE, msBuffer.makeStringAndClear() );
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( nFound & FOUND_SPEED && eEffect != presentation::AnimationEffect_NONE )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
if( eSpeed != presentation::AnimationSpeed_MEDIUM )
|
|
|
|
{
|
|
|
|
SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( eClickAction == presentation::ClickAction_PROGRAM ||
|
|
|
|
eClickAction == presentation::ClickAction_BOOKMARK ||
|
|
|
|
eClickAction == presentation::ClickAction_DOCUMENT )
|
|
|
|
{
|
|
|
|
if( eClickAction == presentation::ClickAction_BOOKMARK )
|
|
|
|
msBuffer.append( sal_Unicode('#') );
|
|
|
|
|
|
|
|
msBuffer.append( aStrBookmark );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(msBuffer.makeStringAndClear()) );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( ( nFound & FOUND_VERB ) && eClickAction == presentation::ClickAction_VERB )
|
|
|
|
{
|
|
|
|
msBuffer.append( nVerb );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
|
|
|
|
}
|
|
|
|
|
|
|
|
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
|
|
|
|
|
|
|
|
if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
|
|
|
|
{
|
2012-01-25 17:00:07 -02:00
|
|
|
if( ( nFound & FOUND_SOUNDURL ) && !aStrSoundURL.isEmpty() )
|
2007-07-06 11:28:29 +00:00
|
|
|
{
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStrSoundURL) );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
|
2007-07-06 11:28:29 +00:00
|
|
|
if( nFound & FOUND_PLAYFULL && bPlayFull )
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( aClickEventType == msStarBasic )
|
|
|
|
{
|
|
|
|
if( nFound & FOUND_MACRO )
|
|
|
|
{
|
|
|
|
SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
|
|
|
|
mrExport.GetNamespaceMap().GetQNameByKey(
|
|
|
|
XML_NAMESPACE_OOO,
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString( "starbasic" ) ) );
|
2007-07-06 11:28:29 +00:00
|
|
|
OUString aEventQName(
|
|
|
|
mrExport.GetNamespaceMap().GetQNameByKey(
|
2012-06-02 08:58:21 -05:00
|
|
|
XML_NAMESPACE_DOM, OUString( "click" ) ) );
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2007-07-06 11:28:29 +00:00
|
|
|
if( nFound & FOUND_LIBRARY )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
OUString sLocation( GetXMLToken(
|
2012-02-21 01:06:12 +09:00
|
|
|
(aStrLibrary.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("StarOffice")) ||
|
|
|
|
aStrLibrary.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) ) ? XML_APPLICATION
|
2007-07-06 11:28:29 +00:00
|
|
|
: XML_DOCUMENT ) );
|
|
|
|
OUStringBuffer sTmp( sLocation.getLength() + aStrMacro.getLength() + 1 );
|
|
|
|
sTmp = sLocation;
|
|
|
|
sTmp.append( sal_Unicode( ':' ) );
|
|
|
|
sTmp.append( aStrMacro );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
|
|
|
|
sTmp.makeStringAndClear());
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
|
|
|
|
}
|
|
|
|
|
|
|
|
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
2007-07-06 11:28:29 +00:00
|
|
|
}
|
|
|
|
else if( aClickEventType == msScript )
|
|
|
|
{
|
|
|
|
if( nFound & FOUND_MACRO )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
|
|
|
|
if ( nFound & FOUND_MACRO )
|
2001-02-07 15:26:36 +00:00
|
|
|
{
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
|
|
|
|
XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) );
|
2004-07-13 07:09:54 +00:00
|
|
|
OUString aEventQName(
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.GetNamespaceMap().GetQNameByKey(
|
2012-06-02 08:58:21 -05:00
|
|
|
XML_NAMESPACE_DOM, OUString( "click" ) ) );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
|
2007-07-06 11:28:29 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
|
2004-07-13 07:09:54 +00:00
|
|
|
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
2004-05-19 07:55:03 +00:00
|
|
|
}
|
2001-02-07 15:26:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
/** #i68101# export shape Title and Description */
|
|
|
|
void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape >& xShape )
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
OUString aTitle;
|
|
|
|
OUString aDescription;
|
|
|
|
|
|
|
|
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue( OUString( "Title" ) ) >>= aTitle;
|
|
|
|
xProps->getPropertyValue( OUString( "Description" ) ) >>= aDescription;
|
2006-12-19 16:26:11 +00:00
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if(!aTitle.isEmpty())
|
2006-12-19 16:26:11 +00:00
|
|
|
{
|
|
|
|
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False);
|
|
|
|
mrExport.Characters( aTitle );
|
|
|
|
}
|
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if(!aDescription.isEmpty())
|
2006-12-19 16:26:11 +00:00
|
|
|
{
|
|
|
|
SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False );
|
|
|
|
mrExport.Characters( aDescription );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
2011-03-01 19:07:44 +01:00
|
|
|
OSL_FAIL( "could not export Title and/or Description for shape!" );
|
2006-12-19 16:26:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2006-06-19 17:12:19 +00:00
|
|
|
void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
|
|
|
|
if(xShapes.is() && xShapes->getCount())
|
|
|
|
{
|
|
|
|
// write group shape
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2001-07-24 14:53:45 +00:00
|
|
|
// #89764# if export of position is supressed for group shape,
|
|
|
|
// positions of contained objects should be written relative to
|
|
|
|
// the upper left edge of the group.
|
|
|
|
awt::Point aUpperLeft;
|
|
|
|
|
|
|
|
if(!(nFeatures & SEF_EXPORT_POSITION))
|
|
|
|
{
|
|
|
|
nFeatures |= SEF_EXPORT_POSITION;
|
|
|
|
aUpperLeft = xShape->getPosition();
|
|
|
|
pRefPoint = &aUpperLeft;
|
|
|
|
}
|
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
// write members
|
|
|
|
exportShapes( xShapes, nFeatures, pRefPoint );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportTextBoxShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2001-02-09 12:38:53 +00:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
|
|
|
|
|
|
|
|
// presentation attribute (if presentation)
|
2010-11-10 13:50:33 +08:00
|
|
|
sal_Bool bIsPresShape(sal_False);
|
|
|
|
sal_Bool bIsEmptyPresObj(sal_False);
|
2001-02-09 12:38:53 +00:00
|
|
|
OUString aStr;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
switch(eShapeType)
|
|
|
|
{
|
|
|
|
case XmlShapeTypePresSubtitleShape:
|
|
|
|
{
|
2001-06-29 20:07:26 +00:00
|
|
|
aStr = GetXMLToken(XML_PRESENTATION_SUBTITLE);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2001-02-02 10:14:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresTitleTextShape:
|
|
|
|
{
|
2001-06-29 20:07:26 +00:00
|
|
|
aStr = GetXMLToken(XML_PRESENTATION_TITLE);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2001-02-02 10:14:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresOutlinerShape:
|
|
|
|
{
|
2001-06-29 20:07:26 +00:00
|
|
|
aStr = GetXMLToken(XML_PRESENTATION_OUTLINE);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2001-02-02 10:14:37 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresNotesShape:
|
|
|
|
{
|
2001-06-29 20:07:26 +00:00
|
|
|
aStr = GetXMLToken(XML_PRESENTATION_NOTES);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2001-02-02 10:14:37 +00:00
|
|
|
break;
|
|
|
|
}
|
2004-03-30 15:15:15 +00:00
|
|
|
case XmlShapeTypePresHeaderShape:
|
|
|
|
{
|
|
|
|
aStr = GetXMLToken(XML_HEADER);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2004-03-30 15:15:15 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresFooterShape:
|
|
|
|
{
|
|
|
|
aStr = GetXMLToken(XML_FOOTER);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2004-03-30 15:15:15 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresSlideNumberShape:
|
|
|
|
{
|
|
|
|
aStr = GetXMLToken(XML_PAGE_NUMBER);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2004-03-30 15:15:15 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XmlShapeTypePresDateTimeShape:
|
|
|
|
{
|
|
|
|
aStr = GetXMLToken(XML_DATE_TIME);
|
2010-11-10 13:50:33 +08:00
|
|
|
bIsPresShape = sal_True;
|
2004-03-30 15:15:15 +00:00
|
|
|
break;
|
|
|
|
}
|
2006-06-19 17:12:19 +00:00
|
|
|
default:
|
|
|
|
break;
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
if(bIsPresShape)
|
|
|
|
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr );
|
|
|
|
|
|
|
|
|
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
2001-11-15 16:14:01 +00:00
|
|
|
// evtl. corner radius?
|
|
|
|
sal_Int32 nCornerRadius(0L);
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius;
|
2001-11-15 16:14:01 +00:00
|
|
|
if(nCornerRadius)
|
|
|
|
{
|
|
|
|
OUStringBuffer sStringBuffer;
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
nCornerRadius);
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, sStringBuffer.makeStringAndClear());
|
2001-11-15 16:14:01 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
{
|
|
|
|
// write text-box
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, sal_True, sal_True);
|
2004-07-13 07:09:54 +00:00
|
|
|
if(!bIsEmptyPresObj)
|
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportRectangleShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// evtl. corner radius?
|
|
|
|
sal_Int32 nCornerRadius(0L);
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius;
|
2001-02-02 10:14:37 +00:00
|
|
|
if(nCornerRadius)
|
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
OUStringBuffer sStringBuffer;
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
nCornerRadius);
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, sStringBuffer.makeStringAndClear());
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write rectangle
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_RECT, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportLineShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
OUString aStr;
|
|
|
|
OUStringBuffer sStringBuffer;
|
|
|
|
awt::Point aStart(0,0);
|
|
|
|
awt::Point aEnd(1,1);
|
|
|
|
|
2001-04-24 10:34:51 +00:00
|
|
|
// #85920# use 'Geometry' to get the points of the line
|
|
|
|
// since this slot take anchor pos into account.
|
|
|
|
|
|
|
|
// get matrix
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DHomMatrix aMatrix;
|
|
|
|
ImpExportNewTrans_GetB2DHomMatrix(aMatrix, xPropSet);
|
2001-04-24 10:34:51 +00:00
|
|
|
|
|
|
|
// decompose and correct about pRefPoint
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRScale;
|
2001-04-24 10:34:51 +00:00
|
|
|
double fTRShear(0.0);
|
|
|
|
double fTRRotate(0.0);
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRTranslate;
|
|
|
|
ImpExportNewTrans_DecomposeAndRefPoint(aMatrix, aTRScale, fTRShear, fTRRotate, aTRTranslate, pRefPoint);
|
2001-04-24 10:34:51 +00:00
|
|
|
|
|
|
|
// create base position
|
2006-11-14 13:14:30 +00:00
|
|
|
awt::Point aBasePosition(FRound(aTRTranslate.getX()), FRound(aTRTranslate.getY()));
|
2001-04-24 10:34:51 +00:00
|
|
|
|
|
|
|
// get the two points
|
2012-06-02 08:58:21 -05:00
|
|
|
uno::Any aAny(xPropSet->getPropertyValue(OUString("Geometry")));
|
2001-04-24 10:34:51 +00:00
|
|
|
drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue();
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
if(pSourcePolyPolygon)
|
|
|
|
{
|
|
|
|
drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->getArray();
|
|
|
|
if(pOuterSequence)
|
|
|
|
{
|
|
|
|
drawing::PointSequence* pInnerSequence = pOuterSequence++;
|
|
|
|
if(pInnerSequence)
|
|
|
|
{
|
|
|
|
awt::Point* pArray = pInnerSequence->getArray();
|
|
|
|
if(pArray)
|
|
|
|
{
|
|
|
|
if(pInnerSequence->getLength() > 0)
|
|
|
|
{
|
2001-04-24 10:34:51 +00:00
|
|
|
aStart = awt::Point(
|
|
|
|
pArray->X + aBasePosition.X,
|
|
|
|
pArray->Y + aBasePosition.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
pArray++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(pInnerSequence->getLength() > 1)
|
|
|
|
{
|
2001-04-24 10:34:51 +00:00
|
|
|
aEnd = awt::Point(
|
|
|
|
pArray->X + aBasePosition.X,
|
|
|
|
pArray->Y + aBasePosition.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_X )
|
|
|
|
{
|
|
|
|
// svg: x1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.X -= aStart.X;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_Y )
|
|
|
|
{
|
|
|
|
// svg: y1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.Y -= aStart.Y;
|
|
|
|
}
|
|
|
|
|
|
|
|
// svg: x2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aEnd.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// svg: y2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aEnd.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// write line
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_LINE, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportEllipseShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// get size to decide between Circle and Ellipse
|
|
|
|
awt::Size aSize = xShape->getSize();
|
|
|
|
sal_Int32 nRx((aSize.Width + 1) / 2);
|
|
|
|
sal_Int32 nRy((aSize.Height + 1) / 2);
|
2010-11-10 13:50:33 +08:00
|
|
|
sal_Bool bCircle(nRx == nRy);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
drawing::CircleKind eKind = drawing::CircleKind_FULL;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString("CircleKind") ) >>= eKind;
|
2001-02-02 10:14:37 +00:00
|
|
|
if( eKind != drawing::CircleKind_FULL )
|
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
OUStringBuffer sStringBuffer;
|
2006-11-21 16:33:43 +00:00
|
|
|
sal_Int32 nStartAngle = 0;
|
|
|
|
sal_Int32 nEndAngle = 0;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString("CircleStartAngle") ) >>= nStartAngle;
|
|
|
|
xPropSet->getPropertyValue( OUString("CircleEndAngle") ) >>= nEndAngle;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
const double dStartAngle = nStartAngle / 100.0;
|
|
|
|
const double dEndAngle = nEndAngle / 100.0;
|
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// export circle kind
|
2010-11-10 13:50:33 +08:00
|
|
|
SvXMLUnitConverter::convertEnum( sStringBuffer, (sal_uInt16)eKind, aXML_CircleKind_EnumMap );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_KIND, sStringBuffer.makeStringAndClear() );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// export start angle
|
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
2011-10-11 14:19:00 +02:00
|
|
|
::sax::Converter::convertDouble( sStringBuffer, dStartAngle );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_ANGLE, sStringBuffer.makeStringAndClear() );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// export end angle
|
#i108468#: clean up xmluconv code duplication, part 1:
move convertNumber64 from SvXMLUnitConverter to sax::converter.
remove duplicate methods from SvXMLUnitConverter:
convertBool, convertPercent, convertColor, convertNumber, convertDouble,
indexOfComma, encodeBase64, decodeBase64, decodeBase64SomeChars,
clearUndefinedChars
2011-10-11 14:19:00 +02:00
|
|
|
::sax::Converter::convertDouble( sStringBuffer, dEndAngle );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_ANGLE, sStringBuffer.makeStringAndClear() );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2001-08-02 10:49:11 +00:00
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
if(bCircle)
|
|
|
|
{
|
|
|
|
// write circle
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CIRCLE, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// write ellipse
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_ELLIPSE, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportPolygonShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2001-02-09 12:38:53 +00:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
2010-11-10 13:50:33 +08:00
|
|
|
sal_Bool bClosed(eShapeType == XmlShapeTypeDrawPolyPolygonShape
|
2001-02-02 10:14:37 +00:00
|
|
|
|| eShapeType == XmlShapeTypeDrawClosedBezierShape);
|
2010-11-10 13:50:33 +08:00
|
|
|
sal_Bool bBezier(eShapeType == XmlShapeTypeDrawClosedBezierShape
|
2001-02-02 10:14:37 +00:00
|
|
|
|| eShapeType == XmlShapeTypeDrawOpenBezierShape);
|
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// get matrix
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DHomMatrix aMatrix;
|
|
|
|
ImpExportNewTrans_GetB2DHomMatrix(aMatrix, xPropSet);
|
2001-02-09 12:38:53 +00:00
|
|
|
|
|
|
|
// decompose and correct abour pRefPoint
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRScale;
|
2001-02-09 12:38:53 +00:00
|
|
|
double fTRShear(0.0);
|
|
|
|
double fTRRotate(0.0);
|
2006-11-14 13:14:30 +00:00
|
|
|
::basegfx::B2DTuple aTRTranslate;
|
|
|
|
ImpExportNewTrans_DecomposeAndRefPoint(aMatrix, aTRScale, fTRShear, fTRRotate, aTRTranslate, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// use features and write
|
|
|
|
ImpExportNewTrans_FeaturesAndWrite(aTRScale, fTRShear, fTRRotate, aTRTranslate, nFeatures);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// create and export ViewBox
|
2001-02-09 12:38:53 +00:00
|
|
|
awt::Point aPoint(0, 0);
|
2006-11-14 13:14:30 +00:00
|
|
|
awt::Size aSize(FRound(aTRScale.getX()), FRound(aTRScale.getY()));
|
2001-02-02 10:14:37 +00:00
|
|
|
SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height);
|
2006-10-12 13:41:21 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString());
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2001-08-02 10:49:11 +00:00
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
if(bBezier)
|
|
|
|
{
|
|
|
|
// get PolygonBezier
|
2012-06-02 08:58:21 -05:00
|
|
|
uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) );
|
2001-02-02 10:14:37 +00:00
|
|
|
drawing::PolyPolygonBezierCoords* pSourcePolyPolygon =
|
|
|
|
(drawing::PolyPolygonBezierCoords*)aAny.getValue();
|
|
|
|
|
|
|
|
if(pSourcePolyPolygon && pSourcePolyPolygon->Coordinates.getLength())
|
|
|
|
{
|
|
|
|
sal_Int32 nOuterCnt(pSourcePolyPolygon->Coordinates.getLength());
|
|
|
|
drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->Coordinates.getArray();
|
|
|
|
drawing::FlagSequence* pOuterFlags = pSourcePolyPolygon->Flags.getArray();
|
|
|
|
|
|
|
|
if(pOuterSequence && pOuterFlags)
|
|
|
|
{
|
|
|
|
// prepare svx:d element export
|
2012-06-05 05:03:06 +02:00
|
|
|
SdXMLImExSvgDElement aSvgDElement(aViewBox, GetExport());
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
for(sal_Int32 a(0L); a < nOuterCnt; a++)
|
|
|
|
{
|
|
|
|
drawing::PointSequence* pSequence = pOuterSequence++;
|
|
|
|
drawing::FlagSequence* pFlags = pOuterFlags++;
|
|
|
|
|
|
|
|
if(pSequence && pFlags)
|
|
|
|
{
|
|
|
|
aSvgDElement.AddPolygon(pSequence, pFlags,
|
2006-10-12 13:41:21 +00:00
|
|
|
aPoint, aSize, bClosed);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// write point array
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write object now
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PATH, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportText( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// get non-bezier polygon
|
2012-06-02 08:58:21 -05:00
|
|
|
uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) );
|
2001-02-02 10:14:37 +00:00
|
|
|
drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue();
|
|
|
|
|
|
|
|
if(pSourcePolyPolygon && pSourcePolyPolygon->getLength())
|
|
|
|
{
|
|
|
|
sal_Int32 nOuterCnt(pSourcePolyPolygon->getLength());
|
|
|
|
|
|
|
|
if(1L == nOuterCnt && !bBezier)
|
|
|
|
{
|
|
|
|
// simple polygon shape, can be written as svg:points sequence
|
|
|
|
drawing::PointSequence* pSequence = pSourcePolyPolygon->getArray();
|
|
|
|
if(pSequence)
|
|
|
|
{
|
2006-10-12 13:41:21 +00:00
|
|
|
SdXMLImExPointsElement aPoints(pSequence, aViewBox, aPoint, aSize,
|
2002-01-08 14:43:07 +00:00
|
|
|
// #96328#
|
|
|
|
bClosed);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// write point array
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, aPoints.GetExportString());
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write object now
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW,
|
2001-08-02 10:49:11 +00:00
|
|
|
bClosed ? XML_POLYGON : XML_POLYLINE , bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// polypolygon or bezier, needs to be written as a svg:path sequence
|
|
|
|
drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->getArray();
|
|
|
|
if(pOuterSequence)
|
|
|
|
{
|
|
|
|
// prepare svx:d element export
|
2012-06-05 05:03:06 +02:00
|
|
|
SdXMLImExSvgDElement aSvgDElement(aViewBox, GetExport());
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
for(sal_Int32 a(0L); a < nOuterCnt; a++)
|
|
|
|
{
|
|
|
|
drawing::PointSequence* pSequence = pOuterSequence++;
|
|
|
|
if(pSequence)
|
|
|
|
{
|
|
|
|
aSvgDElement.AddPolygon(pSequence, 0L, aPoint,
|
2006-10-12 13:41:21 +00:00
|
|
|
aSize, bClosed);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// write point array
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write object now
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PATH, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportGraphicObjectShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2001-02-09 12:38:53 +00:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
sal_Bool bIsEmptyPresObj = sal_False;
|
|
|
|
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
|
|
|
|
|
2001-02-09 12:38:53 +00:00
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-08-09 13:09:49 +00:00
|
|
|
OUString sImageURL;
|
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
if(eShapeType == XmlShapeTypePresGraphicObjectShape)
|
2001-06-29 20:07:26 +00:00
|
|
|
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_GRAPHIC) );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
2007-08-03 11:54:17 +00:00
|
|
|
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
|
|
|
|
|
|
|
|
if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2007-04-16 12:11:31 +00:00
|
|
|
if( !bIsEmptyPresObj )
|
|
|
|
{
|
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
|
|
|
OUString aReplacementUrl;
|
|
|
|
xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ReplacementGraphicURL"))) >>= aReplacementUrl;
|
|
|
|
|
|
|
|
// If there is no url, then then graphic is empty
|
|
|
|
if(aReplacementUrl.getLength())
|
|
|
|
{
|
|
|
|
const OUString aStr = mrExport.AddEmbeddedGraphicObject(aReplacementUrl);
|
|
|
|
|
|
|
|
if(aStr.getLength())
|
|
|
|
{
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr);
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
|
|
|
|
|
|
|
// xlink:href for replacement, only written for Svg content
|
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True);
|
|
|
|
|
|
|
|
// optional office:binary-data
|
|
|
|
mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-04-16 12:11:31 +00:00
|
|
|
OUString aStreamURL;
|
|
|
|
OUString aStr;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString("GraphicStreamURL")) >>= aStreamURL;
|
|
|
|
xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL;
|
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
2009-08-05 17:01:07 +00:00
|
|
|
|
|
|
|
OUString aResolveURL( sImageURL );
|
2012-06-02 08:58:21 -05:00
|
|
|
const rtl::OUString sPackageURL( "vnd.sun.star.Package:" );
|
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
2009-08-05 17:01:07 +00:00
|
|
|
|
|
|
|
// sj: trying to preserve the filename
|
|
|
|
if ( aStreamURL.match( sPackageURL, 0 ) )
|
|
|
|
{
|
|
|
|
rtl::OUString sRequestedName( aStreamURL.copy( sPackageURL.getLength(), aStreamURL.getLength() - sPackageURL.getLength() ) );
|
|
|
|
sal_Int32 nLastIndex = sRequestedName.lastIndexOf( '/' ) + 1;
|
|
|
|
if ( ( nLastIndex > 0 ) && ( nLastIndex < sRequestedName.getLength() ) )
|
|
|
|
sRequestedName = sRequestedName.copy( nLastIndex, sRequestedName.getLength() - nLastIndex );
|
|
|
|
nLastIndex = sRequestedName.lastIndexOf( '.' );
|
|
|
|
if ( nLastIndex >= 0 )
|
|
|
|
sRequestedName = sRequestedName.copy( 0, nLastIndex );
|
2012-01-25 17:00:07 -02:00
|
|
|
if ( !sRequestedName.isEmpty() )
|
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
2009-08-05 17:01:07 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
aResolveURL = aResolveURL.concat( OUString("?requestedName="));
|
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
2009-08-05 17:01:07 +00:00
|
|
|
aResolveURL = aResolveURL.concat( sRequestedName );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
aStr = mrExport.AddEmbeddedGraphicObject( aResolveURL );
|
2007-04-16 12:11:31 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !aStr.isEmpty() )
|
2001-08-09 13:09:49 +00:00
|
|
|
{
|
2007-04-16 12:11:31 +00:00
|
|
|
if( aStr[ 0 ] == '#' )
|
|
|
|
{
|
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
|
|
|
aStreamURL = sPackageURL;
|
2007-04-16 12:11:31 +00:00
|
|
|
aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) );
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2007-04-16 12:11:31 +00:00
|
|
|
// update stream URL for load on demand
|
|
|
|
uno::Any aAny;
|
|
|
|
aAny <<= aStreamURL;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->setPropertyValue( OUString("GraphicStreamURL"), aAny );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2007-04-16 12:11:31 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
OUString aStr;
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, aStr );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2001-08-09 13:09:49 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
{
|
2007-04-16 12:11:31 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True);
|
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !sImageURL.isEmpty() )
|
2007-04-16 12:11:31 +00:00
|
|
|
{
|
|
|
|
// optional office:binary-data
|
|
|
|
mrExport.AddEmbeddedGraphicObjectAsBase64( sImageURL );
|
|
|
|
}
|
|
|
|
if( !bIsEmptyPresObj )
|
|
|
|
ImpExportText( xShape );
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
2001-08-09 13:09:49 +00:00
|
|
|
}
|
|
|
|
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-03-29 15:48:43 +00:00
|
|
|
|
|
|
|
// image map
|
|
|
|
GetExport().GetImageMapExport().Export( xPropSet );
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportChartShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2004-11-09 11:16:08 +00:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint,
|
|
|
|
SvXMLAttributeList* pAttrList )
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2004-11-09 11:16:08 +00:00
|
|
|
ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint, pAttrList );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportControlShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-02-09 12:38:53 +00:00
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
uno::Reference< drawing::XControlShape > xControl( xShape, uno::UNO_QUERY );
|
|
|
|
DBG_ASSERT( xControl.is(), "Control shape is not supporting XControlShape" );
|
|
|
|
if( xControl.is() )
|
|
|
|
{
|
|
|
|
uno::Reference< beans::XPropertySet > xControlModel( xControl->getControl(), uno::UNO_QUERY );
|
|
|
|
DBG_ASSERT( xControlModel.is(), "Control shape has not XControlModel" );
|
|
|
|
if( xControlModel.is() )
|
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CONTROL, mrExport.GetFormExport()->getControlId( xControlModel ) );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONTROL, bCreateNewline, sal_True);
|
2006-12-19 16:26:11 +00:00
|
|
|
|
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportConnectorShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
|
|
|
|
|
|
|
|
OUString aStr;
|
|
|
|
OUStringBuffer sStringBuffer;
|
|
|
|
|
|
|
|
// export connection kind
|
|
|
|
drawing::ConnectorType eType = drawing::ConnectorType_STANDARD;
|
2012-06-02 08:58:21 -05:00
|
|
|
uno::Any aAny = xProps->getPropertyValue(OUString("EdgeKind"));
|
2001-02-02 10:14:37 +00:00
|
|
|
aAny >>= eType;
|
|
|
|
|
|
|
|
if( eType != drawing::ConnectorType_STANDARD )
|
|
|
|
{
|
|
|
|
SvXMLUnitConverter::convertEnum( sStringBuffer, (sal_uInt16)eType, aXML_ConnectionKind_EnumMap );
|
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TYPE, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// export line skew
|
|
|
|
sal_Int32 nDelta1 = 0, nDelta2 = 0, nDelta3 = 0;
|
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xProps->getPropertyValue(OUString("EdgeLine1Delta"));
|
2001-02-02 10:14:37 +00:00
|
|
|
aAny >>= nDelta1;
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xProps->getPropertyValue(OUString("EdgeLine2Delta"));
|
2001-02-02 10:14:37 +00:00
|
|
|
aAny >>= nDelta2;
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xProps->getPropertyValue(OUString("EdgeLine3Delta"));
|
2001-02-02 10:14:37 +00:00
|
|
|
aAny >>= nDelta3;
|
|
|
|
|
|
|
|
if( nDelta1 != 0 || nDelta2 != 0 || nDelta3 != 0 )
|
|
|
|
{
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
nDelta1);
|
2001-02-02 10:14:37 +00:00
|
|
|
if( nDelta2 != 0 || nDelta3 != 0 )
|
|
|
|
{
|
|
|
|
const char aSpace = ' ';
|
|
|
|
sStringBuffer.appendAscii( &aSpace, 1 );
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
nDelta2);
|
2001-02-02 10:14:37 +00:00
|
|
|
if( nDelta3 != 0 )
|
|
|
|
{
|
|
|
|
sStringBuffer.appendAscii( &aSpace, 1 );
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(
|
|
|
|
sStringBuffer, nDelta3);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LINE_SKEW, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// export start and end point
|
|
|
|
awt::Point aStart(0,0);
|
|
|
|
awt::Point aEnd(1,1);
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
/* Get <StartPositionInHoriL2R> and
|
|
|
|
<EndPositionInHoriL2R>, if they exist and if the document is exported
|
|
|
|
into the OpenOffice.org file format.
|
|
|
|
These properties only exist at service com::sun::star::text::Shape - the
|
|
|
|
Writer UNO service for shapes.
|
|
|
|
This code is needed, because the positioning attributes in the
|
|
|
|
OpenOffice.org file format are given in horizontal left-to-right layout
|
|
|
|
regardless the layout direction the shape is in. In the OASIS Open Office
|
|
|
|
file format the positioning attributes are correctly given in the layout
|
|
|
|
direction the shape is in. Thus, this code provides the conversion from
|
|
|
|
the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
|
|
|
|
*/
|
2004-11-17 09:34:17 +00:00
|
|
|
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
|
|
|
|
xProps->getPropertySetInfo()->hasPropertyByName(
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString("StartPositionInHoriL2R")) &&
|
2004-11-17 09:34:17 +00:00
|
|
|
xProps->getPropertySetInfo()->hasPropertyByName(
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString("EndPositionInHoriL2R")) )
|
2004-11-17 09:34:17 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart;
|
|
|
|
xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd;
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("StartPosition")) >>= aStart;
|
|
|
|
xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd;
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
if( pRefPoint )
|
|
|
|
{
|
|
|
|
aStart.X -= pRefPoint->X;
|
|
|
|
aStart.Y -= pRefPoint->Y;
|
|
|
|
aEnd.X -= pRefPoint->X;
|
|
|
|
aEnd.Y -= pRefPoint->Y;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_X )
|
|
|
|
{
|
|
|
|
// svg: x1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.X -= aStart.X;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_Y )
|
|
|
|
{
|
|
|
|
// svg: y1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.Y -= aStart.Y;
|
|
|
|
}
|
|
|
|
|
|
|
|
// svg: x2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, aEnd.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// svg: y2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, aEnd.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2005-02-17 07:59:32 +00:00
|
|
|
// #i39320#
|
|
|
|
uno::Reference< uno::XInterface > xRefS;
|
|
|
|
uno::Reference< uno::XInterface > xRefE;
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// export start connection
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("StartShape" ) ) >>= xRefS;
|
2005-02-17 07:59:32 +00:00
|
|
|
if( xRefS.is() )
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefS );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, rShapeId);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xProps->getPropertyValue(OUString("StartGluePointIndex") );
|
2006-11-21 16:33:43 +00:00
|
|
|
sal_Int32 nGluePointId = 0;
|
2001-02-02 10:14:37 +00:00
|
|
|
if( aAny >>= nGluePointId )
|
|
|
|
{
|
|
|
|
if( nGluePointId != -1 )
|
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_GLUE_POINT, OUString::valueOf( nGluePointId ));
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// export end connection
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("EndShape") ) >>= xRefE;
|
2005-02-17 07:59:32 +00:00
|
|
|
if( xRefE.is() )
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefE );
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, rShapeId);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
aAny = xProps->getPropertyValue(OUString("EndGluePointIndex") );
|
2006-11-21 16:33:43 +00:00
|
|
|
sal_Int32 nGluePointId = 0;
|
2001-02-02 10:14:37 +00:00
|
|
|
if( aAny >>= nGluePointId )
|
|
|
|
{
|
|
|
|
if( nGluePointId != -1 )
|
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_GLUE_POINT, OUString::valueOf( nGluePointId ));
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
if( xProps->getPropertyValue( OUString( "PolyPolygonBezier" ) ) >>= aAny )
|
2008-07-01 21:56:39 +00:00
|
|
|
{
|
|
|
|
// get PolygonBezier
|
|
|
|
drawing::PolyPolygonBezierCoords* pSourcePolyPolygon =
|
|
|
|
(drawing::PolyPolygonBezierCoords*)aAny.getValue();
|
|
|
|
|
|
|
|
if(pSourcePolyPolygon && pSourcePolyPolygon->Coordinates.getLength())
|
|
|
|
{
|
|
|
|
sal_Int32 nOuterCnt(pSourcePolyPolygon->Coordinates.getLength());
|
|
|
|
drawing::PointSequence* pOuterSequence = pSourcePolyPolygon->Coordinates.getArray();
|
|
|
|
drawing::FlagSequence* pOuterFlags = pSourcePolyPolygon->Flags.getArray();
|
|
|
|
|
|
|
|
if(pOuterSequence && pOuterFlags)
|
|
|
|
{
|
|
|
|
// prepare svx:d element export
|
|
|
|
awt::Point aPoint( 0, 0 );
|
|
|
|
awt::Size aSize( 1, 1 );
|
|
|
|
SdXMLImExViewBox aViewBox( 0, 0, 1, 1 );
|
2012-06-05 05:03:06 +02:00
|
|
|
SdXMLImExSvgDElement aSvgDElement(aViewBox, GetExport());
|
2008-07-01 21:56:39 +00:00
|
|
|
|
|
|
|
for(sal_Int32 a(0L); a < nOuterCnt; a++)
|
|
|
|
{
|
|
|
|
drawing::PointSequence* pSequence = pOuterSequence++;
|
|
|
|
drawing::FlagSequence* pFlags = pOuterFlags++;
|
|
|
|
|
|
|
|
if(pSequence && pFlags)
|
|
|
|
{
|
|
|
|
aSvgDElement.AddPolygon(pSequence, pFlags,
|
|
|
|
aPoint, aSize, sal_False );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// write point array
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-13 19:14:22 +02:00
|
|
|
// get matrix
|
|
|
|
::basegfx::B2DHomMatrix aMatrix;
|
|
|
|
ImpExportNewTrans_GetB2DHomMatrix(aMatrix, xProps);
|
|
|
|
|
|
|
|
// decompose and correct about pRefPoint
|
|
|
|
::basegfx::B2DTuple aTRScale;
|
|
|
|
double fTRShear(0.0);
|
|
|
|
double fTRRotate(0.0);
|
|
|
|
::basegfx::B2DTuple aTRTranslate;
|
|
|
|
ImpExportNewTrans_DecomposeAndRefPoint(aMatrix, aTRScale, fTRShear,
|
|
|
|
fTRRotate, aTRTranslate, pRefPoint);
|
|
|
|
|
|
|
|
// fdo#49678: create and export ViewBox
|
|
|
|
awt::Point aPoint(0, 0);
|
|
|
|
awt::Size aSize(FRound(aTRScale.getX()), FRound(aTRScale.getY()));
|
|
|
|
SdXMLImExViewBox aViewBox(0, 0, aSize.Width, aSize.Height);
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString());
|
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
// write connector shape. Add Export later.
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-02 10:14:37 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportMeasureShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
|
|
|
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY );
|
|
|
|
|
|
|
|
OUString aStr;
|
|
|
|
OUStringBuffer sStringBuffer;
|
|
|
|
|
|
|
|
// export start and end point
|
|
|
|
awt::Point aStart(0,0);
|
|
|
|
awt::Point aEnd(1,1);
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
/* Get <StartPositionInHoriL2R> and
|
|
|
|
<EndPositionInHoriL2R>, if they exist and if the document is exported
|
|
|
|
into the OpenOffice.org file format.
|
|
|
|
These properties only exist at service com::sun::star::text::Shape - the
|
|
|
|
Writer UNO service for shapes.
|
|
|
|
This code is needed, because the positioning attributes in the
|
|
|
|
OpenOffice.org file format are given in horizontal left-to-right layout
|
|
|
|
regardless the layout direction the shape is in. In the OASIS Open Office
|
|
|
|
file format the positioning attributes are correctly given in the layout
|
|
|
|
direction the shape is in. Thus, this code provides the conversion from
|
|
|
|
the OASIS Open Office file format to the OpenOffice.org file format. (#i36248#)
|
|
|
|
*/
|
2004-11-17 09:34:17 +00:00
|
|
|
if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 &&
|
|
|
|
xProps->getPropertySetInfo()->hasPropertyByName(
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString("StartPositionInHoriL2R")) &&
|
2004-11-17 09:34:17 +00:00
|
|
|
xProps->getPropertySetInfo()->hasPropertyByName(
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString("EndPositionInHoriL2R")) )
|
2004-11-17 09:34:17 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart;
|
|
|
|
xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd;
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
xProps->getPropertyValue(OUString("StartPosition")) >>= aStart;
|
|
|
|
xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd;
|
2004-11-17 09:34:17 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
if( pRefPoint )
|
|
|
|
{
|
|
|
|
aStart.X -= pRefPoint->X;
|
|
|
|
aStart.Y -= pRefPoint->Y;
|
|
|
|
aEnd.X -= pRefPoint->X;
|
|
|
|
aEnd.Y -= pRefPoint->Y;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_X )
|
|
|
|
{
|
|
|
|
// svg: x1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.X -= aStart.X;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nFeatures & SEF_EXPORT_Y )
|
|
|
|
{
|
|
|
|
// svg: y1
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
aStart.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y1, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
aEnd.Y -= aStart.Y;
|
|
|
|
}
|
|
|
|
|
|
|
|
// svg: x2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, aEnd.X);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_X2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// svg: y2
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, aEnd.Y);
|
2001-02-02 10:14:37 +00:00
|
|
|
aStr = sStringBuffer.makeStringAndClear();
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
|
|
|
// write measure shape
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_MEASURE, bCreateNewline, sal_True);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2001-02-07 15:26:36 +00:00
|
|
|
|
2001-02-02 10:14:37 +00:00
|
|
|
uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY );
|
|
|
|
if( xText.is() )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.GetTextParagraphExport()->exportText( xText );
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportOLE2Shape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2004-11-09 11:16:08 +00:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */,
|
|
|
|
SvXMLAttributeList* pAttrList /* = NULL */ )
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-02-21 17:04:45 +00:00
|
|
|
uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
uno::Reference< container::XNamed > xNamed(xShape, uno::UNO_QUERY);
|
|
|
|
|
|
|
|
DBG_ASSERT( xPropSet.is() && xNamed.is(), "ole shape is not implementing needed interfaces");
|
|
|
|
if(xPropSet.is() && xNamed.is())
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-02-21 17:04:45 +00:00
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-21 17:04:45 +00:00
|
|
|
sal_Bool bIsEmptyPresObj = sal_False;
|
|
|
|
|
|
|
|
// presentation settings
|
2001-02-02 10:14:37 +00:00
|
|
|
if(eShapeType == XmlShapeTypePresOLE2Shape)
|
2001-06-29 20:07:26 +00:00
|
|
|
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) );
|
2001-02-21 17:04:45 +00:00
|
|
|
else if(eShapeType == XmlShapeTypePresChartShape)
|
2001-06-29 20:07:26 +00:00
|
|
|
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_CHART) );
|
2008-03-12 09:35:39 +00:00
|
|
|
else if(eShapeType == XmlShapeTypePresSheetShape)
|
2001-06-29 20:07:26 +00:00
|
|
|
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
|
2001-02-21 17:04:45 +00:00
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
sal_Bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
|
2004-11-26 12:00:25 +00:00
|
|
|
OUString sPersistName;
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2007-08-03 11:54:17 +00:00
|
|
|
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
|
|
|
|
|
|
|
|
if( !bIsEmptyPresObj || bSaveBackwardsCompatible )
|
2001-02-21 17:04:45 +00:00
|
|
|
{
|
2004-11-09 11:16:08 +00:00
|
|
|
if (pAttrList)
|
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttributeList(pAttrList);
|
2004-11-09 11:16:08 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
OUString sClassId;
|
|
|
|
OUString sURL;
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Bool bInternal = false;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("IsInternal")) >>= bInternal;
|
2004-07-13 07:09:54 +00:00
|
|
|
|
|
|
|
if( !bIsEmptyPresObj )
|
2002-01-18 15:36:12 +00:00
|
|
|
{
|
2001-02-21 17:04:45 +00:00
|
|
|
|
2004-10-04 17:11:16 +00:00
|
|
|
if ( bInternal )
|
2004-07-13 07:09:54 +00:00
|
|
|
{
|
2004-10-04 17:11:16 +00:00
|
|
|
// OOo internal links have no storage persistance, URL is stored in the XML file
|
|
|
|
// the result LinkURL is empty in case the object is not a link
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "LinkURL" ) ) >>= sURL;
|
2004-10-04 17:11:16 +00:00
|
|
|
}
|
|
|
|
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "PersistName" ) ) >>= sPersistName;
|
2012-01-25 17:00:07 -02:00
|
|
|
if ( sURL.isEmpty() )
|
2004-10-04 17:11:16 +00:00
|
|
|
{
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !sPersistName.isEmpty() )
|
2004-10-04 17:11:16 +00:00
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
sURL = OUString( "vnd.sun.star.EmbeddedObject:" );
|
2004-10-04 17:11:16 +00:00
|
|
|
sURL += sPersistName;
|
|
|
|
}
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
2001-02-21 17:04:45 +00:00
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
if( !bInternal )
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("CLSID")) >>= sClassId;
|
2001-02-21 17:04:45 +00:00
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !sClassId.isEmpty() )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId );
|
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
|
|
|
|
2012-12-26 19:57:34 +01:00
|
|
|
if(eShapeType != XmlShapeTypePresChartShape && eShapeType != XmlShapeTypeDrawChartShape)
|
|
|
|
{
|
|
|
|
// #i118485# Add text export, the draw OLE shape allows text now
|
|
|
|
// fdo#58571 chart objects don't allow text:p
|
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
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
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
if(!bExportEmbedded)
|
2002-06-27 10:09:52 +00:00
|
|
|
{
|
2004-07-13 07:09:54 +00:00
|
|
|
// xlink:href
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !sURL.isEmpty() )
|
2004-07-13 07:09:54 +00:00
|
|
|
{
|
|
|
|
// #96717# in theorie, if we don't have a url we shouldn't even
|
|
|
|
// export this ole shape. But practical its to risky right now
|
|
|
|
// to change this so we better dispose this on load
|
2006-06-19 17:12:19 +00:00
|
|
|
sURL = mrExport.AddEmbeddedObject( sURL );
|
2004-07-13 07:09:54 +00:00
|
|
|
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sURL );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-04-16 12:11:31 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// export empty href for empty placeholders to be valid odf
|
|
|
|
OUString sEmptyURL;
|
|
|
|
|
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sEmptyURL );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
|
|
|
}
|
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : XML_OBJECT_OLE ;
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, sal_True, sal_True );
|
2001-02-21 17:04:45 +00:00
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
if(bExportEmbedded && !bIsEmptyPresObj)
|
|
|
|
{
|
|
|
|
// #100592#
|
|
|
|
if(bInternal)
|
|
|
|
{
|
|
|
|
// embedded XML
|
|
|
|
uno::Reference< lang::XComponent > xComp;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString("Model" ) ) >>= xComp;
|
2004-07-13 07:09:54 +00:00
|
|
|
DBG_ASSERT( xComp.is(), "no xModel for own OLE format" );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.ExportEmbeddedOwnObject( xComp );
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// embed as Base64
|
2006-04-26 13:10:26 +00:00
|
|
|
// this is an alien object ( currently MSOLE is the only supported type of such objects )
|
|
|
|
// in case it is not an OASIS format the object should be asked to store replacement image if possible
|
|
|
|
|
|
|
|
::rtl::OUString sURLRequest( sURL );
|
2006-06-19 17:12:19 +00:00
|
|
|
if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 )
|
2012-06-02 08:58:21 -05:00
|
|
|
sURLRequest += ::rtl::OUString( "?oasis=false" );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddEmbeddedObjectAsBase64( sURLRequest );
|
2002-06-27 10:09:52 +00:00
|
|
|
}
|
2002-01-18 15:36:12 +00:00
|
|
|
}
|
2001-02-21 17:04:45 +00:00
|
|
|
}
|
2004-11-26 12:00:25 +00:00
|
|
|
if( !bIsEmptyPresObj )
|
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
OUString sURL( "vnd.sun.star.GraphicObject:" );
|
2004-11-26 12:00:25 +00:00
|
|
|
sURL += sPersistName;
|
|
|
|
if( !bExportEmbedded )
|
|
|
|
{
|
|
|
|
sURL = GetExport().AddEmbeddedObject( sURL );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, sURL );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2004-11-26 12:00:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
|
|
|
|
XML_IMAGE, sal_False, sal_True );
|
|
|
|
|
|
|
|
if( bExportEmbedded )
|
|
|
|
GetExport().AddEmbeddedObjectAsBase64( sURL );
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-02-07 15:26:36 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2006-12-19 16:26:11 +00:00
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportPageShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
|
|
|
|
{
|
2001-05-02 10:44:26 +00:00
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-05-02 10:44:26 +00:00
|
|
|
// #86163# Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
|
2001-06-11 11:58:59 +00:00
|
|
|
// export page number used for this page
|
|
|
|
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() );
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aPageNumberStr("PageNumber");
|
2001-06-11 11:58:59 +00:00
|
|
|
if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr))
|
|
|
|
{
|
|
|
|
sal_Int32 nPageNumber = 0;
|
|
|
|
xPropSet->getPropertyValue(aPageNumberStr) >>= nPageNumber;
|
2004-11-17 09:34:17 +00:00
|
|
|
if( nPageNumber )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_PAGE_NUMBER, OUString::valueOf(nPageNumber));
|
2001-06-11 11:58:59 +00:00
|
|
|
}
|
|
|
|
|
2001-05-02 10:44:26 +00:00
|
|
|
// a presentation page shape, normally used on notes pages only. If
|
|
|
|
// it is used not as presentation shape, it may have been created with
|
|
|
|
// copy-paste exchange between draw and impress (this IS possible...)
|
|
|
|
if(eShapeType == XmlShapeTypePresPageShape)
|
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_CLASS,
|
2001-06-29 20:07:26 +00:00
|
|
|
XML_PRESENTATION_PAGE);
|
2001-05-02 10:44:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// write Page shape
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, bCreateNewline, sal_True);
|
2001-05-02 10:44:26 +00:00
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportCaptionShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
|
2001-02-02 10:14:37 +00:00
|
|
|
{
|
2001-05-07 13:35:39 +00:00
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
2001-02-02 10:14:37 +00:00
|
|
|
|
2001-05-07 13:35:39 +00:00
|
|
|
// evtl. corner radius?
|
|
|
|
sal_Int32 nCornerRadius(0L);
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius;
|
2001-05-07 13:35:39 +00:00
|
|
|
if(nCornerRadius)
|
|
|
|
{
|
|
|
|
OUStringBuffer sStringBuffer;
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
|
|
|
|
nCornerRadius);
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CORNER_RADIUS, sStringBuffer.makeStringAndClear());
|
2001-05-07 13:35:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
awt::Point aCaptionPoint;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "CaptionPoint" ) ) >>= aCaptionPoint;
|
2001-05-07 13:35:39 +00:00
|
|
|
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(msBuffer,
|
|
|
|
aCaptionPoint.X);
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_X, msBuffer.makeStringAndClear() );
|
2011-10-11 14:19:09 +02:00
|
|
|
mrExport.GetMM100UnitConverter().convertMeasureToXML(msBuffer,
|
|
|
|
aCaptionPoint.Y);
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_Y, msBuffer.makeStringAndClear() );
|
2001-05-07 13:35:39 +00:00
|
|
|
|
|
|
|
// write Caption shape. Add export later.
|
2001-09-20 13:20:24 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2005-01-27 10:09:19 +00:00
|
|
|
sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION );
|
2001-05-07 13:35:39 +00:00
|
|
|
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aObj( mrExport,
|
2005-01-27 10:09:19 +00:00
|
|
|
(bAnnotation ? XML_NAMESPACE_OFFICE
|
|
|
|
: XML_NAMESPACE_DRAW),
|
|
|
|
(bAnnotation ? XML_ANNOTATION : XML_CAPTION),
|
|
|
|
bCreateNewline, sal_True );
|
2006-12-19 16:26:11 +00:00
|
|
|
|
|
|
|
ImpExportDescription( xShape ); // #i68101#
|
2001-05-07 13:35:39 +00:00
|
|
|
ImpExportEvents( xShape );
|
2001-05-31 10:18:38 +00:00
|
|
|
ImpExportGluePoints( xShape );
|
2005-01-27 10:09:19 +00:00
|
|
|
if( bAnnotation )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.exportAnnotationMeta( xShape );
|
2001-05-07 13:35:39 +00:00
|
|
|
ImpExportText( xShape );
|
|
|
|
}
|
2001-02-02 10:14:37 +00:00
|
|
|
}
|
|
|
|
|
2001-04-30 08:02:17 +00:00
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportFrameShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
|
2001-04-30 08:02:17 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
2001-04-30 08:02:17 +00:00
|
|
|
// export frame url
|
|
|
|
OUString aStr;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "FrameURL" ) ) >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// export name
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "FrameName" ) ) >>= aStr;
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !aStr.isEmpty() )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, aStr );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// write floating frame
|
2004-07-13 07:09:54 +00:00
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, sal_True, sal_True);
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
2001-04-30 08:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportAppletShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
|
2001-04-30 08:02:17 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
2001-04-30 08:02:17 +00:00
|
|
|
// export frame url
|
|
|
|
OUString aStr;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "AppletCodeBase" ) ) >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// export draw:applet-name
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "AppletName" ) ) >>= aStr;
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !aStr.isEmpty() )
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// export draw:code
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "AppletCode" ) ) >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// export draw:may-script
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Bool bIsScript = false;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "AppletIsScript" ) ) >>= bIsScript;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
{
|
2004-07-13 07:09:54 +00:00
|
|
|
// write applet
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_APPLET, sal_True, sal_True);
|
2004-07-13 07:09:54 +00:00
|
|
|
|
|
|
|
// export parameters
|
|
|
|
uno::Sequence< beans::PropertyValue > aCommands;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "AppletCommands" ) ) >>= aCommands;
|
2004-07-13 07:09:54 +00:00
|
|
|
const sal_Int32 nCount = aCommands.getLength();
|
|
|
|
for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
|
|
|
|
{
|
|
|
|
aCommands[nIndex].Value >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
|
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
2001-04-30 08:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
void XMLShapeExport::ImpExportPluginShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2006-06-19 17:12:19 +00:00
|
|
|
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
|
2001-04-30 08:02:17 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
|
2004-07-13 07:09:54 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
|
2004-07-13 07:09:54 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
2001-04-30 08:02:17 +00:00
|
|
|
// export plugin url
|
|
|
|
OUString aStr;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "PluginURL" ) ) >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2001-06-29 20:07:26 +00:00
|
|
|
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
// export mime-type
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "PluginMimeType" ) ) >>= aStr;
|
2012-01-25 17:00:07 -02:00
|
|
|
if(!aStr.isEmpty())
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr );
|
2001-04-30 08:02:17 +00:00
|
|
|
|
|
|
|
{
|
2004-07-13 07:09:54 +00:00
|
|
|
// write plugin
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, sal_True, sal_True);
|
2004-07-13 07:09:54 +00:00
|
|
|
|
|
|
|
// export parameters
|
|
|
|
uno::Sequence< beans::PropertyValue > aCommands;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "PluginCommands" ) ) >>= aCommands;
|
2004-07-13 07:09:54 +00:00
|
|
|
const sal_Int32 nCount = aCommands.getLength();
|
|
|
|
for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
|
|
|
|
{
|
|
|
|
aCommands[nIndex].Value >>= aStr;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
|
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
|
2004-07-13 07:09:54 +00:00
|
|
|
}
|
2001-04-30 08:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2011-12-03 00:00:08 +01:00
|
|
|
static void lcl_CopyStream(
|
2011-12-06 04:36:22 +01:00
|
|
|
uno::Reference<io::XInputStream> const& xInStream,
|
2011-12-03 00:00:08 +01:00
|
|
|
uno::Reference<embed::XStorage> const& xTarget,
|
2011-12-06 04:36:22 +01:00
|
|
|
::rtl::OUString const& rPath)
|
2011-12-03 00:00:08 +01:00
|
|
|
{
|
2011-12-06 04:36:22 +01:00
|
|
|
::comphelper::LifecycleProxy proxy;
|
|
|
|
uno::Reference<io::XStream> const xStream(
|
|
|
|
::comphelper::OStorageHelper::GetStreamAtPackageURL(xTarget, rPath,
|
|
|
|
embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE, proxy));
|
|
|
|
uno::Reference<io::XOutputStream> const xOutStream(
|
|
|
|
(xStream.is()) ? xStream->getOutputStream() : 0);
|
|
|
|
if (!xOutStream.is())
|
2011-12-03 00:00:08 +01:00
|
|
|
{
|
2011-12-06 04:36:22 +01:00
|
|
|
SAL_WARN("xmloff", "no output stream");
|
|
|
|
throw uno::Exception(
|
2012-06-02 08:58:21 -05:00
|
|
|
::rtl::OUString("no output stream"),0);
|
2011-12-03 00:00:08 +01:00
|
|
|
}
|
2011-12-06 04:36:22 +01:00
|
|
|
uno::Reference< beans::XPropertySet > const xStreamProps(xStream,
|
|
|
|
uno::UNO_QUERY);
|
|
|
|
if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
|
|
|
|
xStreamProps->setPropertyValue(
|
2012-06-02 08:58:21 -05:00
|
|
|
::rtl::OUString("MediaType"),
|
|
|
|
uno::makeAny(::rtl::OUString(
|
2011-12-06 04:36:22 +01:00
|
|
|
//FIXME how to detect real media type?
|
|
|
|
//but currently xmloff has this one hardcoded anyway...
|
2012-06-02 08:58:21 -05:00
|
|
|
"application/vnd.sun.star.media")));
|
2011-12-06 04:36:22 +01:00
|
|
|
xStreamProps->setPropertyValue( // turn off compression
|
2012-06-02 08:58:21 -05:00
|
|
|
::rtl::OUString("Compressed"),
|
2011-12-06 04:36:22 +01:00
|
|
|
uno::makeAny(sal_False));
|
2011-12-03 00:00:08 +01:00
|
|
|
}
|
2011-12-06 04:36:22 +01:00
|
|
|
::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
|
|
|
|
xOutStream->closeOutput();
|
|
|
|
proxy.commitStorages();
|
2011-12-03 00:00:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static char const s_PkgScheme[] = "vnd.sun.star.Package:";
|
|
|
|
|
|
|
|
static ::rtl::OUString
|
2011-12-06 04:36:22 +01:00
|
|
|
lcl_StoreMediaAndGetURL(SvXMLExport & rExport,
|
|
|
|
uno::Reference<beans::XPropertySet> const& xPropSet,
|
|
|
|
::rtl::OUString const& rURL)
|
2011-12-03 00:00:08 +01:00
|
|
|
{
|
|
|
|
if (0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
|
|
|
|
rURL.getStr(), rURL.getLength(),
|
|
|
|
s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1))
|
|
|
|
{
|
|
|
|
try // video is embedded
|
|
|
|
{
|
|
|
|
uno::Reference<embed::XStorage> const xTarget(
|
|
|
|
rExport.GetTargetStorage(), uno::UNO_QUERY_THROW);
|
2011-12-06 04:36:22 +01:00
|
|
|
uno::Reference<io::XInputStream> xInStream;
|
|
|
|
xPropSet->getPropertyValue(
|
2012-06-02 08:58:21 -05:00
|
|
|
::rtl::OUString("PrivateStream"))
|
2011-12-06 04:36:22 +01:00
|
|
|
>>= xInStream;
|
|
|
|
|
|
|
|
if (!xInStream.is())
|
|
|
|
{
|
|
|
|
SAL_WARN("xmloff", "no input stream");
|
|
|
|
return ::rtl::OUString();
|
|
|
|
}
|
2011-12-03 00:00:08 +01:00
|
|
|
|
|
|
|
::rtl::OUString const urlPath(
|
|
|
|
rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1));
|
|
|
|
|
2011-12-06 04:36:22 +01:00
|
|
|
lcl_CopyStream(xInStream, xTarget, rURL);
|
2011-12-03 00:00:08 +01:00
|
|
|
|
|
|
|
return urlPath;
|
|
|
|
}
|
|
|
|
catch (uno::Exception const& e)
|
|
|
|
{
|
2011-12-06 04:36:22 +01:00
|
|
|
SAL_INFO("xmloff", "exception while storing embedded media: '"
|
|
|
|
<< e.Message << "'");
|
2011-12-03 00:00:08 +01:00
|
|
|
}
|
|
|
|
return ::rtl::OUString();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return rExport.GetRelativeReference(rURL); // linked
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-12 07:50:21 +00:00
|
|
|
void XMLShapeExport::ImpExportMediaShape(
|
|
|
|
const uno::Reference< drawing::XShape >& xShape,
|
2010-02-23 00:23:09 +01:00
|
|
|
XmlShapeType eShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
|
2004-08-12 07:50:21 +00:00
|
|
|
{
|
|
|
|
const uno::Reference< beans::XPropertySet > xPropSet(xShape, uno::UNO_QUERY);
|
|
|
|
if(xPropSet.is())
|
|
|
|
{
|
|
|
|
// Transformation
|
|
|
|
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
|
|
|
|
|
2010-02-23 00:23:09 +01:00
|
|
|
if(eShapeType == XmlShapeTypePresMediaShape)
|
|
|
|
ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) );
|
|
|
|
|
2004-08-12 07:50:21 +00:00
|
|
|
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
|
2004-08-12 07:50:21 +00:00
|
|
|
XML_FRAME, bCreateNewline, sal_True );
|
|
|
|
|
|
|
|
// export media url
|
|
|
|
OUString aMediaURL;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "MediaURL" ) ) >>= aMediaURL;
|
2011-12-03 00:00:08 +01:00
|
|
|
OUString const persistentURL =
|
2011-12-06 04:36:22 +01:00
|
|
|
lcl_StoreMediaAndGetURL(GetExport(), xPropSet, aMediaURL);
|
2011-12-03 00:00:08 +01:00
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, persistentURL );
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
|
|
|
|
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
// export mime-type
|
2012-06-02 08:58:21 -05:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, OUString( "application/vnd.sun.star.media" ) );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
// write plugin
|
2006-06-19 17:12:19 +00:00
|
|
|
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), sal_True);
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
// export parameters
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aFalseStr( "false" ), aTrueStr( "true" );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Bool bLoop = false;
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aLoopStr( "Loop" );
|
2004-08-12 07:50:21 +00:00
|
|
|
xPropSet->getPropertyValue( aLoopStr ) >>= bLoop;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr );
|
|
|
|
delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Bool bMute = false;
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aMuteStr( "Mute" );
|
2004-08-12 07:50:21 +00:00
|
|
|
xPropSet->getPropertyValue( aMuteStr ) >>= bMute;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bMute ? aTrueStr : aFalseStr );
|
|
|
|
delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
2006-07-19 15:35:15 +00:00
|
|
|
sal_Int16 nVolumeDB = 0;
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aVolumeDBStr( "VolumeDB" );
|
|
|
|
xPropSet->getPropertyValue( OUString( "VolumeDB" ) ) >>= nVolumeDB;
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::valueOf( static_cast< sal_Int32 >( nVolumeDB ) ) );
|
|
|
|
delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
media::ZoomLevel eZoom;
|
2012-06-02 08:58:21 -05:00
|
|
|
const OUString aZoomStr( "Zoom" );
|
2004-08-12 07:50:21 +00:00
|
|
|
OUString aZoomValue;
|
2012-06-02 08:58:21 -05:00
|
|
|
xPropSet->getPropertyValue( OUString( "Zoom" ) ) >>= eZoom;
|
2004-08-12 07:50:21 +00:00
|
|
|
switch( eZoom )
|
|
|
|
{
|
2012-06-02 08:58:21 -05:00
|
|
|
case( media::ZoomLevel_ZOOM_1_TO_4 ): aZoomValue = OUString( "25%" ); break;
|
|
|
|
case( media::ZoomLevel_ZOOM_1_TO_2 ): aZoomValue = OUString( "50%" ); break;
|
|
|
|
case( media::ZoomLevel_ORIGINAL ): aZoomValue = OUString( "100%" ); break;
|
|
|
|
case( media::ZoomLevel_ZOOM_2_TO_1 ): aZoomValue = OUString( "200%" ); break;
|
|
|
|
case( media::ZoomLevel_ZOOM_4_TO_1 ): aZoomValue = OUString( "400%" ); break;
|
|
|
|
case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = OUString( "fit" ); break;
|
|
|
|
case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = OUString( "fixedfit" ); break;
|
|
|
|
case( media::ZoomLevel_FULLSCREEN ): aZoomValue = OUString( "fullscreen" ); break;
|
2004-08-12 07:50:21 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-01-25 17:00:07 -02:00
|
|
|
if( !aZoomValue.isEmpty() )
|
2004-08-12 07:50:21 +00:00
|
|
|
{
|
2006-06-19 17:12:19 +00:00
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aZoomStr );
|
|
|
|
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aZoomValue );
|
|
|
|
delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
|
2004-08-12 07:50:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-10-12 15:53:47 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|