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.
|
2000-09-18 16:07:07 +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/.
|
2000-09-18 16:07:07 +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:
|
2000-09-18 16:07:07 +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 .
|
|
|
|
*/
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
#include <tools/debug.hxx>
|
|
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
|
|
#include <com/sun/star/text/TextContentAnchorType.hpp>
|
|
|
|
#include <com/sun/star/beans/XPropertySet.hpp>
|
|
|
|
#include <com/sun/star/text/XTextFrame.hpp>
|
|
|
|
#include <com/sun/star/container/XNamed.hpp>
|
|
|
|
#include <com/sun/star/text/SizeType.hpp>
|
2000-12-06 10:41:56 +00:00
|
|
|
#include <com/sun/star/drawing/XShape.hpp>
|
2001-01-30 12:10:00 +00:00
|
|
|
#include <com/sun/star/document/XEventsSupplier.hpp>
|
2001-05-09 11:22:39 +00:00
|
|
|
#include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
|
2001-05-18 12:58:34 +00:00
|
|
|
#include <com/sun/star/io/XOutputStream.hpp>
|
2001-10-16 09:56:37 +00:00
|
|
|
#include <com/sun/star/text/HoriOrientation.hpp>
|
|
|
|
#include <com/sun/star/text/VertOrientation.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>
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/xmlimp.hxx>
|
|
|
|
#include <xmloff/xmltoken.hxx>
|
2013-11-11 22:30:35 -06:00
|
|
|
#include <xmloff/xmlnmspe.hxx>
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/nmspmap.hxx>
|
|
|
|
#include <xmloff/xmluconv.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include "XMLAnchorTypePropHdl.hxx"
|
2001-05-09 11:22:39 +00:00
|
|
|
#include "XMLEmbeddedObjectImportContext.hxx"
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/XMLBase64ImportContext.hxx>
|
2004-11-26 12:05:08 +00:00
|
|
|
#include "XMLReplacementImageContext.hxx"
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/prstylei.hxx>
|
2013-11-11 22:30:35 -06:00
|
|
|
#include <xmloff/i18nmap.hxx>
|
2000-11-16 12:23:56 +00:00
|
|
|
#include "xexptran.hxx"
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/shapeimport.hxx>
|
|
|
|
#include <xmloff/XMLEventsImportContext.hxx>
|
2001-03-29 15:26:25 +00:00
|
|
|
#include "XMLImageMapContext.hxx"
|
2000-09-18 16:07:07 +00:00
|
|
|
#include "XMLTextFrameContext.hxx"
|
2001-07-25 12:29:47 +00:00
|
|
|
#include "XMLTextListBlockContext.hxx"
|
|
|
|
#include "XMLTextListItemContext.hxx"
|
2007-06-27 15:08:02 +00:00
|
|
|
#include <xmloff/attrlist.hxx>
|
2013-10-29 14:11:45 +00:00
|
|
|
#include <basegfx/polygon/b2dpolygon.hxx>
|
|
|
|
#include <basegfx/polygon/b2dpolygontools.hxx>
|
|
|
|
#include <basegfx/matrix/b2dhommatrixtools.hxx>
|
|
|
|
#include <basegfx/polygon/b2dpolypolygontools.hxx>
|
2004-07-13 07:36:31 +00:00
|
|
|
#include <map>
|
2008-10-01 06:34:11 +00:00
|
|
|
|
2000-11-16 12:23:56 +00:00
|
|
|
using namespace ::com::sun::star;
|
2000-09-18 16:07:07 +00:00
|
|
|
using namespace ::com::sun::star::uno;
|
|
|
|
using namespace ::com::sun::star::text;
|
|
|
|
using namespace ::com::sun::star::xml::sax;
|
|
|
|
using namespace ::com::sun::star::beans;
|
|
|
|
using namespace ::com::sun::star::lang;
|
|
|
|
using namespace ::com::sun::star::container;
|
2000-12-06 10:41:56 +00:00
|
|
|
using namespace ::com::sun::star::drawing;
|
2001-05-09 11:22:39 +00:00
|
|
|
using namespace ::com::sun::star::document;
|
2001-06-29 20:07:26 +00:00
|
|
|
using namespace ::xmloff::token;
|
2001-01-30 12:10:00 +00:00
|
|
|
using ::com::sun::star::document::XEventsSupplier;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
#define XML_TEXT_FRAME_TEXTBOX 1
|
|
|
|
#define XML_TEXT_FRAME_GRAPHIC 2
|
|
|
|
#define XML_TEXT_FRAME_OBJECT 3
|
|
|
|
#define XML_TEXT_FRAME_OBJECT_OLE 4
|
|
|
|
#define XML_TEXT_FRAME_APPLET 5
|
|
|
|
#define XML_TEXT_FRAME_PLUGIN 6
|
|
|
|
#define XML_TEXT_FRAME_FLOATING_FRAME 7
|
|
|
|
|
2013-12-05 18:34:54 +01:00
|
|
|
typedef ::std::map < const OUString, OUString > ParamMap;
|
2004-07-13 07:36:31 +00:00
|
|
|
|
2002-10-31 09:26:33 +00:00
|
|
|
class XMLTextFrameContextHyperlink_Impl
|
|
|
|
{
|
|
|
|
OUString sHRef;
|
|
|
|
OUString sName;
|
|
|
|
OUString sTargetFrameName;
|
|
|
|
sal_Bool bMap;
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
inline XMLTextFrameContextHyperlink_Impl( const OUString& rHRef,
|
|
|
|
const OUString& rName,
|
|
|
|
const OUString& rTargetFrameName,
|
|
|
|
sal_Bool bMap );
|
|
|
|
|
|
|
|
const OUString& GetHRef() const { return sHRef; }
|
|
|
|
const OUString& GetName() const { return sName; }
|
|
|
|
const OUString& GetTargetFrameName() const { return sTargetFrameName; }
|
|
|
|
sal_Bool GetMap() const { return bMap; }
|
|
|
|
};
|
|
|
|
|
|
|
|
inline XMLTextFrameContextHyperlink_Impl::XMLTextFrameContextHyperlink_Impl(
|
|
|
|
const OUString& rHRef, const OUString& rName,
|
|
|
|
const OUString& rTargetFrameName, sal_Bool bM ) :
|
|
|
|
sHRef( rHRef ),
|
|
|
|
sName( rName ),
|
|
|
|
sTargetFrameName( rTargetFrameName ),
|
|
|
|
bMap( bM )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
// Implement Title/Description Elements UI (#i73249#)
|
2009-08-27 11:59:20 +00:00
|
|
|
class XMLTextFrameTitleOrDescContext_Impl : public SvXMLImportContext
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
OUString& mrTitleOrDesc;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
TYPEINFO();
|
|
|
|
|
2009-08-27 11:59:20 +00:00
|
|
|
XMLTextFrameTitleOrDescContext_Impl( SvXMLImport& rImport,
|
|
|
|
sal_uInt16 nPrfx,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLName,
|
2009-08-27 11:59:20 +00:00
|
|
|
OUString& rTitleOrDesc );
|
|
|
|
virtual ~XMLTextFrameTitleOrDescContext_Impl();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
virtual void Characters( const OUString& rText );
|
|
|
|
};
|
|
|
|
|
2009-08-27 11:59:20 +00:00
|
|
|
TYPEINIT1( XMLTextFrameTitleOrDescContext_Impl, SvXMLImportContext );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2009-08-27 11:59:20 +00:00
|
|
|
XMLTextFrameTitleOrDescContext_Impl::XMLTextFrameTitleOrDescContext_Impl(
|
2000-09-18 16:07:07 +00:00
|
|
|
SvXMLImport& rImport,
|
2009-08-27 11:59:20 +00:00
|
|
|
sal_uInt16 nPrfx,
|
|
|
|
const OUString& rLName,
|
|
|
|
OUString& rTitleOrDesc )
|
|
|
|
: SvXMLImportContext( rImport, nPrfx, rLName )
|
|
|
|
, mrTitleOrDesc( rTitleOrDesc )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2009-08-27 11:59:20 +00:00
|
|
|
XMLTextFrameTitleOrDescContext_Impl::~XMLTextFrameTitleOrDescContext_Impl()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2009-08-27 11:59:20 +00:00
|
|
|
void XMLTextFrameTitleOrDescContext_Impl::Characters( const OUString& rText )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
mrTitleOrDesc += rText;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2001-02-23 13:39:25 +00:00
|
|
|
class XMLTextFrameParam_Impl : public SvXMLImportContext
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
|
|
TYPEINFO();
|
|
|
|
|
|
|
|
XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLName,
|
2001-02-23 13:39:25 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
|
2001-03-09 14:59:46 +00:00
|
|
|
sal_uInt16 nType,
|
|
|
|
ParamMap &rParamMap);
|
2001-02-23 13:39:25 +00:00
|
|
|
virtual ~XMLTextFrameParam_Impl();
|
|
|
|
};
|
2001-11-26 10:45:54 +00:00
|
|
|
|
2001-02-23 13:39:25 +00:00
|
|
|
TYPEINIT1( XMLTextFrameParam_Impl, SvXMLImportContext );
|
2001-11-26 10:45:54 +00:00
|
|
|
|
2001-02-23 13:39:25 +00:00
|
|
|
XMLTextFrameParam_Impl::~XMLTextFrameParam_Impl()
|
|
|
|
{
|
|
|
|
}
|
2001-11-26 10:45:54 +00:00
|
|
|
|
|
|
|
XMLTextFrameParam_Impl::XMLTextFrameParam_Impl(
|
|
|
|
SvXMLImport& rImport, sal_uInt16 nPrfx,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLName,
|
2001-11-26 10:45:54 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
2001-02-23 13:39:25 +00:00
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
|
2006-06-19 17:45:40 +00:00
|
|
|
sal_uInt16 /*nType*/,
|
2001-11-26 10:45:54 +00:00
|
|
|
ParamMap &rParamMap):
|
2001-02-23 13:39:25 +00:00
|
|
|
SvXMLImportContext( rImport, nPrfx, rLName )
|
|
|
|
{
|
|
|
|
OUString sName, sValue;
|
2001-03-09 14:59:46 +00:00
|
|
|
sal_Bool bFoundValue = sal_False; // to allow empty values
|
2001-02-23 13:39:25 +00:00
|
|
|
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
|
|
|
|
for( sal_Int16 i=0; i < nAttrCount; i++ )
|
|
|
|
{
|
|
|
|
const OUString& rAttrName = xAttrList->getNameByIndex( i );
|
|
|
|
const OUString& rValue = xAttrList->getValueByIndex( i );
|
|
|
|
|
|
|
|
OUString aLocalName;
|
|
|
|
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
|
2001-11-26 10:45:54 +00:00
|
|
|
if ( XML_NAMESPACE_DRAW == nPrefix )
|
2001-03-09 14:59:46 +00:00
|
|
|
{
|
2001-11-26 10:45:54 +00:00
|
|
|
if( IsXMLToken(aLocalName, XML_VALUE) )
|
|
|
|
{
|
|
|
|
sValue = rValue;
|
|
|
|
bFoundValue=sal_True;
|
|
|
|
}
|
|
|
|
else if( IsXMLToken(aLocalName, XML_NAME) )
|
|
|
|
{
|
|
|
|
sName = rValue;
|
|
|
|
}
|
2001-03-09 14:59:46 +00:00
|
|
|
}
|
2001-02-23 13:39:25 +00:00
|
|
|
}
|
2012-01-26 17:05:51 -02:00
|
|
|
if (!sName.isEmpty() && bFoundValue )
|
2001-03-09 14:59:46 +00:00
|
|
|
rParamMap[sName] = sValue;
|
2001-02-23 13:39:25 +00:00
|
|
|
}
|
2000-11-16 12:23:56 +00:00
|
|
|
class XMLTextFrameContourContext_Impl : public SvXMLImportContext
|
|
|
|
{
|
|
|
|
Reference < XPropertySet > xPropSet;
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
TYPEINFO();
|
|
|
|
|
|
|
|
XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLName,
|
2000-11-16 12:23:56 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
|
|
|
|
const Reference < XPropertySet >& rPropSet,
|
|
|
|
sal_Bool bPath );
|
|
|
|
virtual ~XMLTextFrameContourContext_Impl();
|
|
|
|
};
|
|
|
|
|
|
|
|
TYPEINIT1( XMLTextFrameContourContext_Impl, SvXMLImportContext );
|
|
|
|
|
|
|
|
XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
|
|
|
|
SvXMLImport& rImport,
|
|
|
|
sal_uInt16 nPrfx, const OUString& rLName,
|
|
|
|
const Reference< XAttributeList > & xAttrList,
|
|
|
|
const Reference < XPropertySet >& rPropSet,
|
|
|
|
sal_Bool bPath ) :
|
|
|
|
SvXMLImportContext( rImport, nPrfx, rLName ),
|
|
|
|
xPropSet( rPropSet )
|
|
|
|
{
|
|
|
|
OUString sD, sPoints, sViewBox;
|
2001-05-04 08:49:55 +00:00
|
|
|
sal_Bool bPixelWidth = sal_False, bPixelHeight = sal_False;
|
|
|
|
sal_Bool bAuto = sal_False;
|
2001-02-12 11:20:34 +00:00
|
|
|
sal_Int32 nWidth = 0;
|
|
|
|
sal_Int32 nHeight = 0;
|
2000-11-16 12:23:56 +00:00
|
|
|
|
|
|
|
const SvXMLTokenMap& rTokenMap =
|
2001-03-29 07:26:44 +00:00
|
|
|
GetImport().GetTextImport()->GetTextContourAttrTokenMap();
|
2000-11-16 12:23:56 +00:00
|
|
|
|
|
|
|
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
|
|
|
|
for( sal_Int16 i=0; i < nAttrCount; i++ )
|
|
|
|
{
|
|
|
|
const OUString& rAttrName = xAttrList->getNameByIndex( i );
|
|
|
|
const OUString& rValue = xAttrList->getValueByIndex( i );
|
|
|
|
|
|
|
|
OUString aLocalName;
|
|
|
|
sal_uInt16 nPrefix =
|
|
|
|
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
|
|
|
|
&aLocalName );
|
2001-03-29 07:26:44 +00:00
|
|
|
switch( rTokenMap.Get( nPrefix, aLocalName ) )
|
2000-11-16 12:23:56 +00:00
|
|
|
{
|
2001-03-29 07:26:44 +00:00
|
|
|
case XML_TOK_TEXT_CONTOUR_VIEWBOX:
|
|
|
|
sViewBox = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_CONTOUR_D:
|
|
|
|
if( bPath )
|
2000-11-16 12:23:56 +00:00
|
|
|
sD = rValue;
|
2001-03-29 07:26:44 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_CONTOUR_POINTS:
|
|
|
|
if( !bPath )
|
2000-11-16 12:23:56 +00:00
|
|
|
sPoints = rValue;
|
2001-03-29 07:26:44 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_CONTOUR_WIDTH:
|
2011-10-11 14:19:09 +02:00
|
|
|
if (::sax::Converter::convertMeasurePx(nWidth, rValue))
|
2001-05-04 08:49:55 +00:00
|
|
|
bPixelWidth = sal_True;
|
|
|
|
else
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nWidth, rValue);
|
2001-03-29 07:26:44 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_CONTOUR_HEIGHT:
|
2011-10-11 14:19:09 +02:00
|
|
|
if (::sax::Converter::convertMeasurePx(nHeight, rValue))
|
2001-05-04 08:49:55 +00:00
|
|
|
bPixelHeight = sal_True;
|
|
|
|
else
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nHeight, rValue);
|
2001-05-04 08:49:55 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_CONTOUR_AUTO:
|
2001-06-29 20:07:26 +00:00
|
|
|
bAuto = IsXMLToken(rValue, XML_TRUE);
|
2001-03-29 07:26:44 +00:00
|
|
|
break;
|
2000-11-16 12:23:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-02 21:32:41 +01:00
|
|
|
OUString sContourPolyPolygon("ContourPolyPolygon");
|
2013-10-29 14:11:45 +00:00
|
|
|
Reference < XPropertySetInfo > xPropSetInfo = rPropSet->getPropertySetInfo();
|
|
|
|
|
|
|
|
if(xPropSetInfo->hasPropertyByName(sContourPolyPolygon) && nWidth > 0 && nHeight > 0 && bPixelWidth == bPixelHeight && (bPath ? sD : sPoints).getLength())
|
2000-11-16 12:23:56 +00:00
|
|
|
{
|
2013-10-29 14:11:45 +00:00
|
|
|
const SdXMLImExViewBox aViewBox( sViewBox, GetImport().GetMM100UnitConverter());
|
|
|
|
basegfx::B2DPolyPolygon aPolyPolygon;
|
2000-11-16 12:23:56 +00:00
|
|
|
Any aAny;
|
2013-10-29 14:11:45 +00:00
|
|
|
|
2000-11-16 12:23:56 +00:00
|
|
|
if( bPath )
|
|
|
|
{
|
2013-10-29 14:11:45 +00:00
|
|
|
basegfx::tools::importFromSvgD(aPolyPolygon, sD, true, 0);
|
2000-11-16 12:23:56 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-10-29 14:11:45 +00:00
|
|
|
basegfx::B2DPolygon aPolygon;
|
|
|
|
|
|
|
|
if(basegfx::tools::importFromSvgPoints(aPolygon, sPoints))
|
|
|
|
{
|
|
|
|
aPolyPolygon = basegfx::B2DPolyPolygon(aPolygon);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(aPolyPolygon.count())
|
|
|
|
{
|
|
|
|
const basegfx::B2DRange aSourceRange(
|
|
|
|
aViewBox.GetX(), aViewBox.GetY(),
|
|
|
|
aViewBox.GetX() + aViewBox.GetWidth(), aViewBox.GetY() + aViewBox.GetHeight());
|
|
|
|
const basegfx::B2DRange aTargetRange(
|
|
|
|
0.0, 0.0,
|
|
|
|
nWidth, nHeight);
|
|
|
|
|
|
|
|
if(!aSourceRange.equal(aTargetRange))
|
|
|
|
{
|
|
|
|
aPolyPolygon.transform(
|
|
|
|
basegfx::tools::createSourceRangeTargetRangeTransform(
|
|
|
|
aSourceRange,
|
|
|
|
aTargetRange));
|
|
|
|
}
|
|
|
|
|
|
|
|
com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence;
|
|
|
|
basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(aPolyPolygon, aPointSequenceSequence);
|
|
|
|
aAny <<= aPointSequenceSequence;
|
|
|
|
xPropSet->setPropertyValue( sContourPolyPolygon, aAny );
|
2000-11-16 12:23:56 +00:00
|
|
|
}
|
|
|
|
|
2013-10-29 14:11:45 +00:00
|
|
|
const OUString sIsPixelContour("IsPixelContour");
|
2001-05-04 08:49:55 +00:00
|
|
|
|
|
|
|
if( xPropSetInfo->hasPropertyByName( sIsPixelContour ) )
|
|
|
|
{
|
|
|
|
aAny.setValue( &bPixelWidth, ::getBooleanCppuType() );
|
|
|
|
xPropSet->setPropertyValue( sIsPixelContour, aAny );
|
|
|
|
}
|
|
|
|
|
2013-10-29 14:11:45 +00:00
|
|
|
const OUString sIsAutomaticContour("IsAutomaticContour");
|
|
|
|
|
2001-05-04 08:49:55 +00:00
|
|
|
if( xPropSetInfo->hasPropertyByName( sIsAutomaticContour ) )
|
|
|
|
{
|
|
|
|
aAny.setValue( &bAuto, ::getBooleanCppuType() );
|
|
|
|
xPropSet->setPropertyValue( sIsAutomaticContour, aAny );
|
|
|
|
}
|
2000-11-16 12:23:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
XMLTextFrameContourContext_Impl::~XMLTextFrameContourContext_Impl()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
class XMLTextFrameContext_Impl : public SvXMLImportContext
|
|
|
|
{
|
|
|
|
::com::sun::star::uno::Reference <
|
|
|
|
::com::sun::star::text::XTextCursor > xOldTextCursor;
|
|
|
|
::com::sun::star::uno::Reference <
|
|
|
|
::com::sun::star::beans::XPropertySet > xPropSet;
|
|
|
|
::com::sun::star::uno::Reference <
|
|
|
|
::com::sun::star::io::XOutputStream > xBase64Stream;
|
|
|
|
|
|
|
|
/// old list item and block (#89891#)
|
2008-10-01 06:34:11 +00:00
|
|
|
bool mbListContextPushed;
|
2004-07-13 07:36:31 +00:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString sWidth;
|
|
|
|
const OUString sWidthType;
|
|
|
|
const OUString sRelativeWidth;
|
|
|
|
const OUString sHeight;
|
|
|
|
const OUString sRelativeHeight;
|
|
|
|
const OUString sSizeType;
|
|
|
|
const OUString sIsSyncWidthToHeight;
|
|
|
|
const OUString sIsSyncHeightToWidth;
|
|
|
|
const OUString sHoriOrient;
|
|
|
|
const OUString sHoriOrientPosition;
|
|
|
|
const OUString sVertOrient;
|
|
|
|
const OUString sVertOrientPosition;
|
|
|
|
const OUString sChainNextName;
|
|
|
|
const OUString sAnchorType;
|
|
|
|
const OUString sAnchorPageNo;
|
|
|
|
const OUString sGraphicURL;
|
|
|
|
const OUString sGraphicFilter;
|
|
|
|
const OUString sTitle;
|
|
|
|
const OUString sDescription;
|
|
|
|
const OUString sFrameStyleName;
|
|
|
|
const OUString sGraphicRotation;
|
|
|
|
const OUString sTextBoxServiceName;
|
|
|
|
const OUString sGraphicServiceName;
|
|
|
|
|
2013-09-03 00:32:08 +02:00
|
|
|
OUString m_sOrigName;
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString sName;
|
|
|
|
OUString sStyleName;
|
|
|
|
OUString sNextName;
|
|
|
|
OUString sHRef;
|
|
|
|
OUString sFilterName;
|
|
|
|
OUString sCode;
|
|
|
|
OUString sObject;
|
|
|
|
OUString sArchive;
|
|
|
|
OUString sMimeType;
|
|
|
|
OUString sFrameName;
|
|
|
|
OUString sAppletName;
|
|
|
|
OUString sFilterService;
|
|
|
|
OUString sBase64CharsLeft;
|
|
|
|
OUString sTblName;
|
2004-07-13 07:36:31 +00:00
|
|
|
|
|
|
|
ParamMap aParamMap;
|
|
|
|
|
|
|
|
sal_Int32 nX;
|
|
|
|
sal_Int32 nY;
|
|
|
|
sal_Int32 nWidth;
|
|
|
|
sal_Int32 nHeight;
|
|
|
|
sal_Int32 nZIndex;
|
|
|
|
sal_Int16 nPage;
|
|
|
|
sal_Int16 nRotation;
|
|
|
|
sal_Int16 nRelWidth;
|
|
|
|
sal_Int16 nRelHeight;
|
|
|
|
|
|
|
|
sal_uInt16 nType;
|
|
|
|
::com::sun::star::text::TextContentAnchorType eAnchorType;
|
|
|
|
|
|
|
|
sal_Bool bMayScript : 1;
|
|
|
|
sal_Bool bMinWidth : 1;
|
|
|
|
sal_Bool bMinHeight : 1;
|
|
|
|
sal_Bool bSyncWidth : 1;
|
|
|
|
sal_Bool bSyncHeight : 1;
|
|
|
|
sal_Bool bCreateFailed : 1;
|
|
|
|
sal_Bool bOwnBase64Stream : 1;
|
|
|
|
|
|
|
|
void Create( sal_Bool bHRefOrBase64 );
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
TYPEINFO();
|
|
|
|
|
|
|
|
sal_Bool CreateIfNotThere();
|
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
|
|
|
const OUString& GetHRef() const { return sHRef; }
|
2004-07-13 07:36:31 +00:00
|
|
|
|
|
|
|
XMLTextFrameContext_Impl( SvXMLImport& rImport,
|
|
|
|
sal_uInt16 nPrfx,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLName,
|
2004-07-13 07:36:31 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & rAttrList,
|
|
|
|
::com::sun::star::text::TextContentAnchorType eAnchorType,
|
|
|
|
sal_uInt16 nType,
|
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & rFrameAttrList );
|
|
|
|
virtual ~XMLTextFrameContext_Impl();
|
|
|
|
|
|
|
|
virtual void EndElement();
|
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
virtual void Characters( const OUString& rChars );
|
2004-07-13 07:36:31 +00:00
|
|
|
|
|
|
|
SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
|
2013-04-07 12:06:47 +02:00
|
|
|
const OUString& rLocalName,
|
2004-07-13 07:36:31 +00:00
|
|
|
const ::com::sun::star::uno::Reference<
|
|
|
|
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
|
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
void SetHyperlink( const OUString& rHRef,
|
|
|
|
const OUString& rName,
|
|
|
|
const OUString& rTargetFrameName,
|
2004-07-13 07:36:31 +00:00
|
|
|
sal_Bool bMap );
|
2010-11-09 01:42:14 +05:00
|
|
|
|
|
|
|
// Implement Title/Description Elements UI (#i73249#)
|
2013-04-07 12:06:47 +02:00
|
|
|
void SetTitle( const OUString& rTitle );
|
2010-11-09 01:42:14 +05:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
void SetDesc( const OUString& rDesc );
|
2004-07-13 07:36:31 +00:00
|
|
|
|
2013-09-03 00:32:08 +02:00
|
|
|
void SetName();
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; }
|
|
|
|
|
|
|
|
const ::com::sun::star::uno::Reference <
|
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
|
|
|
::com::sun::star::beans::XPropertySet >& GetPropSet() const { return xPropSet; }
|
2004-07-13 07:36:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
TYPEINIT1( XMLTextFrameContext_Impl, SvXMLImportContext );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2006-06-19 17:45:40 +00:00
|
|
|
void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
2006-06-19 17:45:40 +00:00
|
|
|
UniReference < XMLTextImportHelper > xTextImportHelper =
|
2001-05-09 11:22:39 +00:00
|
|
|
GetImport().GetTextImport();
|
|
|
|
|
|
|
|
switch ( nType)
|
|
|
|
{
|
|
|
|
case XML_TEXT_FRAME_OBJECT:
|
|
|
|
case XML_TEXT_FRAME_OBJECT_OLE:
|
2005-01-27 10:09:50 +00:00
|
|
|
if( xBase64Stream.is() )
|
|
|
|
{
|
|
|
|
OUString sURL( GetImport().ResolveEmbeddedObjectURLFromBase64() );
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sURL.isEmpty() )
|
2005-01-27 10:09:50 +00:00
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertOLEObject( GetImport(), sURL,
|
|
|
|
sStyleName,
|
|
|
|
sTblName,
|
|
|
|
nWidth, nHeight );
|
|
|
|
}
|
2012-01-26 17:05:51 -02:00
|
|
|
else if( !sHRef.isEmpty() )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
|
|
|
OUString sURL( GetImport().ResolveEmbeddedObjectURL( sHRef,
|
|
|
|
OUString() ) );
|
|
|
|
|
2005-03-15 10:19:39 +00:00
|
|
|
if( GetImport().IsPackageURL( sHRef ) )
|
|
|
|
{
|
2001-05-09 11:22:39 +00:00
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertOLEObject( GetImport(), sURL,
|
|
|
|
sStyleName,
|
2001-06-28 12:21:55 +00:00
|
|
|
sTblName,
|
2001-05-09 11:22:39 +00:00
|
|
|
nWidth, nHeight );
|
2005-03-15 10:19:39 +00:00
|
|
|
}
|
2004-10-04 17:12:15 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// it should be an own OOo link that has no storage persistance
|
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertOOoLink( GetImport(),
|
2005-03-15 10:19:39 +00:00
|
|
|
sURL,
|
2004-10-04 17:12:15 +00:00
|
|
|
sStyleName,
|
|
|
|
sTblName,
|
|
|
|
nWidth, nHeight );
|
|
|
|
}
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-03-02 21:32:41 +01:00
|
|
|
OUString sURL( "vnd.sun.star.ServiceName:" );
|
2001-05-09 11:22:39 +00:00
|
|
|
sURL += sFilterService;
|
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertOLEObject( GetImport(), sURL,
|
|
|
|
sStyleName,
|
2001-06-28 12:21:55 +00:00
|
|
|
sTblName,
|
2001-05-09 11:22:39 +00:00
|
|
|
nWidth, nHeight );
|
|
|
|
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case XML_TEXT_FRAME_APPLET:
|
|
|
|
{
|
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertApplet( sAppletName, sCode,
|
|
|
|
bMayScript, sHRef,
|
|
|
|
nWidth, nHeight);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XML_TEXT_FRAME_PLUGIN:
|
|
|
|
{
|
2012-01-26 17:05:51 -02:00
|
|
|
if(!sHRef.isEmpty())
|
2005-01-11 11:06:31 +00:00
|
|
|
GetImport().GetAbsoluteReference(sHRef);
|
2001-05-09 11:22:39 +00:00
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertPlugin( sMimeType, sHRef,
|
|
|
|
nWidth, nHeight);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case XML_TEXT_FRAME_FLOATING_FRAME:
|
|
|
|
{
|
|
|
|
xPropSet = GetImport().GetTextImport()
|
|
|
|
->createAndInsertFloatingFrame( sFrameName, sHRef,
|
|
|
|
sStyleName,
|
|
|
|
nWidth, nHeight);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
Reference<XMultiServiceFactory> xFactory( GetImport().GetModel(),
|
|
|
|
UNO_QUERY );
|
|
|
|
if( xFactory.is() )
|
|
|
|
{
|
|
|
|
OUString sServiceName;
|
|
|
|
switch( nType )
|
|
|
|
{
|
|
|
|
case XML_TEXT_FRAME_TEXTBOX: sServiceName = sTextBoxServiceName; break;
|
|
|
|
case XML_TEXT_FRAME_GRAPHIC: sServiceName = sGraphicServiceName; break;
|
|
|
|
}
|
|
|
|
Reference<XInterface> xIfc = xFactory->createInstance( sServiceName );
|
|
|
|
DBG_ASSERT( xIfc.is(), "couldn't create frame" );
|
|
|
|
if( xIfc.is() )
|
|
|
|
xPropSet = Reference < XPropertySet >( xIfc, UNO_QUERY );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !xPropSet.is() )
|
2002-10-31 09:26:33 +00:00
|
|
|
{
|
|
|
|
bCreateFailed = sal_True;
|
2001-05-09 11:22:39 +00:00
|
|
|
return;
|
2002-10-31 09:26:33 +00:00
|
|
|
}
|
2001-05-09 11:22:39 +00:00
|
|
|
|
|
|
|
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
|
|
|
|
|
|
|
|
// set name
|
|
|
|
Reference < XNamed > xNamed( xPropSet, UNO_QUERY );
|
|
|
|
if( xNamed.is() )
|
|
|
|
{
|
|
|
|
OUString sOrigName( xNamed->getName() );
|
2012-01-26 17:05:51 -02:00
|
|
|
if( sOrigName.isEmpty() ||
|
|
|
|
(!sName.isEmpty() && sOrigName != sName) )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
|
|
|
OUString sOldName( sName );
|
|
|
|
sal_Int32 i = 0;
|
2006-06-19 17:45:40 +00:00
|
|
|
while( xTextImportHelper->HasFrameByName( sName ) )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
|
|
|
sName = sOldName;
|
2013-08-21 15:07:31 +02:00
|
|
|
sName += OUString::number( ++i );
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
xNamed->setName( sName );
|
|
|
|
if( sName != sOldName )
|
2006-06-19 17:45:40 +00:00
|
|
|
xTextImportHelper->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_FRAME,
|
2001-05-09 11:22:39 +00:00
|
|
|
sOldName, sName );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// frame style
|
|
|
|
XMLPropStyleContext *pStyle = 0;
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sStyleName.isEmpty() )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
2006-06-19 17:45:40 +00:00
|
|
|
pStyle = xTextImportHelper->FindAutoFrameStyle( sStyleName );
|
2001-05-09 11:22:39 +00:00
|
|
|
if( pStyle )
|
2004-11-26 12:05:08 +00:00
|
|
|
sStyleName = pStyle->GetParentName();
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Any aAny;
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sStyleName.isEmpty() )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
OUString sDisplayStyleName( GetImport().GetStyleDisplayName(
|
|
|
|
XML_STYLE_FAMILY_SD_GRAPHICS_ID, sStyleName ) );
|
2001-05-09 11:22:39 +00:00
|
|
|
const Reference < XNameContainer > & rStyles =
|
2006-06-19 17:45:40 +00:00
|
|
|
xTextImportHelper->GetFrameStyles();
|
2001-05-09 11:22:39 +00:00
|
|
|
if( rStyles.is() &&
|
2004-07-13 07:36:31 +00:00
|
|
|
rStyles->hasByName( sDisplayStyleName ) )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
aAny <<= sDisplayStyleName;
|
2001-05-09 11:22:39 +00:00
|
|
|
xPropSet->setPropertyValue( sFrameStyleName, aAny );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-10-10 16:06:40 +00:00
|
|
|
// anchor type (must be set before any other properties, because
|
|
|
|
// otherwise some orientations cannot be set or will be changed
|
|
|
|
// afterwards)
|
|
|
|
aAny <<= eAnchorType;
|
|
|
|
xPropSet->setPropertyValue( sAnchorType, aAny );
|
|
|
|
|
2001-05-09 11:22:39 +00:00
|
|
|
// hard properties
|
|
|
|
if( pStyle )
|
|
|
|
pStyle->FillPropertySet( xPropSet );
|
|
|
|
|
|
|
|
// x and y
|
2001-10-16 09:56:37 +00:00
|
|
|
sal_Int16 nHoriOrient = HoriOrientation::NONE;
|
|
|
|
aAny = xPropSet->getPropertyValue( sHoriOrient );
|
|
|
|
aAny >>= nHoriOrient;
|
|
|
|
if( HoriOrientation::NONE == nHoriOrient )
|
|
|
|
{
|
|
|
|
aAny <<= nX;
|
|
|
|
xPropSet->setPropertyValue( sHoriOrientPosition, aAny );
|
|
|
|
}
|
|
|
|
|
|
|
|
sal_Int16 nVertOrient = VertOrientation::NONE;
|
|
|
|
aAny = xPropSet->getPropertyValue( sVertOrient );
|
|
|
|
aAny >>= nVertOrient;
|
|
|
|
if( VertOrientation::NONE == nVertOrient )
|
|
|
|
{
|
|
|
|
aAny <<= nY;
|
|
|
|
xPropSet->setPropertyValue( sVertOrientPosition, aAny );
|
|
|
|
}
|
2001-05-09 11:22:39 +00:00
|
|
|
|
|
|
|
// width
|
|
|
|
if( nWidth > 0 )
|
|
|
|
{
|
|
|
|
aAny <<= nWidth;
|
|
|
|
xPropSet->setPropertyValue( sWidth, aAny );
|
|
|
|
}
|
|
|
|
if( nRelWidth > 0 || nWidth > 0 )
|
|
|
|
{
|
|
|
|
aAny <<= nRelWidth;
|
|
|
|
xPropSet->setPropertyValue( sRelativeWidth, aAny );
|
|
|
|
}
|
|
|
|
if( bSyncWidth || nWidth > 0 )
|
|
|
|
{
|
|
|
|
sal_Bool bTmp = bSyncWidth;
|
|
|
|
aAny.setValue( &bTmp, ::getBooleanCppuType() );
|
|
|
|
xPropSet->setPropertyValue( sIsSyncWidthToHeight, aAny );
|
|
|
|
}
|
2004-05-18 14:04:35 +00:00
|
|
|
if( xPropSetInfo->hasPropertyByName( sWidthType ) &&
|
|
|
|
(bMinWidth || nWidth > 0 || nRelWidth > 0 ) )
|
|
|
|
{
|
|
|
|
sal_Int16 nSizeType =
|
|
|
|
(bMinWidth && XML_TEXT_FRAME_TEXTBOX == nType) ? SizeType::MIN
|
|
|
|
: SizeType::FIX;
|
|
|
|
aAny <<= nSizeType;
|
|
|
|
xPropSet->setPropertyValue( sWidthType, aAny );
|
|
|
|
}
|
2001-05-09 11:22:39 +00:00
|
|
|
|
|
|
|
if( nHeight > 0 )
|
|
|
|
{
|
|
|
|
aAny <<= nHeight;
|
|
|
|
xPropSet->setPropertyValue( sHeight, aAny );
|
|
|
|
}
|
|
|
|
if( nRelHeight > 0 || nHeight > 0 )
|
|
|
|
{
|
|
|
|
aAny <<= nRelHeight;
|
|
|
|
xPropSet->setPropertyValue( sRelativeHeight, aAny );
|
|
|
|
}
|
|
|
|
if( bSyncHeight || nHeight > 0 )
|
|
|
|
{
|
|
|
|
sal_Bool bTmp = bSyncHeight;
|
|
|
|
aAny.setValue( &bTmp, ::getBooleanCppuType() );
|
|
|
|
xPropSet->setPropertyValue( sIsSyncHeightToWidth, aAny );
|
|
|
|
}
|
|
|
|
if( xPropSetInfo->hasPropertyByName( sSizeType ) &&
|
|
|
|
(bMinHeight || nHeight > 0 || nRelHeight > 0 ) )
|
|
|
|
{
|
|
|
|
sal_Int16 nSizeType =
|
|
|
|
(bMinHeight && XML_TEXT_FRAME_TEXTBOX == nType) ? SizeType::MIN
|
|
|
|
: SizeType::FIX;
|
|
|
|
aAny <<= nSizeType;
|
|
|
|
xPropSet->setPropertyValue( sSizeType, aAny );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( XML_TEXT_FRAME_GRAPHIC == nType )
|
|
|
|
{
|
|
|
|
// URL
|
2012-01-26 17:05:51 -02:00
|
|
|
OSL_ENSURE( !sHRef.isEmpty() || xBase64Stream.is(),
|
2001-06-19 14:08:23 +00:00
|
|
|
"neither URL nor base64 image data given" );
|
2001-05-09 11:22:39 +00:00
|
|
|
UniReference < XMLTextImportHelper > xTxtImport =
|
|
|
|
GetImport().GetTextImport();
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sHRef.isEmpty() )
|
2001-06-19 14:08:23 +00:00
|
|
|
{
|
|
|
|
sal_Bool bForceLoad = xTxtImport->IsInsertMode() ||
|
|
|
|
xTxtImport->IsBlockMode() ||
|
|
|
|
xTxtImport->IsStylesOnlyMode() ||
|
|
|
|
xTxtImport->IsOrganizerMode();
|
|
|
|
sHRef = GetImport().ResolveGraphicObjectURL( sHRef, !bForceLoad );
|
|
|
|
}
|
|
|
|
else if( xBase64Stream.is() )
|
|
|
|
{
|
|
|
|
sHRef = GetImport().ResolveGraphicObjectURLFromBase64( xBase64Stream );
|
|
|
|
xBase64Stream = 0;
|
|
|
|
}
|
|
|
|
aAny <<= sHRef;
|
2001-05-09 11:22:39 +00:00
|
|
|
xPropSet->setPropertyValue( sGraphicURL, aAny );
|
|
|
|
|
|
|
|
// filter name
|
|
|
|
aAny <<=sFilterName;
|
|
|
|
xPropSet->setPropertyValue( sGraphicFilter, aAny );
|
|
|
|
|
|
|
|
// rotation
|
|
|
|
aAny <<= nRotation;
|
|
|
|
xPropSet->setPropertyValue( sGraphicRotation, aAny );
|
|
|
|
}
|
|
|
|
|
|
|
|
// page number (must be set after the frame is inserted, because it
|
|
|
|
// will be overwritten then inserting the frame.
|
|
|
|
if( TextContentAnchorType_AT_PAGE == eAnchorType && nPage > 0 )
|
|
|
|
{
|
|
|
|
aAny <<= nPage;
|
|
|
|
xPropSet->setPropertyValue( sAnchorPageNo, aAny );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( XML_TEXT_FRAME_OBJECT != nType &&
|
|
|
|
XML_TEXT_FRAME_OBJECT_OLE != nType &&
|
|
|
|
XML_TEXT_FRAME_APPLET != nType &&
|
|
|
|
XML_TEXT_FRAME_PLUGIN!= nType &&
|
|
|
|
XML_TEXT_FRAME_FLOATING_FRAME != nType)
|
|
|
|
{
|
|
|
|
Reference < XTextContent > xTxtCntnt( xPropSet, UNO_QUERY );
|
2006-06-19 17:45:40 +00:00
|
|
|
xTextImportHelper->InsertTextContent( xTxtCntnt );
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
|
2003-04-08 14:30:17 +00:00
|
|
|
// #107848#
|
|
|
|
// Make adding the shepe to Z-Ordering dependent from if we are
|
|
|
|
// inside a inside_deleted_section (redlining). That is necessary
|
|
|
|
// since the shape will be removed again later. It would lead to
|
|
|
|
// errors if it would stay inside the Z-Ordering. Thus, the
|
|
|
|
// easiest way to solve that conflict is to not add it here.
|
|
|
|
if(!GetImport().HasTextImport()
|
|
|
|
|| !GetImport().GetTextImport()->IsInsideDeleteContext())
|
|
|
|
{
|
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
|
|
|
Reference < XShape > xShape( xPropSet, UNO_QUERY );
|
|
|
|
|
2003-04-08 14:30:17 +00:00
|
|
|
GetImport().GetShapeImport()->shapeWithZIndexAdded( xShape, nZIndex );
|
|
|
|
}
|
2002-11-25 16:11:55 +00:00
|
|
|
|
2001-05-09 11:22:39 +00:00
|
|
|
if( XML_TEXT_FRAME_TEXTBOX == nType )
|
|
|
|
{
|
2006-06-19 17:45:40 +00:00
|
|
|
xTextImportHelper->ConnectFrameChains( sName, sNextName, xPropSet );
|
2001-05-09 11:22:39 +00:00
|
|
|
Reference < XTextFrame > xTxtFrame( xPropSet, UNO_QUERY );
|
|
|
|
Reference < XText > xTxt = xTxtFrame->getText();
|
2006-06-19 17:45:40 +00:00
|
|
|
xOldTextCursor = xTextImportHelper->GetCursor();
|
|
|
|
xTextImportHelper->SetCursor( xTxt->createTextCursor() );
|
2001-07-25 12:29:47 +00:00
|
|
|
|
|
|
|
// remember old list item and block (#89892#) and reset them
|
|
|
|
// for the text frame
|
2008-10-01 06:34:11 +00:00
|
|
|
xTextImportHelper->PushListContext();
|
|
|
|
mbListContextPushed = true;
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
2002-10-31 09:26:33 +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
|
|
|
void XMLTextFrameContext::removeGraphicFromImportContext(const SvXMLImportContext& rContext) const
|
|
|
|
{
|
|
|
|
const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext);
|
|
|
|
|
|
|
|
if(pXMLTextFrameContext_Impl)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
// just dispose to delete
|
|
|
|
uno::Reference< lang::XComponent > xComp(pXMLTextFrameContext_Impl->GetPropSet(), UNO_QUERY);
|
|
|
|
|
|
|
|
if(xComp.is())
|
|
|
|
{
|
|
|
|
xComp->dispose();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch( uno::Exception& )
|
|
|
|
{
|
|
|
|
OSL_FAIL( "Error in cleanup of multiple graphic object import (!)" );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString XMLTextFrameContext::getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const
|
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
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString aRetval;
|
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
|
|
|
const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext);
|
|
|
|
|
|
|
|
if(pXMLTextFrameContext_Impl)
|
|
|
|
{
|
|
|
|
return pXMLTextFrameContext_Impl->GetHRef();
|
|
|
|
}
|
|
|
|
|
|
|
|
return aRetval;
|
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
sal_Bool XMLTextFrameContext_Impl::CreateIfNotThere()
|
2002-10-31 09:26:33 +00:00
|
|
|
{
|
|
|
|
if( !xPropSet.is() &&
|
|
|
|
( XML_TEXT_FRAME_OBJECT_OLE == nType ||
|
|
|
|
XML_TEXT_FRAME_GRAPHIC == nType ) &&
|
|
|
|
xBase64Stream.is() && !bCreateFailed )
|
|
|
|
{
|
|
|
|
if( bOwnBase64Stream )
|
|
|
|
xBase64Stream->closeOutput();
|
|
|
|
Create( sal_True );
|
|
|
|
}
|
|
|
|
|
|
|
|
return xPropSet.is();
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
|
2000-09-18 16:07:07 +00:00
|
|
|
SvXMLImport& rImport,
|
|
|
|
sal_uInt16 nPrfx, const OUString& rLName,
|
2004-07-13 07:36:31 +00:00
|
|
|
const Reference< XAttributeList > & rAttrList,
|
2000-09-18 16:07:07 +00:00
|
|
|
TextContentAnchorType eATyp,
|
2004-07-13 07:36:31 +00:00
|
|
|
sal_uInt16 nNewType,
|
2006-06-19 17:45:40 +00:00
|
|
|
const Reference< XAttributeList > & rFrameAttrList )
|
|
|
|
: SvXMLImportContext( rImport, nPrfx, rLName )
|
2008-10-01 06:34:11 +00:00
|
|
|
, mbListContextPushed( false )
|
2013-03-02 21:32:41 +01:00
|
|
|
, sWidth("Width")
|
|
|
|
, sWidthType("WidthType")
|
|
|
|
, sRelativeWidth("RelativeWidth")
|
|
|
|
, sHeight("Height")
|
|
|
|
, sRelativeHeight("RelativeHeight")
|
|
|
|
, sSizeType("SizeType")
|
|
|
|
, sIsSyncWidthToHeight("IsSyncWidthToHeight")
|
|
|
|
, sIsSyncHeightToWidth("IsSyncHeightToWidth")
|
|
|
|
, sHoriOrient("HoriOrient")
|
|
|
|
, sHoriOrientPosition("HoriOrientPosition")
|
|
|
|
, sVertOrient("VertOrient")
|
|
|
|
, sVertOrientPosition("VertOrientPosition")
|
|
|
|
, sChainNextName("ChainNextName")
|
|
|
|
, sAnchorType("AnchorType")
|
|
|
|
, sAnchorPageNo("AnchorPageNo")
|
|
|
|
, sGraphicURL("GraphicURL")
|
|
|
|
, sGraphicFilter("GraphicFilter")
|
|
|
|
, sTitle("Title")
|
|
|
|
, sDescription("Description")
|
|
|
|
, sFrameStyleName("FrameStyleName")
|
|
|
|
, sGraphicRotation("GraphicRotation")
|
|
|
|
, sTextBoxServiceName("com.sun.star.text.TextFrame")
|
|
|
|
, sGraphicServiceName("com.sun.star.text.GraphicObject")
|
2006-06-19 17:45:40 +00:00
|
|
|
, nType( nNewType )
|
|
|
|
, eAnchorType( eATyp )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2001-05-09 11:22:39 +00:00
|
|
|
nX = 0;
|
|
|
|
nY = 0;
|
|
|
|
nWidth = 0;
|
|
|
|
nHeight = 0;
|
|
|
|
nZIndex = -1;
|
|
|
|
nPage = 0;
|
|
|
|
nRotation = 0;
|
|
|
|
nRelWidth = 0;
|
|
|
|
nRelHeight = 0;
|
|
|
|
bMayScript = sal_False;
|
|
|
|
|
|
|
|
bMinHeight = sal_False;
|
2004-05-18 14:04:35 +00:00
|
|
|
bMinWidth = sal_False;
|
2001-05-09 11:22:39 +00:00
|
|
|
bSyncWidth = sal_False;
|
|
|
|
bSyncHeight = sal_False;
|
2002-10-31 09:26:33 +00:00
|
|
|
bCreateFailed = sal_False;
|
2001-06-19 14:08:23 +00:00
|
|
|
bOwnBase64Stream = sal_False;
|
2001-05-09 11:22:39 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
UniReference < XMLTextImportHelper > xTxtImport =
|
|
|
|
GetImport().GetTextImport();
|
|
|
|
const SvXMLTokenMap& rTokenMap =
|
|
|
|
xTxtImport->GetTextFrameAttrTokenMap();
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
sal_Int16 nAttrCount = rAttrList.is() ? rAttrList->getLength() : 0;
|
|
|
|
sal_Int16 nTotalAttrCount = nAttrCount + (rFrameAttrList.is() ? rFrameAttrList->getLength() : 0);
|
|
|
|
for( sal_Int16 i=0; i < nTotalAttrCount; i++ )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
const OUString& rAttrName =
|
|
|
|
i < nAttrCount ? rAttrList->getNameByIndex( i ) : rFrameAttrList->getNameByIndex( i-nAttrCount );
|
|
|
|
const OUString& rValue =
|
|
|
|
i < nAttrCount ? rAttrList->getValueByIndex( i ): rFrameAttrList->getValueByIndex( i-nAttrCount );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
OUString aLocalName;
|
|
|
|
sal_uInt16 nPrefix =
|
|
|
|
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName,
|
|
|
|
&aLocalName );
|
|
|
|
switch( rTokenMap.Get( nPrefix, aLocalName ) )
|
|
|
|
{
|
|
|
|
case XML_TOK_TEXT_FRAME_STYLE_NAME:
|
|
|
|
sStyleName = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_NAME:
|
2013-09-03 00:32:08 +02:00
|
|
|
m_sOrigName = rValue;
|
2000-09-18 16:07:07 +00:00
|
|
|
sName = rValue;
|
|
|
|
break;
|
2001-03-21 09:01:02 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_FRAME_NAME:
|
|
|
|
sFrameName = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_APPLET_NAME:
|
|
|
|
sAppletName = rValue;
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_ANCHOR_TYPE:
|
|
|
|
if( TextContentAnchorType_AT_PARAGRAPH == eAnchorType ||
|
|
|
|
TextContentAnchorType_AT_CHARACTER == eAnchorType ||
|
|
|
|
TextContentAnchorType_AS_CHARACTER == eAnchorType )
|
|
|
|
{
|
2001-03-13 14:50:56 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
TextContentAnchorType eNew;
|
2006-10-12 13:53:32 +00:00
|
|
|
if( XMLAnchorTypePropHdl::convert( rValue, eNew ) &&
|
2000-09-18 16:07:07 +00:00
|
|
|
( TextContentAnchorType_AT_PARAGRAPH == eNew ||
|
|
|
|
TextContentAnchorType_AT_CHARACTER == eNew ||
|
2001-03-13 14:50:56 +00:00
|
|
|
TextContentAnchorType_AS_CHARACTER == eNew ||
|
|
|
|
TextContentAnchorType_AT_PAGE == eNew) )
|
2000-09-18 16:07:07 +00:00
|
|
|
eAnchorType = eNew;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER:
|
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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
|
|
|
if (::sax::Converter::convertNumber(nTmp, rValue, 1, SHRT_MAX))
|
2000-09-18 16:07:07 +00:00
|
|
|
nPage = (sal_Int16)nTmp;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_X:
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nX, rValue);
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_Y:
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nY, rValue );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_WIDTH:
|
2001-01-15 10:28:36 +00:00
|
|
|
// relative widths are obsolete since SRC617. Remove them some day!
|
|
|
|
if( rValue.indexOf( '%' ) != -1 )
|
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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( nTmp, rValue );
|
2001-03-23 15:30:35 +00:00
|
|
|
nRelWidth = (sal_Int16)nTmp;
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nWidth, rValue, 0 );
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
2001-01-15 10:28:36 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_REL_WIDTH:
|
2001-06-29 20:07:26 +00:00
|
|
|
if( IsXMLToken(rValue, XML_SCALE) )
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
bSyncWidth = sal_True;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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
|
|
|
if (::sax::Converter::convertPercent( nTmp, rValue ))
|
2001-03-23 15:30:35 +00:00
|
|
|
nRelWidth = (sal_Int16)nTmp;
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
2004-05-18 14:04:35 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_MIN_WIDTH:
|
|
|
|
if( rValue.indexOf( '%' ) != -1 )
|
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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( nTmp, rValue );
|
2004-05-18 14:04:35 +00:00
|
|
|
nRelWidth = (sal_Int16)nTmp;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nWidth, rValue, 0 );
|
2004-05-18 14:04:35 +00:00
|
|
|
}
|
|
|
|
bMinWidth = sal_True;
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_HEIGHT:
|
2001-01-15 10:28:36 +00:00
|
|
|
// relative heights are obsolete since SRC617. Remove them some day!
|
|
|
|
if( rValue.indexOf( '%' ) != -1 )
|
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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( nTmp, rValue );
|
2001-03-23 15:30:35 +00:00
|
|
|
nRelHeight = (sal_Int16)nTmp;
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nHeight, rValue, 0 );
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_REL_HEIGHT:
|
2001-06-29 20:07:26 +00:00
|
|
|
if( IsXMLToken( rValue, XML_SCALE ) )
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
bSyncHeight = sal_True;
|
|
|
|
}
|
2001-06-29 20:07:26 +00:00
|
|
|
else if( IsXMLToken( rValue, XML_SCALE_MIN ) )
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
bSyncHeight = sal_True;
|
|
|
|
bMinHeight = sal_True;
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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
|
|
|
if (::sax::Converter::convertPercent( nTmp, rValue ))
|
2001-03-23 15:30:35 +00:00
|
|
|
nRelHeight = (sal_Int16)nTmp;
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_MIN_HEIGHT:
|
2001-01-15 10:28:36 +00:00
|
|
|
if( rValue.indexOf( '%' ) != -1 )
|
|
|
|
{
|
|
|
|
sal_Int32 nTmp;
|
#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( nTmp, rValue );
|
2001-03-23 15:30:35 +00:00
|
|
|
nRelHeight = (sal_Int16)nTmp;
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
2011-10-11 14:19:09 +02:00
|
|
|
GetImport().GetMM100UnitConverter().convertMeasureToCore(
|
|
|
|
nHeight, rValue, 0 );
|
2001-01-15 10:28:36 +00:00
|
|
|
}
|
|
|
|
bMinHeight = sal_True;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
2000-12-06 10:41:56 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_Z_INDEX:
|
#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::convertNumber( nZIndex, rValue, -1 );
|
2000-12-06 10:41:56 +00:00
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME:
|
2001-05-09 11:22:39 +00:00
|
|
|
sNextName = rValue;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_HREF:
|
|
|
|
sHRef = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_FILTER_NAME:
|
|
|
|
sFilterName = rValue;
|
|
|
|
break;
|
2000-12-18 12:25:02 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_TRANSFORM:
|
|
|
|
{
|
|
|
|
OUString sValue( rValue );
|
2012-11-28 21:26:01 +02:00
|
|
|
sValue = sValue.trim();
|
2009-11-12 14:49:51 +01:00
|
|
|
const OUString aRotate(GetXMLToken(XML_ROTATE));
|
|
|
|
const sal_Int32 nRotateLen(aRotate.getLength());
|
2000-12-18 12:25:02 +00:00
|
|
|
sal_Int32 nLen = sValue.getLength();
|
|
|
|
if( nLen >= nRotateLen+3 &&
|
2009-11-12 14:49:51 +01:00
|
|
|
0 == sValue.compareTo( aRotate, nRotateLen ) &&
|
2000-12-18 12:25:02 +00:00
|
|
|
'(' == sValue[nRotateLen] &&
|
|
|
|
')' == sValue[nLen-1] )
|
|
|
|
{
|
|
|
|
sValue = sValue.copy( nRotateLen+1, nLen-(nRotateLen+2) );
|
2012-11-28 21:26:01 +02:00
|
|
|
sValue = sValue.trim();
|
2000-12-18 12:25:02 +00:00
|
|
|
sal_Int32 nVal;
|
#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
|
|
|
if (::sax::Converter::convertNumber( nVal, sValue ))
|
2000-12-18 12:25:02 +00:00
|
|
|
nRotation = (sal_Int16)(nVal % 360 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2001-02-23 13:39:25 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_CODE:
|
|
|
|
sCode = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_OBJECT:
|
|
|
|
sObject = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_ARCHIVE:
|
|
|
|
sArchive = rValue;
|
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_MAY_SCRIPT:
|
2001-06-29 20:07:26 +00:00
|
|
|
bMayScript = IsXMLToken( rValue, XML_TRUE );
|
2001-02-23 13:39:25 +00:00
|
|
|
break;
|
|
|
|
case XML_TOK_TEXT_FRAME_MIME_TYPE:
|
|
|
|
sMimeType = rValue;
|
|
|
|
break;
|
2001-06-28 12:21:55 +00:00
|
|
|
case XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE:
|
|
|
|
sTblName = rValue;
|
|
|
|
break;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-06-12 06:35:19 +00:00
|
|
|
if( ( (XML_TEXT_FRAME_GRAPHIC == nType ||
|
2001-11-12 13:23:47 +00:00
|
|
|
XML_TEXT_FRAME_OBJECT == nType ||
|
|
|
|
XML_TEXT_FRAME_OBJECT_OLE == nType) &&
|
2012-01-26 17:05:51 -02:00
|
|
|
sHRef.isEmpty() ) ||
|
|
|
|
( XML_TEXT_FRAME_APPLET == nType && sCode.isEmpty() ) ||
|
2003-06-12 06:35:19 +00:00
|
|
|
( XML_TEXT_FRAME_PLUGIN == nType &&
|
2012-01-26 17:05:51 -02:00
|
|
|
sHRef.isEmpty() && sMimeType.isEmpty() ) )
|
2001-02-23 13:39:25 +00:00
|
|
|
return; // no URL: no image or OLE object
|
2000-11-16 12:50:03 +00:00
|
|
|
|
2001-05-09 11:22:39 +00:00
|
|
|
Create( sal_True );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
XMLTextFrameContext_Impl::~XMLTextFrameContext_Impl()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
void XMLTextFrameContext_Impl::EndElement()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2002-10-31 09:26:33 +00:00
|
|
|
CreateIfNotThere();
|
2001-05-18 12:58:34 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
if( xOldTextCursor.is() )
|
|
|
|
{
|
2001-03-09 06:23:23 +00:00
|
|
|
GetImport().GetTextImport()->DeleteParagraph();
|
2000-09-18 16:07:07 +00:00
|
|
|
GetImport().GetTextImport()->SetCursor( xOldTextCursor );
|
|
|
|
}
|
2001-07-25 12:29:47 +00:00
|
|
|
|
|
|
|
// reinstall old list item (if necessary) #89892#
|
2008-10-01 06:34:11 +00:00
|
|
|
if (mbListContextPushed) {
|
|
|
|
GetImport().GetTextImport()->PopListContext();
|
2001-07-25 12:29:47 +00:00
|
|
|
}
|
|
|
|
|
2001-03-09 14:59:46 +00:00
|
|
|
if (( nType == XML_TEXT_FRAME_APPLET || nType == XML_TEXT_FRAME_PLUGIN ) && xPropSet.is())
|
|
|
|
GetImport().GetTextImport()->endAppletOrPlugin( xPropSet, aParamMap);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext(
|
2000-09-18 16:07:07 +00:00
|
|
|
sal_uInt16 nPrefix,
|
|
|
|
const OUString& rLocalName,
|
|
|
|
const Reference< XAttributeList > & xAttrList )
|
|
|
|
{
|
|
|
|
SvXMLImportContext *pContext = 0;
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
if( XML_NAMESPACE_DRAW == nPrefix )
|
2000-11-16 12:23:56 +00:00
|
|
|
{
|
2001-02-23 13:39:25 +00:00
|
|
|
if ( (nType == XML_TEXT_FRAME_APPLET || nType == XML_TEXT_FRAME_PLUGIN) &&
|
2001-06-29 20:07:26 +00:00
|
|
|
IsXMLToken( rLocalName, XML_PARAM ) )
|
2001-02-23 13:39:25 +00:00
|
|
|
{
|
|
|
|
pContext = new XMLTextFrameParam_Impl( GetImport(),
|
|
|
|
nPrefix, rLocalName,
|
2001-03-09 14:59:46 +00:00
|
|
|
xAttrList, nType, aParamMap );
|
2001-02-23 13:39:25 +00:00
|
|
|
}
|
2000-11-16 12:23:56 +00:00
|
|
|
}
|
2001-06-19 14:08:23 +00:00
|
|
|
else if( (XML_NAMESPACE_OFFICE == nPrefix) )
|
2000-12-19 17:56:47 +00:00
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
if( IsXMLToken( rLocalName, XML_BINARY_DATA ) )
|
2000-12-19 17:56:47 +00:00
|
|
|
{
|
2002-10-31 09:26:33 +00:00
|
|
|
if( !xPropSet.is() && !xBase64Stream.is() && !bCreateFailed )
|
2000-12-19 17:56:47 +00:00
|
|
|
{
|
2001-06-19 14:08:23 +00:00
|
|
|
switch( nType )
|
|
|
|
{
|
|
|
|
case XML_TEXT_FRAME_GRAPHIC:
|
2005-01-27 10:09:50 +00:00
|
|
|
xBase64Stream =
|
|
|
|
GetImport().GetStreamForGraphicObjectURLFromBase64();
|
2001-06-19 14:08:23 +00:00
|
|
|
break;
|
|
|
|
case XML_TEXT_FRAME_OBJECT_OLE:
|
|
|
|
xBase64Stream =
|
2005-01-27 10:09:50 +00:00
|
|
|
GetImport().GetStreamForEmbeddedObjectURLFromBase64();
|
2001-06-19 14:08:23 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( xBase64Stream.is() )
|
|
|
|
pContext = new XMLBase64ImportContext( GetImport(), nPrefix,
|
|
|
|
rLocalName, xAttrList,
|
|
|
|
xBase64Stream );
|
2000-12-19 17:56:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-11-09 01:42:14 +05:00
|
|
|
// Correction of condition which also avoids warnings. (#i100480#)
|
2001-06-20 07:42:01 +00:00
|
|
|
if( !pContext &&
|
2009-08-27 14:36:29 +00:00
|
|
|
( XML_TEXT_FRAME_OBJECT == nType &&
|
|
|
|
( ( XML_NAMESPACE_OFFICE == nPrefix &&
|
|
|
|
IsXMLToken( rLocalName, XML_DOCUMENT ) ) ||
|
|
|
|
( XML_NAMESPACE_MATH == nPrefix &&
|
|
|
|
IsXMLToken( rLocalName, XML_MATH ) ) ) ) )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
2002-10-31 09:26:33 +00:00
|
|
|
if( !xPropSet.is() && !bCreateFailed )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
|
|
|
XMLEmbeddedObjectImportContext *pEContext =
|
|
|
|
new XMLEmbeddedObjectImportContext( GetImport(), nPrefix,
|
|
|
|
rLocalName, xAttrList );
|
|
|
|
sFilterService = pEContext->GetFilterServiceName();
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sFilterService.isEmpty() )
|
2001-05-09 11:22:39 +00:00
|
|
|
{
|
|
|
|
Create( sal_False );
|
|
|
|
if( xPropSet.is() )
|
|
|
|
{
|
|
|
|
Reference < XEmbeddedObjectSupplier > xEOS( xPropSet,
|
|
|
|
UNO_QUERY );
|
|
|
|
OSL_ENSURE( xEOS.is(),
|
|
|
|
"no embedded object supplier for own object" );
|
2001-10-10 14:57:21 +00:00
|
|
|
Reference<com::sun::star::lang::XComponent> aXComponent(xEOS->getEmbeddedObject());
|
|
|
|
pEContext->SetComponent( aXComponent );
|
2001-05-09 11:22:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
pContext = pEContext;
|
|
|
|
}
|
|
|
|
}
|
2001-03-14 09:30:23 +00:00
|
|
|
if( !pContext && xOldTextCursor.is() ) // text-box
|
2000-09-18 16:07:07 +00:00
|
|
|
pContext = GetImport().GetTextImport()->CreateTextChildContext(
|
|
|
|
GetImport(), nPrefix, rLocalName, xAttrList,
|
|
|
|
XML_TEXT_TYPE_TEXTBOX );
|
|
|
|
|
|
|
|
if( !pContext )
|
|
|
|
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
|
|
|
|
|
|
|
|
return pContext;
|
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
void XMLTextFrameContext_Impl::Characters( const OUString& rChars )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
2001-06-19 14:08:23 +00:00
|
|
|
if( ( XML_TEXT_FRAME_OBJECT_OLE == nType ||
|
|
|
|
XML_TEXT_FRAME_GRAPHIC == nType) &&
|
2002-10-31 09:26:33 +00:00
|
|
|
!xPropSet.is() && !bCreateFailed )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
|
|
|
OUString sTrimmedChars( rChars. trim() );
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sTrimmedChars.isEmpty() )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
2002-10-31 09:26:33 +00:00
|
|
|
if( !xBase64Stream.is() )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
2001-06-19 14:08:23 +00:00
|
|
|
if( XML_TEXT_FRAME_GRAPHIC == nType )
|
|
|
|
{
|
2005-01-27 10:09:50 +00:00
|
|
|
xBase64Stream =
|
|
|
|
GetImport().GetStreamForGraphicObjectURLFromBase64();
|
2001-06-19 14:08:23 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
xBase64Stream =
|
2005-01-27 10:09:50 +00:00
|
|
|
GetImport().GetStreamForEmbeddedObjectURLFromBase64();
|
2001-06-19 14:08:23 +00:00
|
|
|
}
|
|
|
|
if( xBase64Stream.is() )
|
|
|
|
bOwnBase64Stream = sal_True;
|
2001-05-18 12:58:34 +00:00
|
|
|
}
|
2001-06-19 14:08:23 +00:00
|
|
|
if( bOwnBase64Stream && xBase64Stream.is() )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
|
|
|
OUString sChars;
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !sBase64CharsLeft.isEmpty() )
|
2001-05-18 12:58:34 +00:00
|
|
|
{
|
|
|
|
sChars = sBase64CharsLeft;
|
|
|
|
sChars += sTrimmedChars;
|
|
|
|
sBase64CharsLeft = OUString();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sChars = sTrimmedChars;
|
|
|
|
}
|
|
|
|
Sequence< sal_Int8 > aBuffer( (sChars.getLength() / 4) * 3 );
|
|
|
|
sal_Int32 nCharsDecoded =
|
#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::decodeBase64SomeChars( aBuffer, sChars );
|
2001-06-19 14:08:23 +00:00
|
|
|
xBase64Stream->writeBytes( aBuffer );
|
2001-05-18 12:58:34 +00:00
|
|
|
if( nCharsDecoded != sChars.getLength() )
|
|
|
|
sBase64CharsLeft = sChars.copy( nCharsDecoded );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
|
2000-09-26 07:10:55 +00:00
|
|
|
const OUString& rName,
|
|
|
|
const OUString& rTargetFrameName,
|
|
|
|
sal_Bool bMap )
|
|
|
|
{
|
2013-03-02 21:32:41 +01:00
|
|
|
static OUString s_HyperLinkURL("HyperLinkURL");
|
|
|
|
static OUString s_HyperLinkName("HyperLinkName");
|
2013-04-07 12:06:47 +02:00
|
|
|
static OUString s_HyperLinkTarget("HyperLinkTarget");
|
|
|
|
static OUString s_ServerMap("ServerMap");
|
2000-09-26 07:10:55 +00:00
|
|
|
if( !xPropSet.is() )
|
|
|
|
return;
|
|
|
|
|
|
|
|
UniReference< XMLTextImportHelper > xTxtImp = GetImport().GetTextImport();
|
|
|
|
Reference < XPropertySetInfo > xPropSetInfo =
|
|
|
|
xPropSet->getPropertySetInfo();
|
|
|
|
if( !xPropSetInfo.is() ||
|
2010-03-15 12:53:14 +01:00
|
|
|
!xPropSetInfo->hasPropertyByName(s_HyperLinkURL))
|
2000-09-26 07:10:55 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
Any aAny;
|
|
|
|
aAny <<= rHRef;
|
2010-03-15 12:53:14 +01:00
|
|
|
xPropSet->setPropertyValue( s_HyperLinkURL, aAny );
|
2000-09-26 07:10:55 +00:00
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
if (xPropSetInfo->hasPropertyByName(s_HyperLinkName))
|
2000-09-26 07:10:55 +00:00
|
|
|
{
|
|
|
|
aAny <<= rName;
|
2010-03-15 12:53:14 +01:00
|
|
|
xPropSet->setPropertyValue(s_HyperLinkName, aAny);
|
2000-09-26 07:10:55 +00:00
|
|
|
}
|
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
if (xPropSetInfo->hasPropertyByName(s_HyperLinkTarget))
|
2000-09-26 07:10:55 +00:00
|
|
|
{
|
|
|
|
aAny <<= rTargetFrameName;
|
2010-03-15 12:53:14 +01:00
|
|
|
xPropSet->setPropertyValue( s_HyperLinkTarget, aAny );
|
2000-09-26 07:10:55 +00:00
|
|
|
}
|
|
|
|
|
2010-03-15 12:53:14 +01:00
|
|
|
if (xPropSetInfo->hasPropertyByName(s_ServerMap))
|
2000-11-20 12:01:35 +00:00
|
|
|
{
|
|
|
|
aAny.setValue( &bMap, ::getBooleanCppuType() );
|
2010-03-15 12:53:14 +01:00
|
|
|
xPropSet->setPropertyValue(s_ServerMap, aAny);
|
2000-11-20 12:01:35 +00:00
|
|
|
}
|
2000-09-26 07:10:55 +00:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-09-03 00:32:08 +02:00
|
|
|
void XMLTextFrameContext_Impl::SetName()
|
|
|
|
{
|
|
|
|
Reference<XNamed> xNamed(xPropSet, UNO_QUERY);
|
2013-12-02 23:28:20 +01:00
|
|
|
if (!m_sOrigName.isEmpty() && xNamed.is())
|
2013-09-03 00:32:08 +02:00
|
|
|
{
|
|
|
|
OUString const name(xNamed->getName());
|
|
|
|
if (name != m_sOrigName)
|
|
|
|
{
|
2013-12-02 23:28:20 +01:00
|
|
|
try
|
|
|
|
{
|
|
|
|
xNamed->setName(m_sOrigName);
|
|
|
|
}
|
|
|
|
catch (uno::Exception const& e)
|
|
|
|
{ // fdo#71698 document contains 2 frames with same draw:name
|
|
|
|
SAL_INFO("xmloff.text", "SetName(): exception setting \""
|
|
|
|
<< m_sOrigName << "\": " << e.Message);
|
|
|
|
}
|
2013-09-03 00:32:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-09 01:42:14 +05:00
|
|
|
// Implement Title/Description Elements UI (#i73249#)
|
2009-08-27 11:59:20 +00:00
|
|
|
void XMLTextFrameContext_Impl::SetTitle( const OUString& rTitle )
|
|
|
|
{
|
|
|
|
if ( xPropSet.is() )
|
|
|
|
{
|
|
|
|
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
|
|
|
|
if( xPropSetInfo->hasPropertyByName( sTitle ) )
|
|
|
|
{
|
|
|
|
xPropSet->setPropertyValue( sTitle, makeAny( rTitle ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc )
|
|
|
|
{
|
|
|
|
if ( xPropSet.is() )
|
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo();
|
|
|
|
if( xPropSetInfo->hasPropertyByName( sDescription ) )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
xPropSet->setPropertyValue( sDescription, makeAny( rDesc ) );
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
TYPEINIT1( XMLTextFrameContext, SvXMLImportContext );
|
|
|
|
|
|
|
|
sal_Bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference <
|
|
|
|
::com::sun::star::beans::XPropertySet >& rPropSet )
|
|
|
|
{
|
|
|
|
SvXMLImportContext *pContext = &m_xImplContext;
|
|
|
|
XMLTextFrameContext_Impl *pImpl = PTR_CAST( XMLTextFrameContext_Impl, pContext );
|
|
|
|
if( pImpl )
|
|
|
|
{
|
|
|
|
if( pImpl->CreateIfNotThere() )
|
|
|
|
rPropSet = pImpl->GetPropSet();
|
|
|
|
}
|
|
|
|
|
|
|
|
return rPropSet.is();
|
|
|
|
}
|
|
|
|
|
|
|
|
XMLTextFrameContext::XMLTextFrameContext(
|
|
|
|
SvXMLImport& rImport,
|
|
|
|
sal_uInt16 nPrfx, const OUString& rLName,
|
|
|
|
const Reference< XAttributeList > & xAttrList,
|
2006-06-19 17:45:40 +00:00
|
|
|
TextContentAnchorType eATyp )
|
|
|
|
: SvXMLImportContext( rImport, nPrfx, rLName )
|
2013-05-15 09:31:38 +02:00
|
|
|
, MultiImageImportHelper()
|
2006-06-19 17:45:40 +00:00
|
|
|
, m_xAttrList( new SvXMLAttributeList( xAttrList ) )
|
|
|
|
, m_pHyperlink( 0 )
|
2010-11-09 01:42:14 +05:00
|
|
|
// Implement Title/Description Elements UI (#i73249#)
|
2009-08-27 11:59:20 +00:00
|
|
|
, m_sTitle()
|
|
|
|
, m_sDesc()
|
2006-06-19 17:45:40 +00:00
|
|
|
, m_eDefaultAnchorType( eATyp )
|
2010-11-09 01:42:14 +05:00
|
|
|
// Shapes in Writer cannot be named via context menu (#i51726#)
|
2006-06-19 17:45:40 +00:00
|
|
|
, m_HasAutomaticStyleWithoutParentStyle( sal_False )
|
|
|
|
, m_bSupportsReplacement( sal_False )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
|
|
|
|
for( sal_Int16 i=0; i < nAttrCount; i++ )
|
|
|
|
{
|
|
|
|
const OUString& rAttrName = xAttrList->getNameByIndex( i );
|
|
|
|
|
|
|
|
OUString aLocalName;
|
|
|
|
sal_uInt16 nPrefix =
|
|
|
|
GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName );
|
2006-03-27 09:04:49 +00:00
|
|
|
// New distinguish attribute between Writer objects and Draw objects is:
|
2010-11-09 01:42:14 +05:00
|
|
|
// Draw objects have an automatic style without a parent style (#i51726#)
|
2006-03-27 09:04:49 +00:00
|
|
|
if ( XML_NAMESPACE_DRAW == nPrefix &&
|
|
|
|
IsXMLToken( aLocalName, XML_STYLE_NAME ) )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
2006-03-27 09:04:49 +00:00
|
|
|
OUString aStyleName = xAttrList->getValueByIndex( i );
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !aStyleName.isEmpty() )
|
2006-03-27 09:04:49 +00:00
|
|
|
{
|
|
|
|
UniReference < XMLTextImportHelper > xTxtImport =
|
|
|
|
GetImport().GetTextImport();
|
|
|
|
XMLPropStyleContext* pStyle( 0L );
|
|
|
|
pStyle = xTxtImport->FindAutoFrameStyle( aStyleName );
|
2012-01-26 17:05:51 -02:00
|
|
|
if ( pStyle && pStyle->GetParentName().isEmpty() )
|
2006-03-27 09:04:49 +00:00
|
|
|
{
|
|
|
|
m_HasAutomaticStyleWithoutParentStyle = sal_True;
|
|
|
|
}
|
|
|
|
}
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
2006-03-27 09:04:49 +00:00
|
|
|
else if ( XML_NAMESPACE_TEXT == nPrefix &&
|
|
|
|
IsXMLToken( aLocalName, XML_ANCHOR_TYPE ) )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
TextContentAnchorType eNew;
|
|
|
|
if( XMLAnchorTypePropHdl::convert( xAttrList->getValueByIndex(i),
|
2006-10-12 13:53:32 +00:00
|
|
|
eNew ) &&
|
2004-07-13 07:36:31 +00:00
|
|
|
( TextContentAnchorType_AT_PARAGRAPH == eNew ||
|
|
|
|
TextContentAnchorType_AT_CHARACTER == eNew ||
|
|
|
|
TextContentAnchorType_AS_CHARACTER == eNew ||
|
|
|
|
TextContentAnchorType_AT_PAGE == eNew) )
|
|
|
|
m_eDefaultAnchorType = eNew;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
XMLTextFrameContext::~XMLTextFrameContext()
|
|
|
|
{
|
|
|
|
delete m_pHyperlink;
|
|
|
|
}
|
|
|
|
|
|
|
|
void XMLTextFrameContext::EndElement()
|
|
|
|
{
|
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
|
|
|
/// solve if multiple image child contexts were imported
|
2013-09-03 00:32:08 +02:00
|
|
|
SvXMLImportContextRef const pMultiContext(solveMultipleImages());
|
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
|
|
|
|
2013-09-03 00:32:08 +02:00
|
|
|
SvXMLImportContext const*const pContext =
|
|
|
|
(pMultiContext) ? &pMultiContext : &m_xImplContext;
|
2004-07-13 07:36:31 +00:00
|
|
|
XMLTextFrameContext_Impl *pImpl = PTR_CAST( XMLTextFrameContext_Impl, pContext );
|
2013-09-03 00:32:08 +02:00
|
|
|
assert(!pMultiContext || pImpl);
|
2004-07-13 07:36:31 +00:00
|
|
|
if( pImpl )
|
|
|
|
{
|
|
|
|
pImpl->CreateIfNotThere();
|
|
|
|
|
2013-09-03 00:32:08 +02:00
|
|
|
// fdo#68839: in case the surviving image was not the first one,
|
|
|
|
// it will have a counter added to its name - set the original name
|
|
|
|
if (pMultiContext) // do this only when necessary; esp. not for text
|
|
|
|
{ // frames that may have entries in GetRenameMap()!
|
|
|
|
pImpl->SetName();
|
|
|
|
}
|
|
|
|
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !m_sTitle.isEmpty() )
|
2009-08-27 11:59:20 +00:00
|
|
|
{
|
|
|
|
pImpl->SetTitle( m_sTitle );
|
|
|
|
}
|
2012-01-26 17:05:51 -02:00
|
|
|
if( !m_sDesc.isEmpty() )
|
2009-08-27 11:59:20 +00:00
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
pImpl->SetDesc( m_sDesc );
|
2009-08-27 11:59:20 +00:00
|
|
|
}
|
2004-07-13 07:36:31 +00:00
|
|
|
|
|
|
|
if( m_pHyperlink )
|
|
|
|
{
|
|
|
|
pImpl->SetHyperlink( m_pHyperlink->GetHRef(), m_pHyperlink->GetName(),
|
|
|
|
m_pHyperlink->GetTargetFrameName(), m_pHyperlink->GetMap() );
|
|
|
|
delete m_pHyperlink;
|
|
|
|
m_pHyperlink = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SvXMLImportContext *XMLTextFrameContext::CreateChildContext(
|
2006-06-19 17:45:40 +00:00
|
|
|
sal_uInt16 p_nPrefix,
|
2004-07-13 07:36:31 +00:00
|
|
|
const OUString& rLocalName,
|
|
|
|
const Reference< XAttributeList > & xAttrList )
|
|
|
|
{
|
|
|
|
SvXMLImportContext *pContext = 0;
|
|
|
|
|
|
|
|
if( !m_xImplContext.Is() )
|
|
|
|
{
|
|
|
|
// no child exists
|
2006-06-19 17:45:40 +00:00
|
|
|
if( XML_NAMESPACE_DRAW == p_nPrefix )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
sal_uInt16 nFrameType = USHRT_MAX;
|
|
|
|
if( IsXMLToken( rLocalName, XML_TEXT_BOX ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_TEXTBOX;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_IMAGE ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_GRAPHIC;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_OBJECT ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_OBJECT;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_OBJECT_OLE ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_OBJECT_OLE;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_APPLET) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_APPLET;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_PLUGIN ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_PLUGIN;
|
|
|
|
else if( IsXMLToken( rLocalName, XML_FLOATING_FRAME ) )
|
|
|
|
nFrameType = XML_TEXT_FRAME_FLOATING_FRAME;
|
|
|
|
|
|
|
|
if( USHRT_MAX != nFrameType )
|
|
|
|
{
|
2010-11-09 01:42:14 +05:00
|
|
|
// Shapes in Writer cannot be named via context menu (#i51726#)
|
2006-03-27 09:04:49 +00:00
|
|
|
if ( ( XML_TEXT_FRAME_TEXTBOX == nFrameType ||
|
|
|
|
XML_TEXT_FRAME_GRAPHIC == nFrameType ) &&
|
|
|
|
m_HasAutomaticStyleWithoutParentStyle )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
Reference < XShapes > xShapes;
|
|
|
|
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
|
2006-06-19 17:45:40 +00:00
|
|
|
GetImport(), p_nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList );
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
2004-08-12 07:51:02 +00:00
|
|
|
else if( XML_TEXT_FRAME_PLUGIN == nFrameType )
|
|
|
|
{
|
|
|
|
bool bMedia = false;
|
|
|
|
|
|
|
|
// check, if we have a media object
|
|
|
|
for( sal_Int16 n = 0, nAttrCount = ( xAttrList.is() ? xAttrList->getLength() : 0 ); n < nAttrCount; ++n )
|
|
|
|
{
|
|
|
|
OUString aLocalName;
|
|
|
|
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( xAttrList->getNameByIndex( n ), &aLocalName );
|
|
|
|
|
|
|
|
if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( aLocalName, XML_MIME_TYPE ) )
|
|
|
|
{
|
2013-11-05 11:06:18 +02:00
|
|
|
if( xAttrList->getValueByIndex( n ).equalsAscii( "application/vnd.sun.star.media" ) )
|
2004-08-12 07:51:02 +00:00
|
|
|
bMedia = true;
|
|
|
|
|
|
|
|
// leave this loop
|
|
|
|
n = nAttrCount - 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( bMedia )
|
|
|
|
{
|
|
|
|
Reference < XShapes > xShapes;
|
|
|
|
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
|
2006-06-19 17:45:40 +00:00
|
|
|
GetImport(), p_nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList );
|
2004-08-12 07:51:02 +00:00
|
|
|
}
|
|
|
|
}
|
2004-11-26 12:05:08 +00:00
|
|
|
else if( XML_TEXT_FRAME_OBJECT == nFrameType ||
|
|
|
|
XML_TEXT_FRAME_OBJECT_OLE == nFrameType )
|
|
|
|
{
|
|
|
|
m_bSupportsReplacement = sal_True;
|
|
|
|
}
|
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
|
|
|
else if(XML_TEXT_FRAME_GRAPHIC == nFrameType)
|
|
|
|
{
|
|
|
|
setSupportsMultipleContents(IsXMLToken(rLocalName, XML_IMAGE));
|
|
|
|
}
|
2004-08-12 07:51:02 +00:00
|
|
|
|
|
|
|
if( !pContext )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new XMLTextFrameContext_Impl( GetImport(), p_nPrefix,
|
2004-07-13 07:36:31 +00:00
|
|
|
rLocalName, xAttrList,
|
|
|
|
m_eDefaultAnchorType,
|
|
|
|
nFrameType,
|
|
|
|
m_xAttrList );
|
|
|
|
}
|
2004-08-12 07:51:02 +00:00
|
|
|
|
2004-07-13 07:36:31 +00:00
|
|
|
m_xImplContext = pContext;
|
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
|
|
|
|
|
|
|
if(getSupportsMultipleContents() && XML_TEXT_FRAME_GRAPHIC == nFrameType)
|
|
|
|
{
|
|
|
|
addContent(*m_xImplContext);
|
|
|
|
}
|
2004-07-13 07:36:31 +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
|
|
|
else if(getSupportsMultipleContents() && XML_NAMESPACE_DRAW == p_nPrefix && IsXMLToken(rLocalName, XML_IMAGE))
|
|
|
|
{
|
|
|
|
// read another image
|
|
|
|
pContext = new XMLTextFrameContext_Impl(
|
|
|
|
GetImport(), p_nPrefix, rLocalName, xAttrList,
|
|
|
|
m_eDefaultAnchorType, XML_TEXT_FRAME_GRAPHIC, m_xAttrList);
|
|
|
|
|
|
|
|
m_xImplContext = pContext;
|
|
|
|
addContent(*m_xImplContext);
|
|
|
|
}
|
2004-11-26 12:05:08 +00:00
|
|
|
else if( m_bSupportsReplacement && !m_xReplImplContext &&
|
2006-06-19 17:45:40 +00:00
|
|
|
XML_NAMESPACE_DRAW == p_nPrefix &&
|
2004-11-26 12:05:08 +00:00
|
|
|
IsXMLToken( rLocalName, XML_IMAGE ) )
|
|
|
|
{
|
|
|
|
// read replacement image
|
|
|
|
Reference < XPropertySet > xPropSet;
|
|
|
|
if( CreateIfNotThere( xPropSet ) )
|
|
|
|
{
|
|
|
|
pContext = new XMLReplacementImageContext( GetImport(),
|
2006-06-19 17:45:40 +00:00
|
|
|
p_nPrefix, rLocalName, xAttrList, xPropSet );
|
2004-11-26 12:05:08 +00:00
|
|
|
m_xReplImplContext = pContext;
|
|
|
|
}
|
|
|
|
}
|
2004-07-13 07:36:31 +00:00
|
|
|
else if( m_xImplContext->ISA( XMLTextFrameContext_Impl ) )
|
|
|
|
{
|
|
|
|
// the child is a writer frame
|
2008-06-06 08:27:53 +00:00
|
|
|
if( XML_NAMESPACE_SVG == p_nPrefix )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
2010-11-09 01:42:14 +05:00
|
|
|
// Implement Title/Description Elements UI (#i73249#)
|
2009-08-27 11:59:20 +00:00
|
|
|
const bool bOld = SvXMLImport::OOo_2x >= GetImport().getGeneratorVersion();
|
|
|
|
if ( bOld )
|
|
|
|
{
|
|
|
|
if ( IsXMLToken( rLocalName, XML_DESC ) )
|
|
|
|
{
|
|
|
|
pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(),
|
|
|
|
p_nPrefix,
|
|
|
|
rLocalName,
|
|
|
|
m_sTitle );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if( IsXMLToken( rLocalName, XML_TITLE ) )
|
|
|
|
{
|
|
|
|
pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(),
|
|
|
|
p_nPrefix,
|
|
|
|
rLocalName,
|
|
|
|
m_sTitle );
|
|
|
|
}
|
|
|
|
else if ( IsXMLToken( rLocalName, XML_DESC ) )
|
|
|
|
{
|
|
|
|
pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(),
|
|
|
|
p_nPrefix,
|
|
|
|
rLocalName,
|
|
|
|
m_sDesc );
|
|
|
|
}
|
|
|
|
}
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
2006-06-19 17:45:40 +00:00
|
|
|
else if( XML_NAMESPACE_DRAW == p_nPrefix )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
Reference < XPropertySet > xPropSet;
|
|
|
|
if( IsXMLToken( rLocalName, XML_CONTOUR_POLYGON ) )
|
|
|
|
{
|
|
|
|
if( CreateIfNotThere( xPropSet ) )
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName,
|
2004-07-13 07:36:31 +00:00
|
|
|
xAttrList, xPropSet, sal_False );
|
|
|
|
}
|
|
|
|
else if( IsXMLToken( rLocalName, XML_CONTOUR_PATH ) )
|
|
|
|
{
|
|
|
|
if( CreateIfNotThere( xPropSet ) )
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName,
|
2004-07-13 07:36:31 +00:00
|
|
|
xAttrList, xPropSet, sal_True );
|
|
|
|
}
|
|
|
|
else if( IsXMLToken( rLocalName, XML_IMAGE_MAP ) )
|
|
|
|
{
|
|
|
|
if( CreateIfNotThere( xPropSet ) )
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new XMLImageMapContext( GetImport(), p_nPrefix, rLocalName, xPropSet );
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
|
|
|
}
|
2006-06-19 17:45:40 +00:00
|
|
|
else if( (XML_NAMESPACE_OFFICE == p_nPrefix) && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) )
|
2004-07-13 07:36:31 +00:00
|
|
|
{
|
|
|
|
// do we still have the frame object?
|
|
|
|
Reference < XPropertySet > xPropSet;
|
|
|
|
if( CreateIfNotThere( xPropSet ) )
|
|
|
|
{
|
|
|
|
// is it an event supplier?
|
|
|
|
Reference<XEventsSupplier> xEventsSupplier(xPropSet, UNO_QUERY);
|
|
|
|
if (xEventsSupplier.is())
|
|
|
|
{
|
|
|
|
// OK, we have the events, so create the context
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new XMLEventsImportContext(GetImport(), p_nPrefix,
|
2004-07-13 07:36:31 +00:00
|
|
|
rLocalName, xEventsSupplier);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-12-19 16:27:43 +00:00
|
|
|
else if( p_nPrefix == XML_NAMESPACE_SVG && // #i68101#
|
|
|
|
(IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) )
|
|
|
|
{
|
|
|
|
pContext = m_xImplContext->CreateChildContext( p_nPrefix, rLocalName, xAttrList );
|
|
|
|
}
|
2004-07-13 07:36:31 +00:00
|
|
|
else
|
|
|
|
{
|
2006-12-19 16:27:43 +00:00
|
|
|
// the child is a drawing shape
|
2004-07-13 07:36:31 +00:00
|
|
|
pContext = GetImport().GetShapeImport()->CreateFrameChildContext(
|
2006-06-19 17:45:40 +00:00
|
|
|
&m_xImplContext, p_nPrefix, rLocalName, xAttrList );
|
2004-07-13 07:36:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( !pContext )
|
2006-06-19 17:45:40 +00:00
|
|
|
pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName );
|
2004-07-13 07:36:31 +00:00
|
|
|
|
|
|
|
return pContext;
|
|
|
|
}
|
|
|
|
|
|
|
|
void XMLTextFrameContext::SetHyperlink( const OUString& rHRef,
|
|
|
|
const OUString& rName,
|
|
|
|
const OUString& rTargetFrameName,
|
|
|
|
sal_Bool bMap )
|
|
|
|
{
|
|
|
|
OSL_ENSURE( !m_pHyperlink, "recursive SetHyperlink call" );
|
|
|
|
delete m_pHyperlink;
|
|
|
|
m_pHyperlink = new XMLTextFrameContextHyperlink_Impl(
|
|
|
|
rHRef, rName, rTargetFrameName, bMap );
|
|
|
|
}
|
|
|
|
|
|
|
|
TextContentAnchorType XMLTextFrameContext::GetAnchorType() const
|
|
|
|
{
|
|
|
|
SvXMLImportContext *pContext = &m_xImplContext;
|
|
|
|
XMLTextFrameContext_Impl *pImpl = PTR_CAST( XMLTextFrameContext_Impl, pContext );
|
|
|
|
if( pImpl )
|
|
|
|
return pImpl->GetAnchorType();
|
|
|
|
else
|
|
|
|
return m_eDefaultAnchorType;
|
|
|
|
}
|
|
|
|
|
2001-04-25 12:35:19 +00:00
|
|
|
Reference < XTextContent > XMLTextFrameContext::GetTextContent() const
|
|
|
|
{
|
2004-07-13 07:36:31 +00:00
|
|
|
Reference < XTextContent > xTxtCntnt;
|
|
|
|
SvXMLImportContext *pContext = &m_xImplContext;
|
|
|
|
XMLTextFrameContext_Impl *pImpl = PTR_CAST( XMLTextFrameContext_Impl, pContext );
|
|
|
|
if( pImpl )
|
|
|
|
xTxtCntnt.set( pImpl->GetPropSet(), UNO_QUERY );
|
|
|
|
|
|
|
|
return xTxtCntnt;
|
2001-04-25 12:35:19 +00:00
|
|
|
}
|
2004-09-09 09:48:00 +00:00
|
|
|
|
|
|
|
Reference < XShape > XMLTextFrameContext::GetShape() const
|
|
|
|
{
|
|
|
|
Reference < XShape > xShape;
|
|
|
|
SvXMLImportContext* pContext = &m_xImplContext;
|
|
|
|
SvXMLShapeContext* pImpl = PTR_CAST( SvXMLShapeContext, pContext );
|
|
|
|
if ( pImpl )
|
|
|
|
{
|
|
|
|
xShape = pImpl->getShape();
|
|
|
|
}
|
|
|
|
|
|
|
|
return xShape;
|
|
|
|
}
|
2010-10-12 15:53:47 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|