2010-10-14 08:30:41 +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 23:08:29 +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 23:08:29 +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 23:08:29 +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 .
|
|
|
|
*/
|
2010-01-05 16:37:49 +01:00
|
|
|
|
2005-03-15 10:25:26 +00:00
|
|
|
#include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
|
2005-04-04 07:22:36 +00:00
|
|
|
#include <com/sun/star/container/XChild.hpp>
|
2013-01-27 20:52:55 +01:00
|
|
|
#include <com/sun/star/drawing/FillStyle.hpp>
|
2013-01-28 11:56:10 +01:00
|
|
|
#include <com/sun/star/awt/Gradient.hpp>
|
2004-10-04 18:13:38 +00:00
|
|
|
#include <com/sun/star/embed/XClassifiedObject.hpp>
|
|
|
|
#include <com/sun/star/embed/XVisualObject.hpp>
|
|
|
|
#include <com/sun/star/embed/XComponentSupplier.hpp>
|
|
|
|
#include <com/sun/star/embed/EmbedStates.hpp>
|
|
|
|
#include <com/sun/star/embed/Aspects.hpp>
|
2007-07-18 11:57:02 +00:00
|
|
|
#include <com/sun/star/graphic/XGraphicProvider.hpp>
|
2010-01-08 18:32:51 +01:00
|
|
|
#include <svx/svxids.hrc>
|
2013-01-27 20:52:55 +01:00
|
|
|
#include <svx/xfillit0.hxx>
|
2013-01-28 11:56:10 +01:00
|
|
|
#include <svx/xflgrit.hxx>
|
2010-01-08 18:32:51 +01:00
|
|
|
#include <editeng/memberids.hrc>
|
2004-10-04 18:13:38 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <swtypes.hxx>
|
|
|
|
#include <cmdid.h>
|
|
|
|
|
2005-02-25 08:27:49 +00:00
|
|
|
#include <memory>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <hints.hxx>
|
|
|
|
#include <doc.hxx>
|
2010-11-25 14:31:08 +01:00
|
|
|
#include <IDocumentUndoRedo.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <docsh.hxx>
|
2007-01-30 14:22:59 +00:00
|
|
|
#include <editsh.hxx>
|
2006-05-05 07:08:29 +00:00
|
|
|
#include <swcli.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <ndindex.hxx>
|
|
|
|
#include <pam.hxx>
|
|
|
|
#include <ndnotxt.hxx>
|
|
|
|
#include <svx/unomid.hxx>
|
|
|
|
#include <unocrsr.hxx>
|
2009-06-03 11:26:39 +00:00
|
|
|
#include <unocrsrhelper.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <docstyle.hxx>
|
2000-11-27 10:13:17 +00:00
|
|
|
#include <dcontact.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fmtcnct.hxx>
|
|
|
|
#include <ndole.hxx>
|
2006-07-14 07:31:03 +00:00
|
|
|
#include <frmfmt.hxx>
|
|
|
|
#include <frame.hxx>
|
2010-01-05 16:37:46 +01:00
|
|
|
#include <unotextrange.hxx>
|
2010-01-05 16:37:45 +01:00
|
|
|
#include <unotextcursor.hxx>
|
2010-01-05 16:37:44 +01:00
|
|
|
#include <unoparagraph.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <unomap.hxx>
|
|
|
|
#include <unoprnms.hxx>
|
2000-12-19 16:28:58 +00:00
|
|
|
#include <unoevent.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <com/sun/star/util/XModifyBroadcaster.hpp>
|
|
|
|
#include <com/sun/star/table/ShadowFormat.hpp>
|
|
|
|
#include <com/sun/star/style/GraphicLocation.hpp>
|
|
|
|
#include <com/sun/star/text/GraphicCrop.hpp>
|
|
|
|
#include <com/sun/star/text/TextContentAnchorType.hpp>
|
|
|
|
#include <com/sun/star/text/XTextColumns.hpp>
|
2001-03-16 13:39:32 +00:00
|
|
|
#include <com/sun/star/text/WrapTextMode.hpp>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <com/sun/star/beans/PropertyAttribute.hpp>
|
2000-10-24 13:26:57 +00:00
|
|
|
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
|
|
|
|
#include <com/sun/star/drawing/PointSequence.hpp>
|
2000-12-14 08:48:16 +00:00
|
|
|
#include <com/sun/star/drawing/ColorMode.hpp>
|
2004-01-06 17:20:22 +00:00
|
|
|
#include <tools/poly.hxx>
|
2003-04-17 13:43:12 +00:00
|
|
|
#include <swundo.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <unostyle.hxx>
|
2000-11-27 10:13:17 +00:00
|
|
|
#include <svx/svdmodel.hxx>
|
|
|
|
#include <svx/svdpage.hxx>
|
2013-02-12 13:41:53 -05:00
|
|
|
#include <editeng/brushitem.hxx>
|
2010-01-08 18:32:51 +01:00
|
|
|
#include <editeng/protitem.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fmtornt.hxx>
|
|
|
|
#include <fmturl.hxx>
|
2010-01-08 18:32:51 +01:00
|
|
|
#include <editeng/lrspitem.hxx>
|
|
|
|
#include <editeng/ulspitem.hxx>
|
|
|
|
#include <editeng/boxitem.hxx>
|
|
|
|
#include <editeng/opaqitem.hxx>
|
|
|
|
#include <editeng/prntitem.hxx>
|
|
|
|
#include <editeng/shaditem.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <fmtsrnd.hxx>
|
|
|
|
#include <fmtfsize.hxx>
|
|
|
|
#include <grfatr.hxx>
|
|
|
|
#include <unoframe.hxx>
|
|
|
|
#include <fmtanchr.hxx>
|
2000-11-20 11:10:03 +00:00
|
|
|
#include <fmtclds.hxx>
|
2010-01-05 16:37:49 +01:00
|
|
|
#include <fmtcntnt.hxx>
|
2000-12-06 10:36:14 +00:00
|
|
|
#include <frmatr.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <ndtxt.hxx>
|
|
|
|
#include <ndgrf.hxx>
|
2010-10-16 03:22:02 -05:00
|
|
|
#include <osl/mutex.hxx>
|
2000-09-18 23:08:29 +00:00
|
|
|
#include <vcl/svapp.hxx>
|
2003-04-17 13:43:12 +00:00
|
|
|
#include <sfx2/printer.hxx>
|
2001-07-20 09:40:14 +00:00
|
|
|
#include <SwStyleNameMapper.hxx>
|
2013-04-18 22:30:07 -04:00
|
|
|
#include <editeng/xmlcnitm.hxx>
|
2001-10-12 12:57:26 +00:00
|
|
|
#include <poolfmt.hxx>
|
|
|
|
#include <pagedesc.hxx>
|
|
|
|
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
|
2010-01-08 18:32:51 +01:00
|
|
|
#include <editeng/frmdiritem.hxx>
|
2004-02-02 17:26:06 +00:00
|
|
|
#include <fmtfollowtextflow.hxx>
|
2004-08-02 13:18:03 +00:00
|
|
|
#include <fmtwrapinfluenceonobjpos.hxx>
|
2004-10-04 18:13:38 +00:00
|
|
|
#include <toolkit/helper/vclunohelper.hxx>
|
2010-12-17 09:02:23 +01:00
|
|
|
#include <switerator.hxx>
|
2011-06-01 22:40:08 +01:00
|
|
|
#include <comphelper/servicehelper.hxx>
|
2003-03-27 14:45:43 +00:00
|
|
|
|
|
|
|
// from fefly1.cxx
|
2012-10-12 16:49:40 +02:00
|
|
|
extern sal_Bool sw_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
using ::com::sun::star::frame::XModel;
|
|
|
|
using ::com::sun::star::container::XNameAccess;
|
|
|
|
using ::com::sun::star::style::XStyleFamiliesSupplier;
|
2001-10-12 12:57:26 +00:00
|
|
|
|
2010-12-06 10:36:22 +00:00
|
|
|
const sal_Char sPackageProtocol[] = "vnd.sun.star.Package:";
|
|
|
|
const sal_Char sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:";
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
/****************************************************************************
|
|
|
|
Rahmenbeschreibung
|
|
|
|
****************************************************************************/
|
|
|
|
class BaseFrameProperties_Impl
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwUnoCursorHelper::SwAnyMapHelper aAnyMap;
|
2001-06-15 13:27:58 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
public:
|
2007-09-27 08:36:43 +00:00
|
|
|
virtual ~BaseFrameProperties_Impl();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal);
|
2011-03-14 16:51:14 +00:00
|
|
|
bool GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& pAny );
|
2013-01-28 13:34:52 +01:00
|
|
|
bool FillBaseProperties(SwDoc* pDoc, SfxItemSet& rToSet, const SfxItemSet &rFromSet, bool& rSizeFound);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound) = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
};
|
2001-06-15 13:27:58 +00:00
|
|
|
|
|
|
|
BaseFrameProperties_Impl::~BaseFrameProperties_Impl()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void BaseFrameProperties_Impl::SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal)
|
2001-06-15 13:27:58 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
aAnyMap.SetValue( nWID, nMemberId, rVal );
|
2001-06-15 13:27:58 +00:00
|
|
|
}
|
|
|
|
|
2011-03-14 16:51:14 +00:00
|
|
|
bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& rpAny)
|
2001-10-12 12:57:26 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
return aAnyMap.FillValue( nWID, nMemberId, rpAny );
|
2001-10-12 12:57:26 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2013-01-28 13:34:52 +01:00
|
|
|
bool BaseFrameProperties_Impl::FillBaseProperties(SwDoc* pDoc, SfxItemSet& rToSet, const SfxItemSet& rFromSet, bool& rSizeFound)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bRet = true;
|
2000-09-18 23:08:29 +00:00
|
|
|
//Anker kommt auf jeden Fall in den Set
|
2001-10-23 16:40:05 +00:00
|
|
|
SwFmtAnchor aAnchor ( static_cast < const SwFmtAnchor & > ( rFromSet.Get ( RES_ANCHOR ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pAnchorPgNo;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_ANCHOR, MID_ANCHOR_PAGENUM, pAnchorPgNo))
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aAnchor).PutValue(*pAnchorPgNo, MID_ANCHOR_PAGENUM);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pAnchorType;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_ANCHOR, MID_ANCHOR_ANCHORTYPE, pAnchorType))
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aAnchor).PutValue(*pAnchorType, MID_ANCHOR_ANCHORTYPE);
|
|
|
|
}
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aAnchor);
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pCol = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_BACK_COLOR, pCol );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pRGBCol = 0;
|
2002-08-16 12:11:48 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_BACK_COLOR_R_G_B, pRGBCol );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pColTrans = 0;
|
2002-08-16 12:11:48 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_BACK_COLOR_TRANSPARENCY, pColTrans);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pTrans = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_GRAPHIC_TRANSPARENT, pTrans );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGrLoc = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_GRAPHIC_POSITION, pGrLoc );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGrURL = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_GRAPHIC_URL, pGrURL );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGrFilter = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_GRAPHIC_FILTER, pGrFilter );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGrTranparency = 0;
|
2002-08-16 12:11:48 +00:00
|
|
|
GetProperty(RES_BACKGROUND, MID_GRAPHIC_TRANSPARENCY, pGrTranparency );
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2002-08-16 12:11:48 +00:00
|
|
|
if(pCol || pTrans || pGrURL || pGrFilter || pGrLoc ||
|
2013-01-28 11:56:10 +01:00
|
|
|
pGrTranparency || pColTrans || pRGBCol)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxBrushItem aBrush ( static_cast < const :: SvxBrushItem & > ( rFromSet.Get ( RES_BACKGROUND ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pCol )
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pCol,MID_BACK_COLOR );
|
2002-08-16 12:11:48 +00:00
|
|
|
if(pColTrans)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
|
|
|
|
if(pRGBCol)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pRGBCol, MID_BACK_COLOR_R_G_B);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pTrans)
|
2002-08-16 12:11:48 +00:00
|
|
|
{
|
|
|
|
// don't overwrite transparency with a non-transparence flag
|
|
|
|
if(!pColTrans || Any2Bool( *pTrans ))
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pTrans, MID_GRAPHIC_TRANSPARENT);
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pGrURL)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pGrURL, MID_GRAPHIC_URL);
|
|
|
|
if(pGrFilter)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pGrFilter, MID_GRAPHIC_FILTER);
|
|
|
|
if(pGrLoc)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pGrLoc, MID_GRAPHIC_POSITION);
|
2002-08-16 12:11:48 +00:00
|
|
|
if(pGrTranparency)
|
|
|
|
bRet &= ((SfxPoolItem&)aBrush).PutValue(*pGrTranparency, MID_GRAPHIC_TRANSPARENCY);
|
|
|
|
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aBrush);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2013-01-27 20:52:55 +01:00
|
|
|
{
|
|
|
|
const ::uno::Any* pFillStyle = 0;
|
|
|
|
GetProperty(RES_FILL_STYLE, 0, pFillStyle);
|
|
|
|
if (pFillStyle)
|
|
|
|
{
|
|
|
|
XFillStyleItem aFillStyle( static_cast <const :: XFillStyleItem & > ( rFromSet.Get ( RES_FILL_STYLE ) ) );
|
|
|
|
bRet &= ((SfxPoolItem&)aFillStyle).PutValue(*pFillStyle);
|
|
|
|
rToSet.Put(aFillStyle);
|
|
|
|
}
|
|
|
|
}
|
2013-01-28 11:56:10 +01:00
|
|
|
{
|
|
|
|
const ::uno::Any* pFillGradient = 0;
|
|
|
|
GetProperty(RES_FILL_GRADIENT, MID_FILLGRADIENT, pFillGradient);
|
2013-01-28 13:34:52 +01:00
|
|
|
const ::uno::Any* pName = 0;
|
|
|
|
GetProperty(RES_FILL_GRADIENT, MID_NAME, pName);
|
|
|
|
if (pFillGradient || pName)
|
2013-01-28 11:56:10 +01:00
|
|
|
{
|
|
|
|
XFillGradientItem aFillGradient( static_cast <const :: XFillGradientItem & > ( rFromSet.Get ( RES_FILL_GRADIENT ) ) );
|
2013-01-28 13:34:52 +01:00
|
|
|
XFillGradientItem* pItem = &aFillGradient;
|
|
|
|
if (pFillGradient)
|
2013-01-29 11:44:14 +01:00
|
|
|
{
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet &= ((SfxPoolItem*)pItem)->PutValue(*pFillGradient, MID_FILLGRADIENT);
|
2013-01-29 11:44:14 +01:00
|
|
|
// If gradient is set directly, we always generate an associated style name for it.
|
|
|
|
SdrModel* pModel = pDoc->GetDrawModel();
|
|
|
|
pItem = pItem->checkForUniqueItem( pModel );
|
|
|
|
}
|
2013-01-28 13:34:52 +01:00
|
|
|
if (pName)
|
2013-01-29 11:44:14 +01:00
|
|
|
{
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet &= ((SfxPoolItem*)pItem)->PutValue(*pName, MID_NAME);
|
2013-01-29 11:44:14 +01:00
|
|
|
// Look up the associated style name.
|
|
|
|
SfxItemPool& rPool = pDoc->GetDrawModel()->GetItemPool();
|
|
|
|
const sal_uInt32 nCount = rPool.GetItemCount2(XATTR_FILLGRADIENT);
|
|
|
|
const XFillGradientItem* pStyleItem;
|
|
|
|
for (sal_uInt32 i = 0; i < nCount; ++i)
|
|
|
|
{
|
|
|
|
pStyleItem = (XFillGradientItem*)rPool.GetItem2(XATTR_FILLGRADIENT, i);
|
|
|
|
if (pStyleItem && pStyleItem->GetName() == pItem->GetName())
|
|
|
|
{
|
|
|
|
pItem->SetGradientValue(pStyleItem->GetGradientValue());
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-01-28 13:34:52 +01:00
|
|
|
if (pItem)
|
|
|
|
{
|
|
|
|
rToSet.Put(*pItem);
|
|
|
|
if(pItem != &aFillGradient)
|
2013-02-06 12:09:48 +01:00
|
|
|
{
|
|
|
|
// New name was generated? Then insert it to the drawinglayer style table.
|
|
|
|
uno::Reference<frame::XModel> xModel(pDoc->GetDocShell()->GetModel());
|
|
|
|
uno::Reference<lang::XMultiServiceFactory> xServiceFact(xModel, uno::UNO_QUERY);
|
|
|
|
uno::Reference< container::XNameContainer > xGradients(xServiceFact->createInstance("com.sun.star.drawing.GradientTable"), uno::UNO_QUERY);
|
2013-05-31 12:34:35 +02:00
|
|
|
if (!xGradients->hasByName(pItem->GetName()))
|
|
|
|
{
|
|
|
|
xGradients->insertByName(pItem->GetName(), *pFillGradient);
|
|
|
|
}
|
2013-02-06 12:09:48 +01:00
|
|
|
|
2013-01-28 13:34:52 +01:00
|
|
|
delete pItem;
|
2013-02-06 12:09:48 +01:00
|
|
|
}
|
2013-01-28 13:34:52 +01:00
|
|
|
}
|
2013-01-28 11:56:10 +01:00
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pCont = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_PROTECT, MID_PROTECT_CONTENT, pCont );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pPos = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_PROTECT,MID_PROTECT_POSITION, pPos );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pName = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_PROTECT, MID_PROTECT_SIZE, pName );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pCont||pPos||pName)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxProtectItem aProt ( static_cast < const :: SvxProtectItem & > ( rFromSet.Get ( RES_PROTECT ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pCont)
|
|
|
|
bRet &= ((SfxPoolItem&)aProt).PutValue(*pCont, MID_PROTECT_CONTENT);
|
|
|
|
if(pPos )
|
|
|
|
bRet &= ((SfxPoolItem&)aProt).PutValue(*pPos, MID_PROTECT_POSITION);
|
|
|
|
if(pName)
|
|
|
|
bRet &= ((SfxPoolItem&)aProt).PutValue(*pName, MID_PROTECT_SIZE);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aProt);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHori = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_ORIENT, pHori );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHoriP = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_POSITION|CONVERT_TWIPS, pHoriP );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHoriR = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_RELATION, pHoriR );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pPageT = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_HORI_ORIENT, MID_HORIORIENT_PAGETOGGLE, pPageT);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pHori||pHoriP||pHoriR||pPageT)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtHoriOrient aOrient ( static_cast < const :: SwFmtHoriOrient & > ( rFromSet.Get ( RES_HORI_ORIENT ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pHori )
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pHori, MID_HORIORIENT_ORIENT);
|
|
|
|
if(pHoriP)
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pHoriP, MID_HORIORIENT_POSITION|CONVERT_TWIPS);
|
|
|
|
if(pHoriR)
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pHoriR, MID_HORIORIENT_RELATION);
|
|
|
|
if(pPageT)
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pPageT, MID_HORIORIENT_PAGETOGGLE);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aOrient);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pVert = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_VERT_ORIENT, MID_VERTORIENT_ORIENT, pVert);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pVertP = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_VERT_ORIENT, MID_VERTORIENT_POSITION|CONVERT_TWIPS, pVertP );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pVertR = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_VERT_ORIENT, MID_VERTORIENT_RELATION, pVertR );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pVert||pVertP||pVertR)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtVertOrient aOrient ( static_cast < const :: SwFmtVertOrient & > ( rFromSet.Get ( RES_VERT_ORIENT ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pVert )
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pVert, MID_VERTORIENT_ORIENT);
|
|
|
|
if(pVertP)
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pVertP, MID_VERTORIENT_POSITION|CONVERT_TWIPS);
|
|
|
|
if(pVertR)
|
|
|
|
bRet &= ((SfxPoolItem&)aOrient).PutValue(*pVertR, MID_VERTORIENT_RELATION);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aOrient);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pURL = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_URL, MID_URL_URL, pURL );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pTarget = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_URL, MID_URL_TARGET, pTarget );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHyLNm = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_URL, MID_URL_HYPERLINKNAME, pHyLNm );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHySMp = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_URL, MID_URL_SERVERMAP, pHySMp );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pURL||pTarget||pHyLNm||pHySMp)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtURL aURL ( static_cast < const :: SwFmtURL & > ( rFromSet.Get ( RES_URL ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pURL)
|
|
|
|
bRet &= ((SfxPoolItem&)aURL).PutValue(*pURL, MID_URL_URL);
|
|
|
|
if(pTarget)
|
|
|
|
bRet &= ((SfxPoolItem&)aURL).PutValue(*pTarget, MID_URL_TARGET);
|
|
|
|
if(pHyLNm)
|
|
|
|
bRet &= ((SfxPoolItem&)aURL).PutValue(*pHyLNm, MID_URL_HYPERLINKNAME );
|
|
|
|
if(pHySMp)
|
|
|
|
bRet &= ((SfxPoolItem&)aURL).PutValue(*pHySMp, MID_URL_SERVERMAP);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aURL);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pL = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_LR_SPACE, MID_L_MARGIN|CONVERT_TWIPS, pL );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pR = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_LR_SPACE, MID_R_MARGIN|CONVERT_TWIPS, pR );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pL||pR)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxLRSpaceItem aLR ( static_cast < const :: SvxLRSpaceItem & > ( rFromSet.Get ( RES_LR_SPACE ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pL)
|
|
|
|
bRet &= ((SfxPoolItem&)aLR).PutValue(*pL, MID_L_MARGIN|CONVERT_TWIPS);
|
|
|
|
if(pR)
|
|
|
|
bRet &= ((SfxPoolItem&)aLR).PutValue(*pR, MID_R_MARGIN|CONVERT_TWIPS);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aLR);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pT = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_UL_SPACE, MID_UP_MARGIN|CONVERT_TWIPS, pT );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pB = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_UL_SPACE, MID_LO_MARGIN|CONVERT_TWIPS, pB );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pT||pB)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxULSpaceItem aTB ( static_cast < const :: SvxULSpaceItem &> ( rFromSet.Get ( RES_UL_SPACE ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pT)
|
|
|
|
bRet &= ((SfxPoolItem&)aTB).PutValue(*pT, MID_UP_MARGIN|CONVERT_TWIPS);
|
|
|
|
if(pB)
|
|
|
|
bRet &= ((SfxPoolItem&)aTB).PutValue(*pB, MID_LO_MARGIN|CONVERT_TWIPS);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aTB);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pOp;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_OPAQUE, 0, pOp))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxOpaqueItem aOp ( static_cast < const :: SvxOpaqueItem& > ( rFromSet.Get ( RES_OPAQUE ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aOp).PutValue(*pOp, 0);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aOp);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pPrt;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_PRINT, 0, pPrt))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxPrintItem aPrt ( static_cast < const :: SvxPrintItem & > ( rFromSet.Get ( RES_PRINT ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aPrt).PutValue(*pPrt, 0);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aPrt);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSh;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_SHADOW, CONVERT_TWIPS, pSh))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxShadowItem aSh ( static_cast < const :: SvxShadowItem& > ( rFromSet.Get ( RES_SHADOW ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aSh).PutValue(*pSh, CONVERT_TWIPS);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aSh);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2013-08-24 11:11:44 +02:00
|
|
|
const ::uno::Any* pShTr;
|
|
|
|
if(GetProperty(RES_SHADOW, MID_SHADOW_TRANSPARENCE, pShTr) && rToSet.HasItem(RES_SHADOW))
|
|
|
|
{
|
|
|
|
SvxShadowItem aSh(static_cast<const SvxShadowItem&>(rToSet.Get(RES_SHADOW)));
|
|
|
|
bRet &= aSh.PutValue(*pShTr, MID_SHADOW_TRANSPARENCE);
|
|
|
|
rToSet.Put(aSh);
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSur = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_SURROUND, MID_SURROUND_SURROUNDTYPE, pSur);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSurAnch = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_SURROUND, MID_SURROUND_ANCHORONLY, pSurAnch);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pSur || pSurAnch)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtSurround aSrnd ( static_cast < const :: SwFmtSurround & > ( rFromSet.Get ( RES_SURROUND ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pSur)
|
|
|
|
bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSur, MID_SURROUND_SURROUNDTYPE );
|
|
|
|
if(pSurAnch)
|
|
|
|
bRet &= ((SfxPoolItem&)aSrnd).PutValue(*pSurAnch, MID_SURROUND_ANCHORONLY);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aSrnd);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pLeft = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, LEFT_BORDER |CONVERT_TWIPS, pLeft );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pRight = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|RIGHT_BORDER , pRight );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pTop = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|TOP_BORDER , pTop );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pBottom = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|BOTTOM_BORDER, pBottom);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pDistance = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|BORDER_DISTANCE, pDistance);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pLeftDistance = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|LEFT_BORDER_DISTANCE, pLeftDistance);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pRightDistance = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|RIGHT_BORDER_DISTANCE, pRightDistance);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pTopDistance = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|TOP_BORDER_DISTANCE, pTopDistance);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pBottomDistance = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_BOX, CONVERT_TWIPS|BOTTOM_BORDER_DISTANCE, pBottomDistance);
|
2012-02-23 13:52:17 +01:00
|
|
|
const ::uno::Any* pLineStyle = 0;
|
|
|
|
GetProperty(RES_BOX, LINE_STYLE, pLineStyle);
|
|
|
|
const ::uno::Any* pLineWidth = 0;
|
|
|
|
GetProperty(RES_BOX, LINE_WIDTH, pLineWidth);
|
2000-12-08 07:32:02 +00:00
|
|
|
if( pLeft || pRight || pTop || pBottom || pDistance ||
|
2012-02-23 13:52:17 +01:00
|
|
|
pLeftDistance || pRightDistance || pTopDistance || pBottomDistance ||
|
|
|
|
pLineStyle || pLineWidth )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SvxBoxItem aBox ( static_cast < const :: SvxBoxItem & > ( rFromSet.Get ( RES_BOX ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if( pLeft )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLeft, CONVERT_TWIPS|LEFT_BORDER );
|
|
|
|
if( pRight )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pRight, CONVERT_TWIPS|RIGHT_BORDER );
|
|
|
|
if( pTop )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pTop, CONVERT_TWIPS|TOP_BORDER);
|
|
|
|
if( pBottom )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pBottom, CONVERT_TWIPS|BOTTOM_BORDER);
|
|
|
|
if( pDistance )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pDistance, CONVERT_TWIPS|BORDER_DISTANCE);
|
2000-12-08 07:32:02 +00:00
|
|
|
if( pLeftDistance )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLeftDistance, CONVERT_TWIPS|LEFT_BORDER_DISTANCE);
|
|
|
|
if( pRightDistance )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pRightDistance, CONVERT_TWIPS|RIGHT_BORDER_DISTANCE);
|
|
|
|
if( pTopDistance )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pTopDistance, CONVERT_TWIPS|TOP_BORDER_DISTANCE);
|
|
|
|
if( pBottomDistance )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pBottomDistance, CONVERT_TWIPS|BOTTOM_BORDER_DISTANCE);
|
2012-02-23 13:52:17 +01:00
|
|
|
if( pLineStyle )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLineStyle, LINE_STYLE);
|
|
|
|
if( pLineWidth )
|
|
|
|
bRet &= ((SfxPoolItem&)aBox).PutValue(*pLineWidth, LINE_WIDTH|CONVERT_TWIPS);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aBox);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pRelH = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_REL_HEIGHT, pRelH);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pRelW = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH, pRelW);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSyncWidth = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT, pSyncWidth);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSyncHeight = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH, pSyncHeight);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pWidth = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_WIDTH|CONVERT_TWIPS, pWidth);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHeight = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS, pHeight);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSize = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_SIZE|CONVERT_TWIPS, pSize);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSizeType = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_SIZE_TYPE, pSizeType);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pWidthType = 0;
|
2004-05-18 13:53:29 +00:00
|
|
|
GetProperty(RES_FRM_SIZE, MID_FRMSIZE_WIDTH_TYPE, pWidthType);
|
2001-03-06 14:47:13 +00:00
|
|
|
if( pWidth || pHeight ||pRelH || pRelW || pSize ||pSizeType ||
|
2004-05-18 13:53:29 +00:00
|
|
|
pWidthType ||pSyncWidth || pSyncHeight )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
rSizeFound = true;
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtFrmSize aFrmSz ( static_cast < const :: SwFmtFrmSize& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pWidth)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH|CONVERT_TWIPS);
|
|
|
|
if(pHeight)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pHeight, MID_FRMSIZE_HEIGHT|CONVERT_TWIPS);
|
|
|
|
if(pRelH )
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pRelH, MID_FRMSIZE_REL_HEIGHT);
|
|
|
|
if(pRelW )
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pRelW, MID_FRMSIZE_REL_WIDTH);
|
2001-01-15 10:28:36 +00:00
|
|
|
if(pSyncWidth)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pSyncWidth, MID_FRMSIZE_IS_SYNC_WIDTH_TO_HEIGHT);
|
|
|
|
if(pSyncHeight)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pSyncHeight, MID_FRMSIZE_IS_SYNC_HEIGHT_TO_WIDTH);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pSize)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pSize, MID_FRMSIZE_SIZE|CONVERT_TWIPS);
|
|
|
|
if(pSizeType)
|
2001-06-15 13:27:58 +00:00
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pSizeType, MID_FRMSIZE_SIZE_TYPE);
|
2004-05-18 13:53:29 +00:00
|
|
|
if(pWidthType)
|
|
|
|
bRet &= ((SfxPoolItem&)aFrmSz).PutValue(*pWidthType, MID_FRMSIZE_WIDTH_TYPE);
|
2000-12-11 07:15:23 +00:00
|
|
|
if(!aFrmSz.GetWidth())
|
|
|
|
aFrmSz.SetWidth(MINFLY);
|
|
|
|
if(!aFrmSz.GetHeight())
|
|
|
|
aFrmSz.SetHeight(MINFLY);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aFrmSz);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
rSizeFound = false;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFmtFrmSize aFrmSz;
|
|
|
|
awt::Size aSize;
|
2001-05-28 12:29:57 +00:00
|
|
|
aSize.Width = 2 * MM50;
|
|
|
|
aSize.Height = 2 * MM50;
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any aSizeVal;
|
2000-09-18 23:08:29 +00:00
|
|
|
aSizeVal <<= aSize;
|
|
|
|
((SfxPoolItem&)aFrmSz).PutValue(aSizeVal, MID_FRMSIZE_SIZE|CONVERT_TWIPS);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aFrmSz);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pFrameDirection = 0;
|
2002-02-04 17:08:18 +00:00
|
|
|
GetProperty(RES_FRAMEDIR, 0, pFrameDirection);
|
|
|
|
if(pFrameDirection)
|
|
|
|
{
|
|
|
|
SvxFrameDirectionItem aAttr(FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR);
|
|
|
|
aAttr.PutValue(*pFrameDirection, 0);
|
|
|
|
rToSet.Put(aAttr);
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pUnknown = 0;
|
2001-07-09 04:50:21 +00:00
|
|
|
GetProperty(RES_UNKNOWNATR_CONTAINER, 0, pUnknown);
|
|
|
|
if(pUnknown)
|
|
|
|
{
|
|
|
|
SvXMLAttrContainerItem aAttr(RES_UNKNOWNATR_CONTAINER);
|
|
|
|
aAttr.PutValue(*pUnknown, 0);
|
2001-10-23 16:40:05 +00:00
|
|
|
rToSet.Put(aAttr);
|
2001-07-09 04:50:21 +00:00
|
|
|
}
|
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
// #i18732#
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pFollowTextFlow = 0;
|
2004-02-02 17:26:06 +00:00
|
|
|
GetProperty(RES_FOLLOW_TEXT_FLOW, 0, pFollowTextFlow);
|
|
|
|
if ( pFollowTextFlow )
|
|
|
|
{
|
|
|
|
SwFmtFollowTextFlow aFmtFollowTextFlow;
|
|
|
|
aFmtFollowTextFlow.PutValue(*pFollowTextFlow, 0);
|
|
|
|
rToSet.Put(aFmtFollowTextFlow);
|
|
|
|
}
|
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
// #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pWrapInfluenceOnObjPos = 0;
|
2004-08-02 13:18:03 +00:00
|
|
|
GetProperty(RES_WRAP_INFLUENCE_ON_OBJPOS, MID_WRAP_INFLUENCE, pWrapInfluenceOnObjPos);
|
|
|
|
if ( pWrapInfluenceOnObjPos )
|
|
|
|
{
|
|
|
|
SwFmtWrapInfluenceOnObjPos aFmtWrapInfluenceOnObjPos;
|
|
|
|
aFmtWrapInfluenceOnObjPos.PutValue( *pWrapInfluenceOnObjPos, MID_WRAP_INFLUENCE );
|
|
|
|
rToSet.Put(aFmtWrapInfluenceOnObjPos);
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
return bRet;
|
|
|
|
}
|
2001-06-15 13:27:58 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
class SwFrameProperties_Impl : public BaseFrameProperties_Impl
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
SwFrameProperties_Impl();
|
2007-07-18 11:57:02 +00:00
|
|
|
virtual ~SwFrameProperties_Impl(){}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound);
|
2000-09-18 23:08:29 +00:00
|
|
|
};
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2001-10-23 16:40:05 +00:00
|
|
|
SwFrameProperties_Impl::SwFrameProperties_Impl():
|
2009-06-03 11:26:39 +00:00
|
|
|
BaseFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_FRAME)*/ )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static inline void lcl_FillCol ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const :: uno::Any *pAny)
|
2001-11-07 13:06:27 +00:00
|
|
|
{
|
|
|
|
if ( pAny )
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtCol aCol ( static_cast < const :: SwFmtCol & > ( rFromSet.Get ( RES_COL ) ) );
|
2001-11-07 13:06:27 +00:00
|
|
|
((SfxPoolItem&)aCol).PutValue( *pAny, MID_COLUMNS);
|
|
|
|
rToSet.Put(aCol);
|
|
|
|
}
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItemSet&, bool& rSizeFound)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
//Properties fuer alle Frames
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any *pStyleName;
|
2001-10-23 16:40:05 +00:00
|
|
|
SwDocStyleSheet* pStyle = NULL;
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bRet;
|
2001-10-23 16:40:05 +00:00
|
|
|
|
|
|
|
if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
|
|
|
|
{
|
|
|
|
OUString sStyle;
|
|
|
|
*pStyleName >>= sStyle;
|
|
|
|
pStyle = (SwDocStyleSheet*)pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle,
|
|
|
|
SFX_STYLE_FAMILY_FRAME);
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pColumns = NULL;
|
2001-11-07 13:06:27 +00:00
|
|
|
GetProperty (RES_COL, MID_COLUMNS, pColumns);
|
2001-10-23 16:40:05 +00:00
|
|
|
if ( pStyle )
|
2001-10-31 15:53:40 +00:00
|
|
|
{
|
2008-03-12 11:29:14 +00:00
|
|
|
rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet( *pStyle ) );
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet = FillBaseProperties( pDoc, rSet, *pItemSet, rSizeFound );
|
2001-11-07 13:06:27 +00:00
|
|
|
lcl_FillCol ( rSet, *pItemSet, pColumns );
|
2001-10-31 15:53:40 +00:00
|
|
|
}
|
2001-10-23 16:40:05 +00:00
|
|
|
else
|
2001-11-07 13:06:27 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxItemSet *pItemSet = &pDoc->GetFrmFmtFromPool( RES_POOLFRM_FRAME )->GetAttrSet();
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet = FillBaseProperties( pDoc, rSet, *pItemSet, rSizeFound );
|
2001-11-07 13:06:27 +00:00
|
|
|
lcl_FillCol ( rSet, *pItemSet, pColumns );
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pEdit;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(GetProperty(RES_EDIT_IN_READONLY, 0, pEdit))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SfxBoolItem aBool(RES_EDIT_IN_READONLY);
|
|
|
|
((SfxPoolItem&)aBool).PutValue(*pEdit, 0);
|
|
|
|
rSet.Put(aBool);
|
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/****************************************************************************
|
|
|
|
Grafik-Descriptor
|
|
|
|
****************************************************************************/
|
|
|
|
class SwGraphicProperties_Impl : public BaseFrameProperties_Impl
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
SwGraphicProperties_Impl();
|
2007-07-18 11:57:02 +00:00
|
|
|
virtual ~SwGraphicProperties_Impl(){}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound);
|
2000-09-18 23:08:29 +00:00
|
|
|
};
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2001-10-23 16:40:05 +00:00
|
|
|
SwGraphicProperties_Impl::SwGraphicProperties_Impl( ) :
|
2009-06-03 11:26:39 +00:00
|
|
|
BaseFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_TEXT_GRAPHIC)*/ )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2000-12-14 08:48:16 +00:00
|
|
|
}
|
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static inline void lcl_FillMirror ( SfxItemSet &rToSet, const :: SfxItemSet &rFromSet, const ::uno::Any *pHEvenMirror, const ::uno::Any *pHOddMirror, const ::uno::Any *pVMirror, bool &rRet )
|
2001-11-07 13:06:27 +00:00
|
|
|
{
|
|
|
|
if(pHEvenMirror || pHOddMirror || pVMirror )
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwMirrorGrf aMirror ( static_cast < const :: SwMirrorGrf& > ( rFromSet.Get ( RES_GRFATR_MIRRORGRF ) ) );
|
2001-11-07 13:06:27 +00:00
|
|
|
if(pHEvenMirror)
|
|
|
|
rRet &= ((SfxPoolItem&)aMirror).PutValue(*pHEvenMirror, MID_MIRROR_HORZ_EVEN_PAGES);
|
|
|
|
if(pHOddMirror)
|
|
|
|
rRet &= ((SfxPoolItem&)aMirror).PutValue(*pHOddMirror, MID_MIRROR_HORZ_ODD_PAGES);
|
|
|
|
if(pVMirror)
|
|
|
|
rRet &= ((SfxPoolItem&)aMirror).PutValue(*pVMirror, MID_MIRROR_VERT);
|
|
|
|
rToSet.Put(aMirror);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
bool SwGraphicProperties_Impl::AnyToItemSet(
|
2001-10-23 16:40:05 +00:00
|
|
|
SwDoc* pDoc,
|
2000-09-18 23:08:29 +00:00
|
|
|
SfxItemSet& rFrmSet,
|
2001-05-28 12:29:57 +00:00
|
|
|
SfxItemSet& rGrSet,
|
2011-01-03 20:35:28 +00:00
|
|
|
bool& rSizeFound)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
//Properties fuer alle Frames
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bRet;
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any *pStyleName;
|
2001-10-23 16:40:05 +00:00
|
|
|
SwDocStyleSheet* pStyle = NULL;
|
|
|
|
|
|
|
|
if ( GetProperty ( FN_UNO_FRAME_STYLE_NAME, 0, pStyleName ) )
|
|
|
|
{
|
|
|
|
OUString sStyle;
|
|
|
|
*pStyleName >>= sStyle;
|
|
|
|
pStyle = (SwDocStyleSheet*)pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle,
|
|
|
|
SFX_STYLE_FAMILY_FRAME);
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pHEvenMirror = 0;
|
|
|
|
const ::uno::Any* pHOddMirror = 0;
|
|
|
|
const ::uno::Any* pVMirror = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_HORZ_EVEN_PAGES, pHEvenMirror);
|
|
|
|
GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_HORZ_ODD_PAGES, pHOddMirror);
|
|
|
|
GetProperty(RES_GRFATR_MIRRORGRF, MID_MIRROR_VERT, pVMirror);
|
2001-11-07 13:06:27 +00:00
|
|
|
|
|
|
|
if ( pStyle )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2008-03-12 11:29:14 +00:00
|
|
|
rtl::Reference< SwDocStyleSheet > xStyle( new SwDocStyleSheet(*pStyle) );
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxItemSet *pItemSet = &xStyle->GetItemSet();
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet = FillBaseProperties(pDoc, rFrmSet, *pItemSet, rSizeFound);
|
2001-11-07 13:06:27 +00:00
|
|
|
lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2001-11-07 13:06:27 +00:00
|
|
|
else
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxItemSet *pItemSet = &pDoc->GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC )->GetAttrSet();
|
2013-01-28 13:34:52 +01:00
|
|
|
bRet = FillBaseProperties(pDoc, rFrmSet, *pItemSet, rSizeFound);
|
2001-11-07 13:06:27 +00:00
|
|
|
lcl_FillMirror ( rGrSet, *pItemSet, pHEvenMirror, pHOddMirror, pVMirror, bRet );
|
|
|
|
}
|
|
|
|
|
2000-12-14 08:48:16 +00:00
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
static const :: sal_uInt16 nIDs[] =
|
2000-12-14 08:48:16 +00:00
|
|
|
{
|
|
|
|
RES_GRFATR_CROPGRF,
|
|
|
|
RES_GRFATR_ROTATION,
|
|
|
|
RES_GRFATR_LUMINANCE,
|
|
|
|
RES_GRFATR_CONTRAST,
|
|
|
|
RES_GRFATR_CHANNELR,
|
|
|
|
RES_GRFATR_CHANNELG,
|
|
|
|
RES_GRFATR_CHANNELB,
|
|
|
|
RES_GRFATR_GAMMA,
|
|
|
|
RES_GRFATR_INVERT,
|
|
|
|
RES_GRFATR_TRANSPARENCY,
|
|
|
|
RES_GRFATR_DRAWMODE,
|
|
|
|
0
|
|
|
|
};
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pAny;
|
2000-12-14 08:48:16 +00:00
|
|
|
for(sal_Int16 nIndex = 0; nIDs[nIndex]; nIndex++)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt8 nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? CONVERT_TWIPS : 0;
|
2001-06-26 08:56:03 +00:00
|
|
|
if(GetProperty(nIDs[nIndex], nMId, pAny ))
|
2000-12-14 08:48:16 +00:00
|
|
|
{
|
|
|
|
SfxPoolItem* pItem = ::GetDfltAttr( nIDs[nIndex] )->Clone();
|
2001-06-26 08:56:03 +00:00
|
|
|
bRet &= pItem->PutValue(*pAny, nMId );
|
2000-12-14 08:48:16 +00:00
|
|
|
rGrSet.Put(*pItem);
|
|
|
|
delete pItem;
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-12-14 08:48:16 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
return bRet;
|
|
|
|
}
|
2003-04-17 13:43:12 +00:00
|
|
|
|
|
|
|
class SwOLEProperties_Impl : public SwFrameProperties_Impl
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
SwOLEProperties_Impl() :
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT)*/ ){}
|
2007-07-18 11:57:02 +00:00
|
|
|
virtual ~SwOLEProperties_Impl(){}
|
2003-04-17 13:43:12 +00:00
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound);
|
2003-04-17 13:43:12 +00:00
|
|
|
};
|
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
bool SwOLEProperties_Impl::AnyToItemSet(
|
|
|
|
SwDoc* pDoc, SfxItemSet& rFrmSet, SfxItemSet& rSet, bool& rSizeFound)
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pTemp;
|
2011-11-15 13:47:36 +01:00
|
|
|
if(!GetProperty(FN_UNO_CLSID, 0, pTemp) && !GetProperty(FN_UNO_STREAM_NAME, 0, pTemp)
|
|
|
|
&& !GetProperty(FN_EMBEDDED_OBJECT, 0, pTemp) )
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_False;
|
2003-04-17 13:43:12 +00:00
|
|
|
SwFrameProperties_Impl::AnyToItemSet( pDoc, rFrmSet, rSet, rSizeFound);
|
|
|
|
//
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_True;
|
2003-04-17 13:43:12 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2013-02-02 22:56:20 +01:00
|
|
|
|
|
|
|
class SwXFrame::Impl
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
::osl::Mutex m_Mutex; // just for OInterfaceContainerHelper
|
|
|
|
|
|
|
|
public:
|
|
|
|
::cppu::OInterfaceContainerHelper m_EventListeners;
|
|
|
|
|
|
|
|
Impl() : m_EventListeners(m_Mutex) { }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-06-01 22:40:08 +01:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
class theSwXFrameUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSwXFrameUnoTunnelId > {};
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: uno::Sequence< sal_Int8 > & SwXFrame::getUnoTunnelId()
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-06-01 22:40:08 +01:00
|
|
|
return theSwXFrameUnoTunnelId::get().getSeq();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
sal_Int64 SAL_CALL SwXFrame::getSomething( const :: uno::Sequence< sal_Int8 >& rId )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if( rId.getLength() == 16
|
2012-07-28 17:56:59 +02:00
|
|
|
&& 0 == memcmp( getUnoTunnelId().getConstArray(),
|
2000-09-18 23:08:29 +00:00
|
|
|
rId.getConstArray(), 16 ) )
|
|
|
|
{
|
2007-09-27 08:36:43 +00:00
|
|
|
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >(this) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
TYPEINIT1(SwXFrame, SwClient);
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
return OUString("SwXFrame");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-11-05 11:32:52 +02:00
|
|
|
return rServiceName.equalsAscii("com.sun.star.text.BaseFrame") ||
|
|
|
|
rServiceName.equalsAscii("com.sun.star.text.TextContent") ||
|
|
|
|
rServiceName.equalsAscii("com.sun.star.document.LinkTarget");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< OUString > aRet(3);
|
2013-11-05 11:32:52 +02:00
|
|
|
aRet[0] = "com.sun.star.text.BaseFrame";
|
|
|
|
aRet[1] = "com.sun.star.text.TextContent";
|
|
|
|
aRet[2] = "com.sun.star.document.LinkTarget";
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
2013-02-02 22:56:20 +01:00
|
|
|
SwXFrame::SwXFrame(FlyCntType eSet, const :: SfxItemPropertySet* pSet, SwDoc *pDoc)
|
|
|
|
: m_pImpl(new Impl)
|
|
|
|
,
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet(pSet),
|
|
|
|
m_pDoc ( pDoc ),
|
2007-09-27 08:36:43 +00:00
|
|
|
eType(eSet),
|
2011-01-03 20:35:28 +00:00
|
|
|
bIsDescriptor(true),
|
2007-07-18 11:57:02 +00:00
|
|
|
m_pCopySource( 0 )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-10-12 12:57:26 +00:00
|
|
|
// Register ourselves as a listener to the document (via the page descriptor)
|
|
|
|
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
|
|
|
|
// get the property set for the default style data
|
|
|
|
// First get the model
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference < XModel > xModel = pDoc->GetDocShell()->GetBaseModel();
|
2001-10-12 12:57:26 +00:00
|
|
|
// Ask the model for it's family supplier interface
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference < XStyleFamiliesSupplier > xFamilySupplier ( xModel, uno::UNO_QUERY );
|
2001-10-12 12:57:26 +00:00
|
|
|
// Get the style families
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference < XNameAccess > xFamilies = xFamilySupplier->getStyleFamilies();
|
2001-10-12 12:57:26 +00:00
|
|
|
// Get the Frame family (and keep it for later)
|
2013-06-29 21:24:12 +02:00
|
|
|
const ::uno::Any aAny = xFamilies->getByName ("FrameStyles");
|
2001-10-12 12:57:26 +00:00
|
|
|
aAny >>= mxStyleFamily;
|
|
|
|
// In the derived class, we'll ask mxStyleFamily for the relevant default style
|
2001-10-23 16:40:05 +00:00
|
|
|
// mxStyleFamily is initialised in the SwXFrame constructor
|
|
|
|
switch(eType)
|
|
|
|
{
|
|
|
|
case FLYCNTTYPE_FRM:
|
|
|
|
{
|
2013-06-29 21:24:12 +02:00
|
|
|
uno::Any aAny2 = mxStyleFamily->getByName ("Frame");
|
2007-09-27 08:36:43 +00:00
|
|
|
aAny2 >>= mxStyleData;
|
2001-10-23 16:40:05 +00:00
|
|
|
pProps = new SwFrameProperties_Impl( );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FLYCNTTYPE_GRF:
|
|
|
|
{
|
2013-06-29 21:24:12 +02:00
|
|
|
uno::Any aAny2 = mxStyleFamily->getByName ("Graphics");
|
2007-09-27 08:36:43 +00:00
|
|
|
aAny2 >>= mxStyleData;
|
2001-10-23 16:40:05 +00:00
|
|
|
pProps = new SwGraphicProperties_Impl( );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FLYCNTTYPE_OLE:
|
|
|
|
{
|
2013-06-29 21:24:12 +02:00
|
|
|
uno::Any aAny2 = mxStyleFamily->getByName ("OLE");
|
2007-09-27 08:36:43 +00:00
|
|
|
aAny2 >>= mxStyleData;
|
2003-04-17 13:43:12 +00:00
|
|
|
pProps = new SwOLEProperties_Impl( );
|
2001-10-23 16:40:05 +00:00
|
|
|
}
|
|
|
|
break;
|
2007-09-27 08:36:43 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
;
|
2001-10-23 16:40:05 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2013-02-02 22:56:20 +01:00
|
|
|
SwXFrame::SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet, const :: SfxItemPropertySet* pSet)
|
|
|
|
: SwClient( &rFrmFmt )
|
|
|
|
, m_pImpl(new Impl)
|
|
|
|
,
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet(pSet),
|
|
|
|
m_pDoc( 0 ),
|
2007-09-27 08:36:43 +00:00
|
|
|
eType(eSet),
|
2007-07-18 11:57:02 +00:00
|
|
|
pProps(0),
|
2011-01-03 20:35:28 +00:00
|
|
|
bIsDescriptor(false),
|
2007-07-18 11:57:02 +00:00
|
|
|
m_pCopySource(0)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXFrame::~SwXFrame()
|
|
|
|
{
|
2007-07-18 11:57:02 +00:00
|
|
|
delete m_pCopySource;
|
2000-09-18 23:08:29 +00:00
|
|
|
delete pProps;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXFrame::getName(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
2013-08-18 02:26:26 +02:00
|
|
|
return pFmt->GetName();
|
|
|
|
if(!bIsDescriptor)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2013-08-18 02:26:26 +02:00
|
|
|
return m_sName;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2013-08-18 02:26:26 +02:00
|
|
|
void SwXFrame::setName(const OUString& rName) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
2013-08-18 02:26:26 +02:00
|
|
|
pFmt->GetDoc()->SetFlyName((SwFlyFrmFmt&)*pFmt, rName);
|
|
|
|
if(pFmt->GetName() != rName)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(bIsDescriptor)
|
2013-08-18 02:26:26 +02:00
|
|
|
m_sName = rName;
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< beans::XPropertySetInfo > SwXFrame::getPropertySetInfo(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< beans::XPropertySetInfo > xRef;
|
|
|
|
static uno::Reference< beans::XPropertySetInfo > xFrmRef;
|
|
|
|
static uno::Reference< beans::XPropertySetInfo > xGrfRef;
|
|
|
|
static uno::Reference< beans::XPropertySetInfo > xOLERef;
|
2000-09-18 23:08:29 +00:00
|
|
|
switch(eType)
|
|
|
|
{
|
|
|
|
case FLYCNTTYPE_FRM:
|
|
|
|
if( !xFrmRef.is() )
|
2009-06-03 11:26:39 +00:00
|
|
|
xFrmRef = m_pPropSet->getPropertySetInfo();
|
2000-09-18 23:08:29 +00:00
|
|
|
xRef = xFrmRef;
|
|
|
|
break;
|
|
|
|
case FLYCNTTYPE_GRF:
|
|
|
|
if( !xGrfRef.is() )
|
2009-06-03 11:26:39 +00:00
|
|
|
xGrfRef = m_pPropSet->getPropertySetInfo();
|
2000-09-18 23:08:29 +00:00
|
|
|
xRef = xGrfRef;
|
|
|
|
break;
|
|
|
|
case FLYCNTTYPE_OLE:
|
|
|
|
if( !xOLERef.is() )
|
2009-06-03 11:26:39 +00:00
|
|
|
xOLERef = m_pPropSet->getPropertySetInfo();
|
2000-09-18 23:08:29 +00:00
|
|
|
xRef = xOLERef;
|
|
|
|
break;
|
2007-09-27 08:36:43 +00:00
|
|
|
default:
|
|
|
|
;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return xRef;
|
|
|
|
}
|
2007-07-18 11:57:02 +00:00
|
|
|
|
|
|
|
void SwXFrame::SetSelection(SwPaM& rCopySource)
|
|
|
|
{
|
2011-11-17 22:13:42 +04:00
|
|
|
delete m_pCopySource;
|
2007-07-18 11:57:02 +00:00
|
|
|
m_pCopySource = new SwPaM( *rCopySource.Start() );
|
|
|
|
m_pCopySource->SetMark();
|
|
|
|
*m_pCopySource->GetMark() = *rCopySource.End();
|
|
|
|
}
|
2000-12-06 10:36:14 +00:00
|
|
|
|
2002-11-26 11:35:55 +00:00
|
|
|
SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt )
|
2000-12-06 10:36:14 +00:00
|
|
|
{
|
|
|
|
SdrObject* pObject = pFmt->FindSdrObject();
|
|
|
|
if( !pObject )
|
|
|
|
{
|
|
|
|
SwDoc *pDoc = pFmt->GetDoc();
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i52858# - method name changed
|
2005-09-28 10:22:42 +00:00
|
|
|
SdrModel *pDrawModel = pDoc->GetOrCreateDrawModel();
|
2000-12-06 10:36:14 +00:00
|
|
|
SwFlyDrawContact* pContactObject
|
|
|
|
= new SwFlyDrawContact( pFmt, pDrawModel );
|
|
|
|
pObject = pContactObject->GetMaster();
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwFmtSurround& rSurround = pFmt->GetSurround();
|
2000-12-06 10:36:14 +00:00
|
|
|
pObject->SetLayer(
|
|
|
|
( SURROUND_THROUGHT == rSurround.GetSurround() &&
|
|
|
|
!pFmt->GetOpaque().GetValue() ) ? pDoc->GetHellId()
|
|
|
|
: pDoc->GetHeavenId() );
|
|
|
|
|
|
|
|
pDrawModel->GetPage(0)->InsertObject( pObject );
|
|
|
|
}
|
|
|
|
|
|
|
|
return pObject;
|
|
|
|
}
|
|
|
|
|
2012-10-12 16:49:40 +02:00
|
|
|
static SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc )
|
2000-12-20 06:55:54 +00:00
|
|
|
{
|
|
|
|
SwFrmFmt *pRet = 0;
|
|
|
|
SwDocShell* pDocSh = pDoc->GetDocShell();
|
|
|
|
if(pDocSh)
|
|
|
|
{
|
|
|
|
OUString uTemp;
|
|
|
|
rValue >>= uTemp;
|
2013-08-07 13:43:44 +02:00
|
|
|
OUString sStyle;
|
|
|
|
SwStyleNameMapper::FillUIName(uTemp, sStyle,
|
|
|
|
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, true);
|
2000-12-20 06:55:54 +00:00
|
|
|
SwDocStyleSheet* pStyle =
|
|
|
|
(SwDocStyleSheet*)pDocSh->GetStyleSheetPool()->Find(sStyle,
|
|
|
|
SFX_STYLE_FAMILY_FRAME);
|
|
|
|
if(pStyle)
|
|
|
|
pRet = pStyle->GetFrmFmt();
|
|
|
|
}
|
|
|
|
|
|
|
|
return pRet;
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::Any& aValue)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
2012-01-05 21:30:06 +00:00
|
|
|
const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
|
2001-11-28 19:13:57 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
if (!pEntry)
|
2013-03-19 09:22:44 +01:00
|
|
|
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2001-11-28 19:13:57 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pFmt)
|
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bNextFrame = false;
|
2009-06-03 11:26:39 +00:00
|
|
|
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
|
2013-06-29 21:24:12 +02:00
|
|
|
throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2001-04-27 05:42:08 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
2010-11-06 10:30:17 -05:00
|
|
|
if ( ((eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID)) ||
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
(FN_PARAM_COUNTOUR_PP == pEntry->nWID) ||
|
|
|
|
(FN_UNO_IS_AUTOMATIC_CONTOUR == pEntry->nWID) ||
|
|
|
|
(FN_UNO_IS_PIXEL_CONTOUR == pEntry->nWID) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
2009-06-03 11:26:39 +00:00
|
|
|
if(pEntry->nWID == FN_PARAM_COUNTOUR_PP)
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
drawing::PointSequenceSequence aParam;
|
2000-10-24 13:26:57 +00:00
|
|
|
if(!aValue.hasValue())
|
|
|
|
pNoTxt->SetContour(0);
|
|
|
|
else if(aValue >>= aParam)
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
PolyPolygon aPoly((sal_uInt16)aParam.getLength());
|
2000-10-24 13:26:57 +00:00
|
|
|
for(sal_Int32 i = 0; i < aParam.getLength(); i++)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: drawing::PointSequence* pPointSeq = aParam.getConstArray();
|
2001-05-04 07:41:21 +00:00
|
|
|
sal_Int32 nPoints = pPointSeq[i].getLength();
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: awt::Point* pPoints = pPointSeq[i].getConstArray();
|
2011-01-17 15:06:54 +01:00
|
|
|
Polygon aSet( (sal_uInt16)nPoints );
|
2001-05-04 07:41:21 +00:00
|
|
|
for(sal_Int32 j = 0; j < nPoints; j++)
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
2001-05-04 07:41:21 +00:00
|
|
|
Point aPoint(pPoints[j].X, pPoints[j].Y);
|
2011-01-17 15:06:54 +01:00
|
|
|
aSet.SetPoint(aPoint, (sal_uInt16)j);
|
2000-10-24 13:26:57 +00:00
|
|
|
}
|
2001-05-04 07:41:21 +00:00
|
|
|
// Close polygon if it isn't closed already.
|
|
|
|
aSet.Optimize( POLY_OPTIMIZE_CLOSE );
|
2000-10-24 13:26:57 +00:00
|
|
|
aPoly.Insert( aSet );
|
|
|
|
}
|
2001-05-04 07:41:21 +00:00
|
|
|
pNoTxt->SetContourAPI( &aPoly );
|
2000-10-24 13:26:57 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2000-10-24 13:26:57 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR )
|
2001-05-04 07:41:21 +00:00
|
|
|
{
|
|
|
|
pNoTxt->SetAutomaticContour( *(sal_Bool *)aValue.getValue() );
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR )
|
2001-05-04 07:41:21 +00:00
|
|
|
{
|
|
|
|
// The IsPixelContour property can only be set if there
|
|
|
|
// is no contour, or if the contour has been set by the
|
|
|
|
// API itself (or in other words, if the contour isn't
|
|
|
|
// used already).
|
|
|
|
if( !pNoTxt->_HasContour() ||
|
|
|
|
!pNoTxt->IsContourMapModeValid() )
|
|
|
|
pNoTxt->SetPixelContour( *(sal_Bool *)aValue.getValue() );
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2001-05-04 07:41:21 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
SfxItemSet aSet(pNoTxt->GetSwAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
|
2000-09-18 23:08:29 +00:00
|
|
|
pNoTxt->SetAttr(aSet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i73249#
|
2009-08-27 11:59:20 +00:00
|
|
|
// Attribute AlternativeText was never published.
|
|
|
|
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
|
|
|
|
// else if( FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID && eType != FLYCNTTYPE_FRM )
|
|
|
|
// {
|
|
|
|
// const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
// if(pIdx)
|
|
|
|
// {
|
|
|
|
// SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
// OUString uTemp;
|
|
|
|
// aValue >>= uTemp;
|
|
|
|
// pNoTxt->SetAlternateText(uTemp);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// New attribute Title
|
|
|
|
else if( FN_UNO_TITLE == pEntry->nWID )
|
2008-01-29 08:23:32 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
2013-08-18 02:26:26 +02:00
|
|
|
OUString sTitle;
|
|
|
|
aValue >>= sTitle;
|
2009-08-27 11:59:20 +00:00
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
|
|
|
pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), sTitle );
|
2008-01-29 08:23:32 +00:00
|
|
|
}
|
2009-08-27 11:59:20 +00:00
|
|
|
// New attribute Description
|
|
|
|
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
|
|
|
|
{
|
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
2013-08-18 02:26:26 +02:00
|
|
|
OUString sDescription;
|
|
|
|
aValue >>= sDescription;
|
2009-08-27 11:59:20 +00:00
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
|
|
|
pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), sDescription );
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2000-12-20 06:55:54 +00:00
|
|
|
SwFrmFmt *pFrmFmt = lcl_GetFrmFmt( aValue, pFmt->GetDoc() );
|
|
|
|
if( pFrmFmt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2000-12-20 06:55:54 +00:00
|
|
|
UnoActionContext aAction(pFmt->GetDoc());
|
2003-03-27 14:45:43 +00:00
|
|
|
|
|
|
|
SfxItemSet* pSet = 0;
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i31771#, #i25798# - No adjustment of
|
2012-10-12 16:49:40 +02:00
|
|
|
// anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ),
|
2004-11-09 11:31:53 +00:00
|
|
|
// if document is currently in reading mode.
|
|
|
|
if ( !pFmt->GetDoc()->IsInReading() )
|
2003-03-27 14:45:43 +00:00
|
|
|
{
|
2012-10-22 12:53:09 +09:00
|
|
|
// see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos )
|
2004-11-09 11:31:53 +00:00
|
|
|
SwFlyFrm *pFly = 0;
|
2003-03-27 14:45:43 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwFrmFmt* pFmtXX = pFmt;
|
2004-11-09 11:31:53 +00:00
|
|
|
if (PTR_CAST(SwFlyFrmFmt, pFmtXX))
|
|
|
|
pFly = ((SwFlyFrmFmt*)pFmtXX)->GetFrm();
|
|
|
|
}
|
|
|
|
if ( pFly )
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxPoolItem* pItem;
|
2011-01-03 20:35:28 +00:00
|
|
|
if( SFX_ITEM_SET == pFrmFmt->GetItemState( RES_ANCHOR, false, &pItem ))
|
2004-11-09 11:31:53 +00:00
|
|
|
{
|
|
|
|
pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrmFmtSetRange );
|
|
|
|
pSet->Put( *pItem );
|
2012-10-12 16:49:40 +02:00
|
|
|
if ( !sw_ChkAndSetNewAnchor( *pFly, *pSet ) )
|
2004-11-09 11:31:53 +00:00
|
|
|
delete pSet, pSet = 0;
|
|
|
|
}
|
2003-03-27 14:45:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-22 12:53:09 +09:00
|
|
|
pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, false );
|
2003-03-27 14:45:43 +00:00
|
|
|
delete pSet;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-12-20 06:55:54 +00:00
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_GRAPHIC_U_R_L == pEntry->nWID ||
|
|
|
|
FN_UNO_GRAPHIC_FILTER == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sGrfName;
|
|
|
|
OUString sFltName;
|
2000-11-29 13:57:24 +00:00
|
|
|
GraphicObject *pGrfObj = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
pFmt->GetDoc()->GetGrfNms( *(SwFlyFrmFmt*)pFmt, &sGrfName, &sFltName );
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sTmp;
|
|
|
|
aValue >>= sTmp;
|
2000-09-18 23:08:29 +00:00
|
|
|
UnoActionContext aAction(pFmt->GetDoc());
|
2009-06-03 11:26:39 +00:00
|
|
|
if(FN_UNO_GRAPHIC_U_R_L == pEntry->nWID)
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
if( sTmp.startsWith(sPackageProtocol) )
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2001-03-02 13:08:50 +00:00
|
|
|
pGrfObj = new GraphicObject;
|
|
|
|
pGrfObj->SetUserData( sTmp );
|
|
|
|
pGrfObj->SetSwapState();
|
2013-10-31 17:16:50 +02:00
|
|
|
sGrfName = "";
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
2013-08-22 22:41:04 +02:00
|
|
|
else if( sTmp.startsWith(sGraphicObjectProtocol) )
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
const OString sId(OUStringToOString(
|
|
|
|
sTmp.copy(sizeof(sGraphicObjectProtocol)-1),
|
2011-11-01 22:38:51 +00:00
|
|
|
RTL_TEXTENCODING_ASCII_US));
|
2000-11-29 13:57:24 +00:00
|
|
|
pGrfObj = new GraphicObject( sId );
|
2013-10-31 17:16:50 +02:00
|
|
|
sGrfName = "";
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2001-11-30 14:00:46 +00:00
|
|
|
sGrfName = sTmp;
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
sFltName = sTmp;
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
|
|
|
|
if(!pGrfNode)
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
|
|
|
delete pGrfObj;
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
SwPaM aGrfPaM(*pGrfNode);
|
2000-11-29 13:57:24 +00:00
|
|
|
pFmt->GetDoc()->ReRead( aGrfPaM, sGrfName, sFltName, 0,
|
|
|
|
pGrfObj );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-11-29 13:57:24 +00:00
|
|
|
delete pGrfObj;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_GRAPHIC == pEntry->nWID )
|
2007-07-18 11:57:02 +00:00
|
|
|
{
|
|
|
|
uno::Reference< graphic::XGraphic > xGraphic;
|
|
|
|
aValue >>= xGraphic;
|
|
|
|
if(xGraphic.is())
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
2007-07-18 11:57:02 +00:00
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
|
|
|
|
if(!pGrfNode)
|
|
|
|
{
|
|
|
|
throw uno::RuntimeException();
|
|
|
|
}
|
|
|
|
SwPaM aGrfPaM(*pGrfNode);
|
|
|
|
Graphic aGraphic( xGraphic );
|
2013-10-15 17:20:31 +02:00
|
|
|
pFmt->GetDoc()->ReRead( aGrfPaM, OUString(), OUString(), &aGraphic, 0 );
|
2007-07-18 11:57:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_REPLACEMENT_GRAPHIC_URL == pEntry->nWID || FN_UNO_REPLACEMENT_GRAPHIC == pEntry->nWID )
|
2007-01-23 06:36:04 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
bool bURL = FN_UNO_REPLACEMENT_GRAPHIC_URL == pEntry->nWID;
|
2008-07-22 12:01:18 +00:00
|
|
|
bool bApply = false;
|
|
|
|
Graphic aGraphic;
|
|
|
|
if( bURL )
|
|
|
|
{
|
|
|
|
GraphicObject *pGrfObj = 0;
|
|
|
|
OUString aGrfUrl;
|
|
|
|
aValue >>= aGrfUrl;
|
|
|
|
|
|
|
|
// the package URL based graphics are handled in different way currently
|
|
|
|
// TODO/LATER: actually this is the correct place to handle them
|
2013-11-14 13:13:19 +02:00
|
|
|
OUString aGraphicProtocol( sGraphicObjectProtocol );
|
2013-03-08 12:37:15 +01:00
|
|
|
if( aGrfUrl.startsWith( aGraphicProtocol ) )
|
2008-07-22 12:01:18 +00:00
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OString sId(OUStringToOString(
|
2011-11-01 22:38:51 +00:00
|
|
|
aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
|
|
|
|
RTL_TEXTENCODING_ASCII_US));
|
2008-07-22 12:01:18 +00:00
|
|
|
pGrfObj = new GraphicObject( sId );
|
|
|
|
aGraphic = pGrfObj->GetGraphic();
|
|
|
|
bApply = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2007-01-23 06:36:04 +00:00
|
|
|
{
|
2008-07-22 12:01:18 +00:00
|
|
|
uno::Reference< graphic::XGraphic > xGraphic;
|
|
|
|
aValue >>= xGraphic;
|
|
|
|
if( xGraphic.is() )
|
|
|
|
{
|
|
|
|
aGraphic = Graphic( xGraphic );
|
|
|
|
bApply = true;
|
|
|
|
}
|
2007-01-23 06:36:04 +00:00
|
|
|
}
|
|
|
|
|
2008-07-22 12:01:18 +00:00
|
|
|
if ( bApply )
|
2007-01-23 06:36:04 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2007-01-23 06:36:04 +00:00
|
|
|
if ( pCnt->GetCntntIdx() && pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ] )
|
|
|
|
{
|
|
|
|
SwOLENode* pOleNode = pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode();
|
|
|
|
|
|
|
|
if ( pOleNode )
|
|
|
|
{
|
2012-01-04 16:45:34 +00:00
|
|
|
svt::EmbeddedObjectRef &rObj = pOleNode->GetOLEObj().GetObject();
|
2007-01-23 06:36:04 +00:00
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString aMediaType;
|
2012-01-04 16:45:34 +00:00
|
|
|
rObj.SetGraphic( aGraphic, aMediaType );
|
2007-01-23 06:36:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-06-13 11:03:44 +00:00
|
|
|
else if(0 != (bNextFrame = (rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))))
|
|
|
|
|| rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME)))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-12 18:29:41 +02:00
|
|
|
OUString sChainName;
|
|
|
|
aValue >>= sChainName;
|
|
|
|
if (sChainName.isEmpty())
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
if(bNextFrame)
|
|
|
|
pDoc->Unchain(*pFmt);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SwFmtChain aChain( pFmt->GetChain() );
|
|
|
|
SwFrmFmt *pPrev = aChain.GetPrev();
|
|
|
|
if(pPrev)
|
|
|
|
pDoc->Unchain(*pPrev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-12-22 08:54:15 +00:00
|
|
|
sal_uInt16 nCount = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SwFrmFmt* pChain = 0;
|
|
|
|
for( sal_uInt16 i = 0; i < nCount; i++)
|
|
|
|
{
|
2007-09-27 08:36:43 +00:00
|
|
|
SwFrmFmt* pFmt2 = pDoc->GetFlyNum(i, FLYCNTTYPE_FRM);
|
|
|
|
if(sChainName == pFmt2->GetName() )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 08:36:43 +00:00
|
|
|
pChain = pFmt2;
|
2000-09-18 23:08:29 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(pChain)
|
|
|
|
{
|
|
|
|
SwFrmFmt* pSource = bNextFrame ? pFmt : pChain;
|
|
|
|
SwFrmFmt* pDest = bNextFrame ? pChain: pFmt;
|
|
|
|
pDoc->Chain(*pSource, *pDest);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_Z_ORDER == pEntry->nWID)
|
2000-11-27 10:13:17 +00:00
|
|
|
{
|
|
|
|
sal_Int32 nZOrder = - 1;
|
|
|
|
aValue >>= nZOrder;
|
2000-12-06 10:36:14 +00:00
|
|
|
if( nZOrder >= 0)
|
2000-11-27 10:13:17 +00:00
|
|
|
{
|
2000-12-06 10:36:14 +00:00
|
|
|
SdrObject* pObject =
|
2002-11-26 11:35:55 +00:00
|
|
|
GetOrCreateSdrObject( (SwFlyFrmFmt*)pFmt );
|
2000-12-06 10:36:14 +00:00
|
|
|
SdrModel *pDrawModel = pDoc->GetDrawModel();
|
|
|
|
pDrawModel->GetPage(0)->
|
|
|
|
SetObjectOrdNum(pObject->GetOrdNum(), nZOrder);
|
2000-11-27 10:13:17 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORFRAME == pEntry->nMemberId)
|
2001-03-12 11:30:40 +00:00
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bDone = false;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference<text::XTextFrame> xFrame;
|
2001-03-12 11:30:40 +00:00
|
|
|
if(aValue >>= xFrame)
|
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference<lang::XUnoTunnel> xTunnel(xFrame, uno::UNO_QUERY);
|
2001-03-12 11:30:40 +00:00
|
|
|
SwXFrame* pFrame = xTunnel.is() ?
|
2007-09-27 08:36:43 +00:00
|
|
|
reinterpret_cast< SwXFrame * >( sal::static_int_cast< sal_IntPtr >( xTunnel->getSomething(SwXFrame::getUnoTunnelId()) ))
|
|
|
|
: 0;
|
2001-03-12 11:30:40 +00:00
|
|
|
if(pFrame && this != pFrame && pFrame->GetFrmFmt() && pFrame->GetFrmFmt()->GetDoc() == pDoc)
|
|
|
|
{
|
|
|
|
SfxItemSet aSet( pDoc->GetAttrPool(),
|
|
|
|
RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
|
|
|
|
aSet.SetParent(&pFmt->GetAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtAnchor aAnchor = (const :: SwFmtAnchor&)aSet.Get(pEntry->nWID);
|
2001-03-12 11:30:40 +00:00
|
|
|
|
|
|
|
|
|
|
|
SwPosition aPos(*pFrame->GetFrmFmt()->GetCntnt().GetCntntIdx());
|
|
|
|
aAnchor.SetAnchor(&aPos);
|
|
|
|
aAnchor.SetType(FLY_AT_FLY);
|
|
|
|
aSet.Put(aAnchor);
|
|
|
|
pDoc->SetFlyFrmAttr( *pFmt, aSet );
|
2011-01-03 20:35:28 +00:00
|
|
|
bDone = true;
|
2001-03-12 11:30:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!bDone)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2001-03-12 11:30:40 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
SfxItemSet aSet( pDoc->GetAttrPool(),
|
2007-01-30 14:22:59 +00:00
|
|
|
RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
|
|
|
|
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
|
|
|
|
0L);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
aSet.SetParent(&pFmt->GetAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet->setPropertyValue(*pEntry, aValue, aSet);
|
|
|
|
if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == pEntry->nMemberId)
|
2001-03-12 09:00:47 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
SwFmtAnchor aAnchor = (const :: SwFmtAnchor&)aSet.Get(pEntry->nWID);
|
2001-03-12 09:00:47 +00:00
|
|
|
if(aAnchor.GetAnchorId() == FLY_AT_FLY)
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SwPosition* pPosition = aAnchor.GetCntntAnchor();
|
2007-09-27 08:36:43 +00:00
|
|
|
SwFrmFmt* pFlyFmt = pPosition ? pPosition->nNode.GetNode().GetFlyFmt() : 0;
|
|
|
|
if(!pFlyFmt || pFlyFmt->Which() == RES_DRAWFRMFMT)
|
2001-03-12 09:00:47 +00:00
|
|
|
{
|
|
|
|
lang::IllegalArgumentException aExcept;
|
2012-12-26 22:49:14 +01:00
|
|
|
aExcept.Message = "Anchor to frame: no frame found";
|
2001-03-12 09:00:47 +00:00
|
|
|
throw aExcept;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SwPosition aPos = *pPosition;
|
2007-09-27 08:36:43 +00:00
|
|
|
aPos.nNode = *pFlyFmt->GetCntnt().GetCntntIdx();
|
2001-03-12 09:00:47 +00:00
|
|
|
aAnchor.SetAnchor(&aPos);
|
|
|
|
aSet.Put(aAnchor);
|
|
|
|
}
|
|
|
|
}
|
2010-01-05 16:37:41 +01:00
|
|
|
else if ((aAnchor.GetAnchorId() != FLY_AT_PAGE) &&
|
|
|
|
!aAnchor.GetCntntAnchor())
|
2001-06-06 12:31:31 +00:00
|
|
|
{
|
|
|
|
SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
|
|
|
|
SwPaM aPam(rNode);
|
|
|
|
aPam.Move( fnMoveBackward, fnGoDoc );
|
|
|
|
aAnchor.SetAnchor( aPam.Start() );
|
|
|
|
aSet.Put(aAnchor);
|
|
|
|
}
|
2003-04-01 14:22:09 +00:00
|
|
|
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i31771#, #i25798# - No adjustment of
|
2012-10-12 16:49:40 +02:00
|
|
|
// anchor ( no call of method <sw_ChkAndSetNewAnchor(..)> ),
|
2004-11-09 11:31:53 +00:00
|
|
|
// if document is currently in reading mode.
|
|
|
|
if ( !pFmt->GetDoc()->IsInReading() )
|
2003-04-01 14:22:09 +00:00
|
|
|
{
|
2004-11-09 11:31:53 +00:00
|
|
|
// see SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet )
|
|
|
|
SwFlyFrm *pFly = 0;
|
|
|
|
if (PTR_CAST(SwFlyFrmFmt, pFmt))
|
|
|
|
pFly = ((SwFlyFrmFmt*)pFmt)->GetFrm();
|
|
|
|
if (pFly)
|
2003-04-01 14:22:09 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const :: SfxPoolItem* pItem;
|
2011-01-03 20:35:28 +00:00
|
|
|
if( SFX_ITEM_SET == aSet.GetItemState( RES_ANCHOR, false, &pItem ))
|
2004-11-09 11:31:53 +00:00
|
|
|
{
|
|
|
|
aSet.Put( *pItem );
|
2012-10-12 16:49:40 +02:00
|
|
|
sw_ChkAndSetNewAnchor( *pFly, aSet );
|
2004-11-09 11:31:53 +00:00
|
|
|
}
|
2003-04-01 14:22:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
pFmt->GetDoc()->SetFlyFrmAttr( *pFmt, aSet );
|
2001-03-12 09:00:47 +00:00
|
|
|
}
|
2011-11-15 13:47:36 +01:00
|
|
|
else if(FN_UNO_CLSID == pEntry->nWID || FN_UNO_STREAM_NAME == pEntry->nWID || FN_EMBEDDED_OBJECT == pEntry->nWID)
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
|
|
|
throw lang::IllegalArgumentException();
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2008-06-13 09:31:31 +00:00
|
|
|
pFmt->SetFmtAttr(aSet);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(IsDescriptor())
|
2001-10-15 09:06:21 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
pProps->SetProperty(pEntry->nWID, pEntry->nMemberId, aValue);
|
|
|
|
if( FN_UNO_FRAME_STYLE_NAME == pEntry->nWID )
|
2001-10-15 09:06:21 +00:00
|
|
|
{
|
2001-10-15 12:54:21 +00:00
|
|
|
OUString sStyleName;
|
|
|
|
aValue >>= sStyleName;
|
|
|
|
try
|
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Any aAny = mxStyleFamily->getByName ( sStyleName );
|
2001-10-15 12:54:21 +00:00
|
|
|
aAny >>= mxStyleData;
|
|
|
|
}
|
2007-06-05 16:33:19 +00:00
|
|
|
catch ( container::NoSuchElementException const & )
|
2001-10-15 12:54:21 +00:00
|
|
|
{
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
catch ( lang::WrappedTargetException const & )
|
2001-10-15 12:54:21 +00:00
|
|
|
{
|
|
|
|
}
|
2007-06-05 16:33:19 +00:00
|
|
|
catch ( uno::RuntimeException const & )
|
2001-10-15 12:54:21 +00:00
|
|
|
{
|
|
|
|
}
|
2001-10-15 09:06:21 +00:00
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
uno::Any aAny;
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
2012-01-05 21:30:06 +00:00
|
|
|
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
|
2009-06-03 11:26:39 +00:00
|
|
|
if (!pEntry)
|
2013-03-19 09:22:44 +01:00
|
|
|
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2001-11-28 19:13:57 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
if(FN_UNO_ANCHOR_TYPES == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence<text::TextContentAnchorType> aTypes(5);
|
|
|
|
text::TextContentAnchorType* pArray = aTypes.getArray();
|
|
|
|
pArray[0] = text::TextContentAnchorType_AT_PARAGRAPH;
|
|
|
|
pArray[1] = text::TextContentAnchorType_AS_CHARACTER;
|
|
|
|
pArray[2] = text::TextContentAnchorType_AT_PAGE;
|
|
|
|
pArray[3] = text::TextContentAnchorType_AT_FRAME;
|
|
|
|
pArray[4] = text::TextContentAnchorType_AT_CHARACTER;
|
|
|
|
aAny.setValue(&aTypes, ::getCppuType(static_cast<uno::Sequence<text::TextContentAnchorType>*>(0)));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else if(pFmt)
|
|
|
|
{
|
2003-03-27 14:45:43 +00:00
|
|
|
if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) &&
|
2009-06-03 11:26:39 +00:00
|
|
|
pEntry &&
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
(isGRFATR(pEntry->nWID) ||
|
2009-06-03 11:26:39 +00:00
|
|
|
pEntry->nWID == FN_PARAM_COUNTOUR_PP ||
|
|
|
|
pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR ||
|
|
|
|
pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR ))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
2009-06-03 11:26:39 +00:00
|
|
|
if(pEntry->nWID == FN_PARAM_COUNTOUR_PP)
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
2001-05-04 07:41:21 +00:00
|
|
|
PolyPolygon aContour;
|
|
|
|
if( pNoTxt->GetContourAPI( aContour ) )
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
drawing::PointSequenceSequence aPtSeq(aContour.Count());
|
|
|
|
drawing::PointSequence* pPSeq = aPtSeq.getArray();
|
2011-01-17 15:06:54 +01:00
|
|
|
for(sal_uInt16 i = 0; i < aContour.Count(); i++)
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
2001-05-04 07:41:21 +00:00
|
|
|
const Polygon& rPoly = aContour.GetObject(i);
|
2000-10-24 13:26:57 +00:00
|
|
|
pPSeq[i].realloc(rPoly.GetSize());
|
|
|
|
awt::Point* pPoints = pPSeq[i].getArray();
|
2011-01-17 15:06:54 +01:00
|
|
|
for(sal_uInt16 j = 0; j < rPoly.GetSize(); j++)
|
2000-10-24 13:26:57 +00:00
|
|
|
{
|
|
|
|
const Point& rPoint = rPoly.GetPoint(j);
|
2001-05-04 07:41:21 +00:00
|
|
|
pPoints[j].X = rPoint.X();
|
|
|
|
pPoints[j].Y = rPoint.Y();
|
2000-10-24 13:26:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
aAny <<= aPtSeq;
|
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR )
|
2001-05-04 07:41:21 +00:00
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
sal_Bool bValue = pNoTxt->HasAutomaticContour();
|
2001-05-04 07:41:21 +00:00
|
|
|
aAny.setValue( &bValue, ::getBooleanCppuType() );
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR )
|
2001-05-04 07:41:21 +00:00
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
sal_Bool bValue = pNoTxt->IsPixelContour();
|
2001-05-04 07:41:21 +00:00
|
|
|
aAny.setValue( &bValue, ::getBooleanCppuType() );
|
|
|
|
}
|
2000-10-24 13:26:57 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
SfxItemSet aSet(pNoTxt->GetSwAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet->getPropertyValue(*pEntry, aSet, aAny);
|
2000-10-24 13:26:57 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_GRAPHIC_U_R_L == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sGrfName;
|
2000-11-29 13:57:24 +00:00
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
|
|
|
|
if(!pGrfNode)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-11-29 13:57:24 +00:00
|
|
|
if( pGrfNode->IsGrfLink() )
|
|
|
|
{
|
|
|
|
pFmt->GetDoc()->GetGrfNms( *(SwFlyFrmFmt*)pFmt, &sGrfName, 0 );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString sId(OStringToOUString(
|
2011-09-22 09:02:16 +01:00
|
|
|
pGrfNode->GetGrfObj().GetUniqueID(),
|
|
|
|
RTL_TEXTENCODING_ASCII_US));
|
2013-08-22 22:41:04 +02:00
|
|
|
sGrfName = sGraphicObjectProtocol + sId;
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
|
|
|
}
|
2013-08-22 22:41:04 +02:00
|
|
|
aAny <<= sGrfName;
|
2000-11-29 13:57:24 +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( FN_UNO_REPLACEMENT_GRAPHIC_U_R_L == pEntry->nWID)
|
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sGrfName;
|
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 SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
|
|
|
|
if(!pGrfNode)
|
|
|
|
throw uno::RuntimeException();
|
|
|
|
|
|
|
|
const GraphicObject* pGraphicObject = pGrfNode->GetReplacementGrfObj();
|
|
|
|
|
|
|
|
if(pGraphicObject)
|
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
sGrfName = sGraphicObjectProtocol
|
|
|
|
+ OStringToOUString( pGraphicObject->GetUniqueID(), RTL_TEXTENCODING_ASCII_US );
|
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-08-22 22:41:04 +02:00
|
|
|
aAny <<= sGrfName;
|
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
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_GRAPHIC_FILTER == pEntry->nWID )
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sFltName;
|
2000-11-29 13:57:24 +00:00
|
|
|
pFmt->GetDoc()->GetGrfNms( *(SwFlyFrmFmt*)pFmt, 0, &sFltName );
|
2013-08-22 22:41:04 +02:00
|
|
|
aAny <<= sFltName;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if( FN_UNO_GRAPHIC == pEntry->nWID )
|
2007-07-18 11:57:02 +00:00
|
|
|
{
|
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
|
|
|
|
if(!pGrfNode)
|
|
|
|
throw uno::RuntimeException();
|
|
|
|
aAny <<= pGrfNode->GetGrf().GetXGraphic();
|
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-09-27 08:36:43 +00:00
|
|
|
aAny <<= OUString(SwStyleNameMapper::GetProgName(pFmt->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i73249#
|
2009-08-27 11:59:20 +00:00
|
|
|
// Attribute AlternativeText was never published.
|
|
|
|
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
|
|
|
|
// else if(eType != FLYCNTTYPE_FRM &&
|
|
|
|
// FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID)
|
|
|
|
// {
|
|
|
|
// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
// if(pIdx)
|
|
|
|
// {
|
|
|
|
// SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
// aAny <<= OUString(pNoTxt->GetAlternateText());
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
else if( FN_UNO_TITLE == pEntry->nWID )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
|
|
|
aAny <<= OUString(pFlyFmt->GetObjTitle());
|
2008-01-30 06:59:10 +00:00
|
|
|
}
|
2009-08-27 11:59:20 +00:00
|
|
|
// New attribute Description
|
|
|
|
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
|
|
|
|
{
|
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
|
|
|
aAny <<= OUString(pFlyFmt->GetObjDescription());
|
|
|
|
}
|
2008-01-30 06:59:10 +00:00
|
|
|
else if(eType == FLYCNTTYPE_GRF &&
|
|
|
|
(rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_ACTUAL_SIZE))))
|
|
|
|
{
|
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
2011-03-11 15:17:48 +01:00
|
|
|
// --> OD #i85105#
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
// Size aActSize = ((SwGrfNode*)pNoTxt)->GetTwipSize();
|
|
|
|
Size aActSize;
|
|
|
|
{
|
|
|
|
SwGrfNode* pGrfNode = dynamic_cast<SwGrfNode*>(aIdx.GetNode().GetNoTxtNode());
|
|
|
|
if ( pGrfNode )
|
|
|
|
{
|
|
|
|
aActSize = pGrfNode->GetTwipSize();
|
|
|
|
if ( aActSize.Width() == 0 && aActSize.Height() == 0 &&
|
|
|
|
pGrfNode->IsLinkedFile() )
|
|
|
|
{
|
2011-03-14 16:56:15 +01:00
|
|
|
pGrfNode->SwapIn( sal_True );
|
2011-03-11 15:17:48 +01:00
|
|
|
aActSize = pGrfNode->GetTwipSize();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// <--
|
2008-01-30 06:59:10 +00:00
|
|
|
awt::Size aTmp;
|
|
|
|
aTmp.Width = TWIP_TO_MM100(aActSize.Width());
|
|
|
|
aTmp.Height = TWIP_TO_MM100(aActSize.Height());
|
|
|
|
aAny.setValue(&aTmp, ::getCppuType(static_cast<const awt::Size*>(0)));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_PARAM_LINK_DISPLAY_NAME == pEntry->nWID)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-12 18:29:41 +02:00
|
|
|
aAny <<= pFmt->GetName();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_Z_ORDER == pEntry->nWID)
|
2000-11-27 10:13:17 +00:00
|
|
|
{
|
2012-05-23 15:44:02 +02:00
|
|
|
const SdrObject* pObj = pFmt->FindRealSdrObject();
|
|
|
|
if( pObj == NULL )
|
|
|
|
pObj = pFmt->FindSdrObject();
|
2000-12-06 13:25:52 +00:00
|
|
|
if( pObj )
|
2000-11-27 10:13:17 +00:00
|
|
|
{
|
|
|
|
aAny <<= (sal_Int32)pObj->GetOrdNum();
|
|
|
|
}
|
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_CLSID == pEntry->nWID || FN_UNO_MODEL == pEntry->nWID||
|
2010-11-15 12:56:35 +01:00
|
|
|
FN_UNO_COMPONENT == pEntry->nWID ||FN_UNO_STREAM_NAME == pEntry->nWID||
|
|
|
|
FN_EMBEDDED_OBJECT == pEntry->nWID)
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2003-04-17 13:43:12 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2003-04-17 13:43:12 +00:00
|
|
|
|
|
|
|
SwOLENode* pOleNode = pDoc->GetNodes()[ pCnt->GetCntntIdx()
|
|
|
|
->GetIndex() + 1 ]->GetOLENode();
|
2004-10-04 18:13:38 +00:00
|
|
|
uno::Reference < embed::XEmbeddedObject > xIP = pOleNode->GetOLEObj().GetOleRef();
|
2003-04-17 13:43:12 +00:00
|
|
|
OUString aHexCLSID;
|
|
|
|
{
|
2004-11-26 15:27:27 +00:00
|
|
|
SvGlobalName aClassName( xIP->getClassID() );
|
2003-04-17 13:43:12 +00:00
|
|
|
aHexCLSID = aClassName.GetHexName();
|
2009-06-03 11:26:39 +00:00
|
|
|
if(FN_UNO_CLSID != pEntry->nWID)
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
2004-11-26 15:27:27 +00:00
|
|
|
if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
|
|
|
|
{
|
|
|
|
uno::Reference < lang::XComponent > xComp( xIP->getComponent(), uno::UNO_QUERY );
|
|
|
|
uno::Reference < frame::XModel > xModel( xComp, uno::UNO_QUERY );
|
2010-11-15 12:56:35 +01:00
|
|
|
if ( FN_EMBEDDED_OBJECT == pEntry->nWID )
|
2010-11-16 23:38:56 +01:00
|
|
|
{
|
|
|
|
// ensure the
|
2011-03-14 16:51:14 +00:00
|
|
|
OSL_ENSURE( pDoc->GetDocShell(), "no doc shell => no client site" );
|
2010-11-16 23:38:56 +01:00
|
|
|
if ( pDoc->GetDocShell() )
|
|
|
|
pDoc->GetDocShell()->GetIPClient( svt::EmbeddedObjectRef( xIP, embed::Aspects::MSOLE_CONTENT ) );
|
2010-11-15 12:56:35 +01:00
|
|
|
aAny <<= xIP;
|
2010-11-16 23:38:56 +01:00
|
|
|
}
|
2010-11-15 12:56:35 +01:00
|
|
|
else if ( xModel.is() )
|
2004-11-26 15:27:27 +00:00
|
|
|
aAny <<= xModel;
|
2009-06-03 11:26:39 +00:00
|
|
|
else if ( FN_UNO_COMPONENT == pEntry->nWID )
|
2004-11-26 15:27:27 +00:00
|
|
|
aAny <<= xComp;
|
|
|
|
}
|
2003-04-17 13:43:12 +00:00
|
|
|
}
|
|
|
|
}
|
2004-10-04 18:13:38 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
if(FN_UNO_CLSID == pEntry->nWID)
|
2003-04-17 13:43:12 +00:00
|
|
|
aAny <<= aHexCLSID;
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(FN_UNO_STREAM_NAME == pEntry->nWID)
|
2008-07-01 10:27:33 +00:00
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
aAny <<= OUString(pOleNode->GetOLEObj().GetCurrentPersistName());
|
2008-07-01 10:27:33 +00:00
|
|
|
}
|
2011-11-15 13:47:36 +01:00
|
|
|
else if(FN_EMBEDDED_OBJECT == pEntry->nWID)
|
|
|
|
{
|
|
|
|
aAny <<= pOleNode->GetOLEObj().GetOleRef();
|
|
|
|
}
|
2003-04-17 13:43:12 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
else if(WID_LAYOUT_SIZE == pEntry->nWID)
|
2006-07-14 07:31:03 +00:00
|
|
|
{
|
2007-01-30 14:22:59 +00:00
|
|
|
// format document completely in order to get correct value
|
2007-11-01 10:50:20 +00:00
|
|
|
pFmt->GetDoc()->GetEditShell()->CalcLayout();
|
2007-01-30 14:22:59 +00:00
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
SwFrm* pTmpFrm = SwIterator<SwFrm,SwFmt>::FirstElement( *pFmt );
|
|
|
|
if ( pTmpFrm )
|
2006-07-14 07:31:03 +00:00
|
|
|
{
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pTmpFrm->IsValid(), "frame not valid" );
|
2007-01-30 14:22:59 +00:00
|
|
|
const SwRect &rRect = pTmpFrm->Frm();
|
|
|
|
Size aMM100Size = OutputDevice::LogicToLogic(
|
|
|
|
Size( rRect.Width(), rRect.Height() ),
|
|
|
|
MapMode( MAP_TWIP ), MapMode( MAP_100TH_MM ));
|
|
|
|
aAny <<= awt::Size( aMM100Size.Width(), aMM100Size.Height() );
|
2006-07-14 07:31:03 +00:00
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
const SwAttrSet& rSet = pFmt->GetAttrSet();
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pPropSet->getPropertyValue(*pEntry, rSet, aAny);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(IsDescriptor())
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
if ( ! m_pDoc )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2009-06-03 11:26:39 +00:00
|
|
|
if(WID_LAYOUT_SIZE != pEntry->nWID) // there is no LayoutSize in a descriptor
|
2006-07-14 07:31:03 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const uno::Any* pAny = 0;
|
|
|
|
if( !pProps->GetProperty( pEntry->nWID, pEntry->nMemberId, pAny ) )
|
|
|
|
aAny = mxStyleData->getPropertyValue( rPropertyName );
|
2006-07-14 07:31:03 +00:00
|
|
|
else if ( pAny )
|
|
|
|
aAny = *pAny;
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aAny;
|
|
|
|
}
|
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
void SwXFrame::addPropertyChangeListener(const OUString& /*PropertyName*/,
|
|
|
|
const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_FAIL("not implemented");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
void SwXFrame::removePropertyChangeListener(const OUString& /*PropertyName*/,
|
|
|
|
const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_FAIL("not implemented");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
void SwXFrame::addVetoableChangeListener(const OUString& /*PropertyName*/,
|
|
|
|
const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_FAIL("not implemented");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SwXFrame::removeVetoableChangeListener(
|
2007-09-27 08:36:43 +00:00
|
|
|
const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_FAIL("not implemented");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName )
|
|
|
|
throw(beans::UnknownPropertyException, uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< OUString > aPropertyNames(1);
|
2000-09-18 23:08:29 +00:00
|
|
|
OUString* pNames = aPropertyNames.getArray();
|
|
|
|
pNames[0] = rPropertyName;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< beans::PropertyState > aStates = getPropertyStates(aPropertyNames);
|
2000-09-18 23:08:29 +00:00
|
|
|
return aStates.getConstArray()[0];
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
|
|
|
|
const uno::Sequence< OUString >& aPropertyNames )
|
|
|
|
throw(beans::UnknownPropertyException, uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< beans::PropertyState > aStates(aPropertyNames.getLength());
|
|
|
|
beans::PropertyState* pStates = aStates.getArray();
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
const OUString* pNames = aPropertyNames.getConstArray();
|
|
|
|
const SwAttrSet& rFmtSet = pFmt->GetAttrSet();
|
|
|
|
for(int i = 0; i < aPropertyNames.getLength(); i++)
|
|
|
|
{
|
2012-01-05 21:30:06 +00:00
|
|
|
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]);
|
2009-06-03 11:26:39 +00:00
|
|
|
if (!pEntry)
|
2013-03-19 09:22:44 +01:00
|
|
|
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
|
2001-11-28 19:13:57 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
if(pEntry->nWID == FN_UNO_ANCHOR_TYPES||
|
|
|
|
pEntry->nWID == FN_PARAM_LINK_DISPLAY_NAME||
|
|
|
|
FN_UNO_FRAME_STYLE_NAME == pEntry->nWID||
|
|
|
|
FN_UNO_GRAPHIC_U_R_L == pEntry->nWID||
|
|
|
|
FN_UNO_GRAPHIC_FILTER == pEntry->nWID||
|
|
|
|
FN_UNO_ACTUAL_SIZE == pEntry->nWID||
|
|
|
|
FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID)
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
pStates[i] = beans::PropertyState_DIRECT_VALUE;
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
|
|
|
{
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
if ((eType == FLYCNTTYPE_GRF) &&
|
|
|
|
pEntry && isGRFATR(pEntry->nWID))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
SfxItemSet aSet(pNoTxt->GetSwAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
aSet.GetItemState(pEntry->nWID);
|
2011-01-17 15:06:54 +01:00
|
|
|
if(SFX_ITEM_SET == aSet.GetItemState( pEntry->nWID, sal_False ))
|
2000-09-18 23:08:29 +00:00
|
|
|
pStates[i] = beans::PropertyState_DIRECT_VALUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
if(SFX_ITEM_SET == rFmtSet.GetItemState( pEntry->nWID, sal_False ))
|
2000-09-18 23:08:29 +00:00
|
|
|
pStates[i] = beans::PropertyState_DIRECT_VALUE;
|
|
|
|
else
|
|
|
|
pStates[i] = beans::PropertyState_DEFAULT_VALUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(IsDescriptor())
|
|
|
|
{
|
|
|
|
for(int i = 0; i < aPropertyNames.getLength(); i++)
|
2007-06-05 16:33:19 +00:00
|
|
|
pStates[i] = beans::PropertyState_DIRECT_VALUE;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aStates;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(beans::UnknownPropertyException, uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
2012-01-05 21:30:06 +00:00
|
|
|
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
|
2009-06-03 11:26:39 +00:00
|
|
|
if (!pEntry)
|
2013-03-19 09:22:44 +01:00
|
|
|
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2009-06-03 11:26:39 +00:00
|
|
|
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
|
2013-06-29 21:24:12 +02:00
|
|
|
throw uno::RuntimeException("setPropertyToDefault: property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2001-10-16 10:58:14 +00:00
|
|
|
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bNextFrame;
|
2009-06-03 11:26:39 +00:00
|
|
|
if( pEntry->nWID &&
|
|
|
|
pEntry->nWID != FN_UNO_ANCHOR_TYPES &&
|
|
|
|
pEntry->nWID != FN_PARAM_LINK_DISPLAY_NAME)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
CWS-TOOLING: integrate CWS odfmetadata2
2009-06-22 11:48:36 +0200 mst r273206 : - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx:
+ add "include ustrbuf.hxx" to work around warning caused by
solaris <sys/kstat.h> declaring a global "long l ;"
2009-06-19 14:25:25 +0200 mst r273159 : - scp2/source/ooo/file_library_ooo.scp:
+ fix MinGW build
2009-06-08 12:52:33 +0200 mst r272727 : - redland/raptor-1.4.18.patch.mingw, redland/raptor/makefile.mk:
+ disable parsers that do not build on MinGW (thanks for patch by tono)
2009-05-15 17:31:07 +0200 mst r271957 : fix typos
2009-05-15 17:28:57 +0200 mst r271956 : #i101965#
- offapi/com/sun/star/text/TextPortion:
+ add missing properties:
SoftPageBreak, DocumentIndexMark, ReferenceMark, Footnote, TextField
+ fix read-only status of properties: Bookmark, IsStart, IsCollapsed
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
2009-05-07 14:41:38 +0200 mst r271669 : - sw/inc/{fmtftn.hxx,unocoll.hxx,doc.hxx,editsh.hxx,ftninfo.hxx},
sw/source/core/layout/{flowfrm.cxx,ftnfrm.cxx},
sw/source/core/doc/docftn.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/txtnode/atrftn.cxx, sw/source/core/unocore/unocoll.cxx,
sw/source/ui/fldui/fldref.cxx:
+ fix warning ... the hard way
+ also fix signature of SwDoc::SetCurFtn
2009-05-05 19:52:55 +0200 mst r271556 : - sw/inc/undobj.hxx:
+ make some members const
2009-05-05 19:34:40 +0200 mst r271555 : - sw/inc/rolbck.hxx, sw/source/core/undo/rolbck.cxx:
+ make some members const
2009-05-05 19:13:14 +0200 mst r271553 : - sw/inc/{undobj.hxx,rolbck.hxx},
sw/source/core/undo/{unbkmk.cxx,rolbck.cxx}:
+ fix rebase merge error
+ rename SwHstryBookmark to SwHistoryBookmark
+ clean up SwUndoBookmark
2009-05-05 19:05:53 +0200 mst r271552 : - sw/source/core/unocore/unoportenum.cxx:
+ fix annoying assertion
2009-05-05 15:34:48 +0200 mst r271522 : CWS-TOOLING: rebase CWS odfmetadata2 to trunk@271427 (milestone: DEV300:m47)
2009-05-04 12:37:01 +0200 mst r271444 : trivial
2009-04-22 13:30:37 +0200 mst r271102 : - sfx2/inc/sfx2/dinfdlg.hxx:
+ trivial change
2009-04-21 16:46:58 +0200 mst r271043 : - sw/inc/hintids.hxx:
+ introduce some predicates for the various hints, and use them
2009-04-21 16:19:03 +0200 mst r271041 : - sw/inc/undobj.hxx,
sw/source/core/doc/{docfly.cxx,docfmt.cxx,docftn.cxx,doctxm.cxx},
sw/source/core/undo/{unattr.cxx,unins.cxx}:
+ clean up unattr.cxx:
remove/fix casts, prefix members, use auto_ptr, etc.
2009-04-21 15:34:23 +0200 mst r271039 : - sw/inc/{rolbck.hxx,undobj.hxx},
sw/source/core/doc/docfmt.cxx,
sw/source/core/txtnode/{thints.cxx,txtedt.cxx},
sw/source/core/undo/{rolbck.cxx,undel.cxx,undobj.cxx,unins.cxx,unmove.cxx,
unovwr.cxx,unsect.cxx,unspnd.cxx,untbl.cxx,untblk.cxx,unattr.cxx}:
+ clean up SwHistory, SwRegHistory and SwHistoryHint etc.:
remove/fix casts, prefix members, remove wrong const annotations,
use auto_ptr, remove unused members, etc.
2009-04-20 19:17:36 +0200 mst r271013 : - sw/inc/ndhints.hxx,
sw/source/core/text/{itrtxt.cxx,txtftn.cxx,itratr.cxx,porfly.cxx,
txtfrm.cxx,txtdrop.cxx,frmform.cxx},
sw/source/core/txtnode/{ndtxt.cxx,ndhints.cxx,thints.cxx,txtedt.cxx},
sw/source/core/edit/acorrect.cxx,
sw/source/core/doc/{docedt.cxx,docfmt.cxx},
sw/source/filter/html/swhtml.cxx:
+ clean up SwHintsArray and its subclasses: remove/fix casts, prefix members
2009-04-20 18:42:07 +0200 mst r271007 : - sw/source/core/text/txtio.cxx, sw/source/core/edit/edattr.cxx,
sw/source/core/undo/rolbck.cxx:
+ remove JP_NEWCORE dead code
2009-04-20 18:38:09 +0200 mst r271006 : - sw/source/core/unocore/unochart.cxx:
+ silence unxlngi warning (debug=t)
2009-04-20 16:36:13 +0200 mst r270991 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx, sw/source/ui/fldui/flddinf.hxx:
+ trivial cleanups
2009-04-20 15:28:52 +0200 mst r270990 : - sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx,
sfx2/source/doc/objserv.cxx:
+ fix bug: replaying a macro with a DocumentInfoItem removes all
user-defined properties
2009-03-10 15:08:20 +0100 mst r269273 : - sfx2/source/doc/Metadatable.cxx:
+ add missing SolarMutex guards
2009-03-10 14:46:29 +0100 mst r269272 : - unoxml/source/rdf/librdf_repository.cxx:
+ never free rdf_world because that would call libxm2 xmlCleanupParser
(and, to add insult to injury, other libxml2 functions later...)
2009-03-06 19:02:44 +0100 mst r269041 : argh! undo...
2009-03-06 19:00:58 +0100 mst r269040 : fix #i99931#
- sw/source/ui/uno/unomod.cxx:
+ SwXViewSettings::_getSingleValue returns uninitialized memory
for the ZoomType property if the value is PAGE_WIDTH_EXACT
2009-03-06 18:59:28 +0100 mst r269039 : - sw/inc/ndtxt.hxx, sw/source/core/txtnode/ndtxt.cxx,
sw/source/core/unocore/unoportenum.cxx:
+ fix some more wntmsci12 warnings...
2009-03-06 18:56:46 +0100 mst r269038 : - sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx:
+ work around spurious warning on unxsoli4 debug=t
2009-03-05 14:02:01 +0100 mst r268902 : - sw/inc/txatbase.hxx:
+ back to c-style casts, they also compile on wntmsci12...
2009-03-05 10:23:25 +0100 mst r268882 : - comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ revert change of return type of comphelper_getProcessComponentContext
to Reference: does not build on wntmsci12
2009-03-04 19:08:09 +0100 mst r268861 : - sw/source/core/txtnode/{atrtox.cxx,ndtxt.cxx}:
+ fix initialization
2009-03-04 14:37:30 +0100 mst r268831 : - solenv/inc/target.mk:
+ fix CLASSPATH so complex tests run (fix by sb)
2009-03-04 14:36:30 +0100 mst r268830 : - sw/inc/unoobj.hxx,
sw/source/core/unocore/{unoparagraph.cxx,unoobj.cxx,unoobj2.cxx}:
+ SwXParaFrameEnumeration constructor now takes SwPaM, not SwUnoCrsr
+ move SwParaSelection into unoparagraph.cxx, as it is only used there
+ bugfix: replace SwUnoCrsrs on stack with SwCursors
2009-03-04 14:34:46 +0100 mst r268829 : - sw/inc/pam.hxx, sw/source/core/crsr/pam.cxx,
sw/source/core/edit/eddel.cxx, sw/source/core/doc/docredln.cxx,
sw/source/core/undo/{untbl.cxx,undel.cxx}, sw/source/filter/rtf/swparrtf.cxx:
+ clean up SwPaM: prefix members
+ new constructor SwPosition(SwCntntNode&, xub_StrLen)
+ fix several broken SwPosition and SwPaM constructors
+ SwPam::DeleteMark now actually resets the unused position to default
2009-03-02 12:07:09 +0100 mst r268646 : - sw/inc/fmtcol.hxx:
+ fix annoying warning (gcc 4)
2009-03-02 12:06:27 +0100 mst r268645 : - odk/util/check.pl, odk/examples/DevelopersGuide/Text/TextDocuments.java:
+ rename module from FieldMaster to fieldmaster
2009-02-27 19:49:56 +0100 mst r268614 : - sfx2/inc/sfx2/Metadatable.hxx, sfx2/prj/d.lst,
sfx2/source/doc/{Metadatable.cxx,makefile.mk},
sw/inc/{SwMetadatable.hxx,unoobj.hxx,undobj.hxx,ndtxt.hxx},
sw/source/core/doc/{SwMetadatable.cxx,makefile.mk,docnew.cxx},
sw/source/core/undo/{untbl.cxx,unins.cxx},
sw/source/core/unocore/unoparagraph.cxx, sw/source/ui/app/docsh.cxx:
+ move Metadatable implementation from sw to sfx2
2009-02-27 17:58:55 +0100 mst r268608 : - sw/inc/{SwMetadatable.hxx,undobj.hxx}, sw/source/core/doc/SwMetadatable.cxx,
sw/source/core/undo/{untbl.cxx,unins.cxx,undel.cxx}:
+ CreateUndo now returns an opaque MetadatableUndo object
2009-02-27 13:15:44 +0100 mst r268587 : - sw/inc/ndtxt.hxx, sw/source/core/doc/docfmt.cxx,
sw/source/core/text/{itratr.cxx,porlay.cxx},
sw/source/core/txtnode/{txtedt.cxx,ndtxt.cxx,thints.cxx}:
+ clean up SwTxtNode: fix casts, prefix members
+ factor out inline function SwTxtNode::TryDeleteSwpHints()
2009-02-27 13:14:30 +0100 mst r268586 : - svx/inc/svx/emphitem.hxx:
+ fix borken header guard
2009-02-27 13:13:56 +0100 mst r268585 : - sfx2/source/bastyp/progress.cxx:
+ fix use of compiler specific macro
2009-02-27 11:00:32 +0100 mst r268564 : - sw/inc/{txatbase.hxx,txtatr.hxx,txtinet.hxx,txtfld.hxx,txtftn.hxx,
txtflcnt.hxx,txttxmrk.hxx,txtrfmrk.hxx},
sw/source/core/txtnode/{atrtox.cxx,atrref.cxx,atrflyin.cxx,atrftn.cxx,
txtatr2.cxx,txatbase.cxx,atrfld.cxx,txtedt.cxx},
sw/source/core/text/atrstck.cxx, sw/source/core/access/acchyperlink.cxx,
sw/source/core/doc/visiturl.cxx, sw/source/ui/wrtsh/wrtsh2.cxx:
+ clean up SwTxtAttr and its subclasses: remove/fix casts, prefix members
+ SwTxtINetFmt: remove unused member bColor
- sw/source/core/text/txtfld.cxx:
+ move SwTxtFld methods to atrfld.cxx
2009-02-27 10:58:44 +0100 mst r268563 : - sfx2/inc/sfx2/sfxbasemodel.hxx:
+ don't privately inherit BaseMutex, ScModelObj wants to access it
2009-02-27 10:58:02 +0100 mst r268562 : - xmloff/source/core/{RDFaExportHelper.cxx,RDFaImportHelper.cxx}:
+ arrrgh!!! someone thought it would be a good idea to have 2 different
versions of boost in external! and they're NOT compatible!!!
insert an ugly fragile hack that maybe works with both...
2009-02-26 17:42:26 +0100 mst r268544 : - comphelper/inc/comphelper/storagehelper.hxx.
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ someone made IsValidZipEntryFileName a static method and didn't tell me
2009-02-26 15:52:56 +0100 mst r268529 : redland: split up patches
2009-02-26 13:17:56 +0100 mst r268509 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
#i95863#
- sw/inc/segdefs{,_}.hxx:
+ remove obsolete files
- sw/source/ui/inc/itemdef.hxx:
+ remove itemdef.hxx
- sw/source/ui/app/[apphdl.cxx,docsh.cxx}, sw/source/ui/misc/glshell.cxx,
sw/source/ui/shells/*.cxx, sw/source/ui/uiview/*.cxx, sw/source/ui/web/*.cxx:
+ use sfx2/msg.hxx instead of itemdef.hxx
- sw/source/core/edit/eddel.cxx:
+ @ JP: SwEditShell::Replace:
you're right, deleting the text to be replaced first, and then inserting
a space, and then replacing that space is unnecessary.
whew, i'm so happy that we finally answered that question after 11 years.
- sw/inc/edimp.hxx:
+ remove FOREACHCURSOR_START, FOREACHCURSOR_END
- sw/inc/{swcrsr.hxx,unocrsr.hxx,viscrs.hxx},
sw/source/core/crsr/{crsrsh.cxx,swcrsr.cxx,trvlreg.cxx,trvltbl.cxx,
unocrsr.cxx,viscrs.cxx},
sw/source/core/doc/{docbm.cxx,doccorr.cxx},
sw/source/core/docnode/{ndtbl.cxx,ndtbl1.cxx},
sw/source/core/edit/editsh.cxx,
sw/source/core/frmedt/{fefly1.cxx,fetab.cxx,tblsel.cxx},
sw/source/core/layout/trvlfrm.cxx,
sw/source/core/unocore/{unochart.cxx,unoobj2.cxx,unoparagraph.cxx,
unoportenum.cxx,unotbl.cxx},
sw/source/core/view/vprint.cxx:
+ remove the hideous virtual operator SwFooCursor*
+ make SwCursor::IsReadOnlyAvailable() virtual
+ make SwUnoCrsr::Clone() virtual
+ refactor SwCursor methods IsSelOver(), LeftRight(), UpDown(), GotoTable():
replace dynamic_cast<...>(this) with new virtual methods
2009-02-26 13:14:58 +0100 mst r268508 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
- sw/source/filter/xml/swxml.cxx:
+ XMLReader::Read: load RDF metadata of the ODF document
- sw/source/filter/xml/wrtxml.cxx:
+ SwXMLWriter::_Write: write RDF metadata of the ODF document if ODF >= 1.2
#i90620#: import xml:id in text tables (does not actually work yet)
- sw/source/filter/xml/xmltbli{.hxx,.cxx}:
+ SwXMLTableCellAttrTokens,aTableCellAttrTokenMap: add XML_TOK_TABLE_XMLID
+ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl: attribute xml:id
+ SwXMLTableCellContext_Impl::CreateChildContext: attribute xml:id
+ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl: attribute xml:id
+ SwXMLTableContext::SwXMLTableContext: attribute xml:id
fix #i98530#
- sw/inc/unoport.hxx, sw/source/core/unocore/unoport.cxx:
+ SwXTextPortion: make constructor params const&
- sw/source/core/unocore/unoportenum.cxx:
+ refactor to remove some code duplication
+ fix bug: paragraph w/out hints: bookmark before frame gets lost
#i97274# handle invalid tables
- sw/source/core/layout/tabfrm.cxx, sw/source/filter/xml/xmltbli.cxx:
+ SwXMLTableContext::MakeTable():
check that the table actually contains cells,
and abort (removing the inserted table nodes) if not
2009-02-26 13:11:48 +0100 mst r268507 : migration of cws odfmetadata2 from CVS (resync to m42): module sw
refactor SwXTextRange and SwXParagraph
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoobj2.cxx:
+ remove 3 constructors of SwXTextRange
+ new method SwXTextRange::CreateParentXText
+ refactor SwXTextRange::CreateTextRangeFromPosition and
SwXTextRange::getText
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph no longer uses a cursor; it registers directly at SwTxtNode
+ replace SwXParagraph::GetCrsr with SwXParagraph::GetTxtNode
- sw/source/core/unocore/unotext.cxx, sw/source/ui/uno/unotxvw.cxx:
+ adapt to new SwXParagraph
#i90620#
- sw/inc/SwMetadatable.hxx,
sw/source/core/doc/SwMetadatable.cxx:
+ new files: base classes sw::Metadatable and sw::MetadatableMixin;
also, 2 implementations of IXmlIdRegistry:
sw::XmlIdRegistryDocument and sw::XmlIdRegistryClipboard
+ setMetadataReference: handle empty stream name as auto-detect
- sw/source/core/doc/makefile.mk:
+ add SwMetadatable
add a XmlIdRegistry to SwDoc
- sw/inc/doc.hxx:
+ SwDoc: add member m_pXmlIdRegistry, method GetXmlIdRegistry()
- sw/source/core/doc/docnew.cxx:
+ initialize XmlIdRegistry in SwDoc::GetXmlIdRegistry, not in constructor,
because the constructor is not told whether the SwDoc is a clipboard
- sw/inc/docsh.hxx, sw/source/ui/app/docsh.cxx:
+ SwDocShell: override GetXmlIdRegistry()
#i91563#: make the SwTxtNode metadatable
- sw/inc/ndtxt.hxx
+ SwTxtNode inherits sw::Metadatable
- sw/inc/unoobj.hxx, sw/source/core/unocore/unoparagraph.cxx:
+ SwXParagraph inherits sw::MetadatableMixin
#i91563#: handle SwTxtNode's metadata for delete
- sw/source/core/txtnode/ndtxt.cxx:
+ SwTxtNode::SplitCntntNode: handle XmlId
+ SwTxtNode::JoinNext: merge XmlIds
- sw/source/core/doc/docedt.cxx:
+ lcl_GetJoinFlags: document postcondition
+ SwDoc::Delete: remove XmlId only if SwTxtNode _becomes_ empty
#i91563#: handle SwTxtNode's metadata for delete with undo
- sw/inc/undobj.hxx
+ SwUndoDelete: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
- sw/source/core/undo/undel.cxx:
+ SwUndoDelete::SaveCntnt: save XmlIds for start and end SwTxtNode
+ SwUndoDelete::SaveCntnt: remove XmlId only if SwTxtNode _becomes_ empty
+ SwUndoDelete::Undo: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndcopy.cxx:
+ SwTxtNode::MakeCopy: register copy at XmlIdRegistry
#i91563#: handle SwTxtNode's metadata for find/replace with undo
- sw/source/core/undo/unins.cxx:
+ _UnReplaceData: rename members: add prefix m_
+ _UnReplaceData: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ _UnReplaceData::_UnReplaceData: save XmlIds for start and end SwTxtNode
+ _UnReplaceData::Undo: restore saved XmlIds for start and end SwTxtNode
#i91563#: handle SwTxtNode's metadata for table-to-text with undo
- sw/source/core/undo/untbl.cxx:
+ SwTblToTxtSave: rename members: add prefix m_
+ SwTblToTxtSave: new members m_pMetadataUndoStart, m_pMetadataUndoEnd
+ SwTblToTxtSave::SwTblToTxtSave: save XmlIds for start and end SwTxtNode
+ SwTblToTxtSave::SwTblToTxtSave, SwNodes::UndoTableToText:
always store the index of the first SwTxtNode in the cell, instead of
the index of the first SwTxtNode in case of the first cell in a row,
and the cell start node in other cases
+ SwNodes::UndoTableToText: restore saved XmlIds for start and end SwTxtNode
- sw/source/core/docnode/ndtbl.cxx:
+ lcl_DelBox: simplify for refactored start index handling in SwTblToTxtSave
2009-02-26 13:02:28 +0100 mst r268505 : migration of cws odfmetadata2 from CVS (resync to m42): module sd
- sd/source/ui/table/tableobjectbar.cxx,sd/source/ui/view/*.cxx:
+ remove invocations of SFX_DECL_TYPE
- sd/source/ui/slideshow/SlideShowRestarter.cxx,
sd/source/ui/toolpanel/LayoutMenu.cxx,
sd/source/ui/unoidl/DrawController.cxx,
sd/source/ui/view/{ViewShellBase.cxx,ViewTabBar.cxx,frmview.cxx}:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
2009-02-26 13:01:24 +0100 mst r268504 : migration of cws odfmetadata2 from CVS (resync to m42): module starmath
- starmath/source/document.cxx:
+ don't touch SfxObjectShell's privates
2009-02-26 13:00:37 +0100 mst r268503 : migration of cws odfmetadata2 from CVS (resync to m42): module sfx2
#i90620#
- sfx2/inc/sfx2/XmlIdRegistry.hxx:
+ new file: interfaces sfx2::IXmlIdRegistry and sfx2::IXmlIdRegistrySupplier
and a couple of utility functions
- sfx2/inc/sfx2/DocumentMetadataAccess.hxx,
sfx2/source/doc/DocumentMetadataAccess.cxx:
+ new class sfx2::DocumentMetadataAccess, implements XDocumentMetadataAccess
+ the URI of the DocumentMetadataAccess is now the URI from which the
document was loaded; for a new document, use a vnd.sun.star.tdoc URI
+ add new function sfx2::createBaseURI()
+ prevent using reserved file names
+ try not to recurse into embedded subdocuments
- sfx2/source/doc/makefile.mk:
+ add DocumentMetadataAccess
- sfx2/util/makefile.mk:
+ link libsfx2 against libxml2 (needed for xmlValidateNCName)
- sfx2/source/doc/makefile.mk:
+ add LIBXML_CFLAGS to CFLAGS
- sfx2/prj/build.lst:
+ add dependence on libxml2
- sfx2/prj/d.lst:
+ add XmlIdRegistry.hxx, DocumentMetadataAccess.hxx
- sfx2/inc/sfx2/objsh.hxx, sfx2/source/doc/objxtor.cxx:
+ make SfxObjectShell's members private
+ new method SfxObjectShell::GetAutoStyleFilterIndex
+ SfxObjectShell inherits sfx2::IXmlIdRegistrySupplier
- sfx2/source/dialog/templdlg.cxx, sfx2/source/doc/sfxbasemodel.cxx:
+ don't touch SfxObjectShell's privates
- sfx2/inc/sfx2/sfxbasemodel.hxx, sfx2/source/doc/sfxbasemodel.cxx:
+ SfxBaseModel inherits BaseMutex instead of IMPL_SfxBaseModel_MutexContainer
+ SfxBaseModel implements additional interface XDocumentMetadataAccess
+ IMPL_SfxBaseModel_DataContainer has new member:
a sfx2::DocumentMetadataAccess
+ implementation of XDocumentMetadataAccess forwards to
the sfx2::DocumentMetadataAccess member
- sfx2/qa/complex/DocumentMetadataAccessTest.java,
sfx2/qa/complex/{tests.sce,makefile.mk},
sfx2/qa/complex/testdocuments/TESTRDFA.odt:
+ add complex test: DocumentMetadataAccessTest
+ add RDFa test document
#i95863#
- sfx2/inc/sfx2/dinfdlg.hxx, sfx2/source/dialog/dinfdlg.cxx:
+ refactor SfxDocumentItem so it no longer requires a XDocumentInfo
+ move struct CustomProperty to implementation file
+ remove class SfxDocumentUserPage
+ QueryValue,PutValue: remove MID_DOCINFO_FIELD*
- sfx2/source/doc/objserv.cxx:
+ adapt to SfxDocumentItem change
- sfx2/inc/sfx2/sfx.hrc, sfx2/sdi/sfxslots.sdi, sfx2/inc/sfx2/msg.hxx:
+ remove MID_DOCINFO_FIELD*
+ put all invocations of SFX_DECL_TYPE in msg.hxx, and undef SFX_DECL_TYPE
- sfx2/source/doc/objxtor.cxx:
+ fix abuses of comphelper_getProcessComponentContext (missing release)
- sfx2/source/doc/docfile.cxx:
+ SfxMedium::SfxMedium: don't dereference NULL, throw exception instead
- sfx2/source/doc/objstor.cxx:
+ SfxObjectShell::DoLoad: fix bug: DocumentBaseURI is not initialized
2009-02-26 12:58:07 +0100 mst r268502 : migration of cws odfmetadata2 from CVS (resync to m42): module xmloff
#i90620#: implement RDFa import (interface change)
- xmloff/inc/xmloff/xmlimp.hxx. xmloff/source/core/xmlimp.cxx:
+ make SvXMLImport::GetAbsoluteReference() const
+ add SvXMLImport::GetComponentContext()
+ SvXMLImport::_InitCtor(): add RDFa namespace
+ add SvXMLImport::AddRDFa()
+ SvXMLImport::endDocument() inserts RDFa into document repository
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
+ new tokens for RDFa: XML_ABOUT, XML_DATATYPE
- xmloff/inc/RDFaImportHelper.hxx, xmloff/source/core/RDFaImportHelper.cxx:
+ new class RDFaImportHelper
+ adapt the code to the bleak reality of broken C++ implementations
+ handle empty xhtml:about attributes properly, which are actually
valid relative URIs
+ work around broken SvXMLImport::GetAbsoluteReference
- xmloff/source/core/makefile.mk:
+ add RDFaImportHelper.cxx
#i90620#: implement RDFa export
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ add SvXMLExport::EnsureNamespace(), and a stack of namespace maps
+ add SvXMLExport::GetComponentContext()
+ add SvXMLExport::AddAttributesRDFa()
- xmloff/inc/RDFaExportHelper.hxx, xmloff/source/core/RDFaExportHelper.cxx:
+ new class RDFaExportHelper
+ don't use std::map::data_type, which is actually called
std::map::mapped_type by libstdc++
- xmloff/source/core/makefile.mk:
+ add RDFaExportHelper.cxx
#i91563#
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
+ XMLTextPAttrTokens: add RDFa tokens
- xmloff/source/text/txtparai{.hxx,.cxx}:
+ import RDFa for text:p
- xmloff/source/text/txtparae.cxx:
+ export RDFa for text:p
interface change: use XHTML namespace instead of RDFA
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlimp.cxx,xmlexp.cxx,RDFaExportHelper.cxx},
xmloff/source/text/txtimp.cxx:
+ use XHTML namespace instead of RDFA
#i91565#, #i91566#: (preliminary) import for text:meta, text:meta-field
- xmloff/source/text/txtparai.cxx:
+ new class XMLMetaImportContextBase with subclasses to import
text:meta and text:meta-field
- xmloff/source/text/XMLTextMarkImportContext.cxx:
+ change XMLTextMarkImportContext::CreateAndInsertMark to handle marks
with no name (text:meta)
#i91565#, #i91566#: (preliminary) export for text:meta, text:meta-field
- xmloff/inc/txtflde.hxx, xmloff/source/text/txtflde.cxx:
+ add FIELD_ID_META to FieldIdEnum
+ new method XMLTextFieldExport::ExportMetaField()
+ change XMLTextFieldExport::ExportField{,AutoStyle,Helper}
to take additional parameter for progress bar
- xmloff/inc/xmloff/txtparae.hxx, xmloff/source/text/txtparae.cxx:
+ make XMLTextParagraphExport::exportTextRangeEnumeration() public
+ new method XMLTextParagraphExport::exportMeta()
#i90620#
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,
xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
+ rename SvXML{Im,Ex}port::GetStreamPath() to GetStreamName()
+ fix xml:id {im,ex}port for embedded documents and non-packages
+ adapt to API change: XMetadatable
#i90620# GRDDL
- xmloff/inc/xmlnmspe.hxx, xmloff/inc/xmloff/xmltoken.hxx,
xmloff/source/core/{xmltoken.cxx,xmlexp.cxx}:
+ add GRDDL namespace
+ add token XML_TRANSFORMATION
+ add grddl:transformation attribute to root elements for meta.xml,
content.xml and styles.xml
2009-02-26 12:54:40 +0100 mst r268501 : migration of cws odfmetadata2 from CVS (resync to m42): module unoxml
#i90620#
- unoxml/source/rdf/librdf_repository.cxx:
+ librdf_Repository::importGraph: allocate buffer sized length of stream
+ switch from one librdf_world per repository to a single static world
because redland has global variables with a brain-damaged life-cycle...
+ exportGraph: use new raptor 1.4.18 feature to disable writing
an xml:base attribute in RDF/XML files
- unoxml/source/rdf/librdf_repository.cxx:
unoxml/qa/complex/RDFRepositoryTest.java:
+ adapt to predicate is URI change
+ adapt to RDFa API change
+ adapt to API change: RDFa has multiple predicates...
+ adapt to API change: XMetadatable derives from XURI
+ allow xhtml:datatype without xhtml:content
+ adapt to API change: attribute MetadataReference is StringPair
- unoxml/source/rdf/CURI.cxx:
+ add some more URI constants
2009-02-26 12:53:32 +0100 mst r268500 : migration of cws odfmetadata2 from CVS (resync to m42): module package
- package/inc/ImplValidCharacters.hxx:
+ remove (moved to comphelper)
2009-02-26 12:52:49 +0100 mst r268499 : migration of cws odfmetadata2 from CVS (resync to m42): module comphelper
- comphelper/inc/comphelper/processfactory.hxx,
comphelper/source/processfactory/processfactory.cxx:
+ add getProcessComponentContext()
+ change return type of comphelper_getProcessComponentContext to Reference
- comphelper/inc/comphelper/stl_types.hxx:
+ add OUStringBufferAppender
+ add algorithm intersperse
- comphelper/source/misc/string.cxx:
+ rewrite convertCommaSeparated with intersperse and OUStringBufferAppender
- comphelper/inc/comphelper/stlunosequence.hxx:
+ fix bug: begin() on empty sequence != end()
2009-02-26 12:50:47 +0100 mst r268498 : migration of cws odfmetadata2 from CVS (resync to m42): module offapi
#i96209#
- offapi/com/sun/star/text/fieldmaster/*.idl:
+ rename module from FieldMaster to fieldmaster
- offapi/type_reference/{typelibrary_history.txt,types.rdb}:
+ update reference types.rdb
#i90620#
- offapi/com/sun/star/rdf/{XMetadatable.idl,XDocumentMetadataAccess.idl}:
+ API change: XMetadatable derives from XURI
+ API change: replace XmlId (string) with MetadataReference (StringPair)
- offapi/com/sun/star/rdf/{Statement.idl,XDocumentRepository.idl,
XNamedGraph.idl,XRepository.idl}:
+ the predicate of a statement is a URI, not a Resource
- offapi/com/sun/star/rdf/XDocumentMetadataAccess.idl:
+ rename: s/Package/Document/
+ remove uuid
+ remove everything related to mapping
+ graph names are now generated from base URI and file names
+ load methods: improve error handling with XInteractionHandler
- offapi/com/sun/star/rdf/XDocumentRepository.idl:
+ change: RDFa permits using multiple predicates in one attribute
+ setStatementRDFa: subject is now XResource, object is now XMetadatable
- offapi/com/sun/star/rdf/URIs.idl:
+ add some more URI constants
- offapi/com/sun/star/rdf:
+ fix @since tags and replace <method> with <member>
2009-02-26 12:47:24 +0100 mst r268497 : migration of cws odfmetadata2 from CVS (resync to m42): module redland
fix #i93768#
- redland/raptor-1.4.17.patch, redland/raptor/makefile.mk:
+ disable GRDDL parser to prevent call to libxslt
xsltSetDefaultSecurityPrefs, which breaks xmlhelp
- redland/raptor/makefile.mk, redland/raptor-1.4.17.patch,
redland/raptor-1.4.18.patch:
+ upgrade raptor to 1.4.18
+ deactivate serializer for RSS/Atom (does not build)
- redland/rasqal/makefile.mk, redland/rasqal-0.9.15.patch,
redland/rasqal-0.9.16.patch,
+ upgrade rasqal to 0.9.16
- redland/redland/makefile.mk, redland/redland-1.0.7.patch,
redland/redland-1.0.8.patch:
+ upgrade redland to 1.0.8
- redland/redlandversion.mk:
+ the librasqal SONAME has changed
2009-07-02 09:05:03 +00:00
|
|
|
if ( (eType == FLYCNTTYPE_GRF) && isGRFATR(pEntry->nWID) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
{
|
|
|
|
SfxItemSet aSet(pNoTxt->GetSwAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
aSet.ClearItem(pEntry->nWID);
|
2000-09-18 23:08:29 +00:00
|
|
|
pNoTxt->SetAttr(aSet);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-04-16 22:42:13 -03:00
|
|
|
// #i73249#
|
2009-08-27 11:59:20 +00:00
|
|
|
// Attribute AlternativeText was never published.
|
|
|
|
// Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
|
|
|
|
// else if( eType != FLYCNTTYPE_FRM && FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID )
|
|
|
|
// {
|
|
|
|
// const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
// if(pIdx)
|
|
|
|
// {
|
|
|
|
// SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
// SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
2013-10-16 11:18:56 +02:00
|
|
|
// pNoTxt->SetAlternateText(aEmptyOUStr);
|
2009-08-27 11:59:20 +00:00
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// New attribute Title
|
|
|
|
else if( FN_UNO_TITLE == pEntry->nWID )
|
2008-01-29 08:23:32 +00:00
|
|
|
{
|
2009-08-27 11:59:20 +00:00
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
2013-10-16 11:18:56 +02:00
|
|
|
pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), aEmptyOUStr );
|
2008-01-29 08:23:32 +00:00
|
|
|
}
|
2009-08-27 11:59:20 +00:00
|
|
|
// New attribute Description
|
|
|
|
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
|
|
|
|
{
|
|
|
|
SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt,
|
2009-08-27 11:59:20 +00:00
|
|
|
"unexpected type of <pFmt> --> crash" );
|
|
|
|
// assure that <SdrObject> instance exists.
|
|
|
|
GetOrCreateSdrObject( pFlyFmt );
|
2013-10-16 11:18:56 +02:00
|
|
|
pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), aEmptyOUStr );
|
2009-08-27 11:59:20 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
SfxItemSet aSet( pDoc->GetAttrPool(),
|
|
|
|
RES_FRMATR_BEGIN, RES_FRMATR_END - 1 );
|
|
|
|
aSet.SetParent(&pFmt->GetAttrSet());
|
2009-06-03 11:26:39 +00:00
|
|
|
aSet.ClearItem(pEntry->nWID);
|
2001-06-13 11:03:44 +00:00
|
|
|
if(!rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_ANCHOR_TYPE)))
|
2008-06-13 09:31:31 +00:00
|
|
|
pFmt->SetFmtAttr(aSet);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
2001-06-13 11:03:44 +00:00
|
|
|
else if(0 != (bNextFrame = (rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_NEXT_NAME))))
|
|
|
|
|| rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_CHAIN_PREV_NAME)))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
if(bNextFrame)
|
|
|
|
pDoc->Unchain(*pFmt);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SwFmtChain aChain( pFmt->GetChain() );
|
|
|
|
SwFrmFmt *pPrev = aChain.GetPrev();
|
|
|
|
if(pPrev)
|
|
|
|
pDoc->Unchain(*pPrev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(!IsDescriptor())
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
|
|
|
|
throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Any aRet;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
2012-01-05 21:30:06 +00:00
|
|
|
const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
|
2009-06-03 11:26:39 +00:00
|
|
|
if(pEntry)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
if ( pEntry->nWID < RES_FRMATR_END )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
const SfxPoolItem& rDefItem =
|
2009-06-03 11:26:39 +00:00
|
|
|
pFmt->GetDoc()->GetAttrPool().GetDefaultItem(pEntry->nWID);
|
|
|
|
rDefItem.QueryValue(aRet, pEntry->nMemberId);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2013-03-19 09:22:44 +01:00
|
|
|
throw beans::UnknownPropertyException(OUString( "Unknown property: " ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else if(!IsDescriptor())
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRet;
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2013-02-02 22:56:20 +01:00
|
|
|
void SAL_CALL SwXFrame::addEventListener(
|
|
|
|
const uno::Reference<lang::XEventListener> & xListener)
|
|
|
|
throw (uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-02-02 22:56:20 +01:00
|
|
|
// no need to lock here as m_pImpl is const and container threadsafe
|
|
|
|
m_pImpl->m_EventListeners.addInterface(xListener);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2013-02-02 22:56:20 +01:00
|
|
|
void SAL_CALL SwXFrame::removeEventListener(
|
|
|
|
const uno::Reference<lang::XEventListener> & xListener)
|
|
|
|
throw (uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-02-02 22:56:20 +01:00
|
|
|
// no need to lock here as m_pImpl is const and container threadsafe
|
|
|
|
m_pImpl->m_EventListeners.removeInterface(xListener);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
void SwXFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
ClientModify(this, pOld, pNew);
|
|
|
|
if(!GetRegisteredIn())
|
2001-10-15 09:06:21 +00:00
|
|
|
{
|
|
|
|
mxStyleData.clear();
|
|
|
|
mxStyleFamily.clear();
|
2009-06-03 11:26:39 +00:00
|
|
|
m_pDoc = 0;
|
2013-02-02 22:56:20 +01:00
|
|
|
lang::EventObject const ev(static_cast< ::cppu::OWeakObject&>(*this));
|
|
|
|
m_pImpl->m_EventListeners.disposeAndClear(ev);
|
2001-10-15 09:06:21 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXFrame::dispose(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
2003-09-29 14:05:47 +00:00
|
|
|
if ( pFmt )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2003-05-08 07:50:57 +00:00
|
|
|
SdrObject* pObj = pFmt->FindSdrObject();
|
2003-09-29 14:05:47 +00:00
|
|
|
// OD 11.09.2003 #112039# - add condition to perform delete of
|
|
|
|
// format/anchor sign, not only if the object is inserted, but also
|
|
|
|
// if a contact object is registered, which isn't in the destruction.
|
|
|
|
if ( pObj &&
|
|
|
|
( pObj->IsInserted() ||
|
|
|
|
( pObj->GetUserCall() &&
|
|
|
|
!static_cast<SwContact*>(pObj->GetUserCall())->IsInDTOR() ) ) )
|
2003-05-08 07:50:57 +00:00
|
|
|
{
|
2010-01-05 16:37:41 +01:00
|
|
|
if (pFmt->GetAnchor().GetAnchorId() == FLY_AS_CHAR)
|
2003-05-22 07:44:15 +00:00
|
|
|
{
|
|
|
|
const SwPosition &rPos = *(pFmt->GetAnchor().GetCntntAnchor());
|
|
|
|
SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
|
2013-11-12 00:46:22 +01:00
|
|
|
const sal_Int32 nIdx = rPos.nContent.GetIndex();
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
pTxtNode->DeleteAttributes( RES_TXTATR_FLYCNT, nIdx, nIdx );
|
2003-05-22 07:44:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
pFmt->GetDoc()->DelLayoutFmt(pFmt);
|
2003-05-08 07:50:57 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextRange > SwXFrame::getAnchor(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextRange > aRef;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
2001-08-01 11:51:14 +00:00
|
|
|
const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
|
|
|
|
// return an anchor for non-page bound frames
|
|
|
|
// and for page bound frames that have a page no == NULL and a content position
|
2010-01-05 16:37:41 +01:00
|
|
|
if ((rAnchor.GetAnchorId() != FLY_AT_PAGE) ||
|
2001-08-01 11:51:14 +00:00
|
|
|
(rAnchor.GetCntntAnchor() && !rAnchor.GetPageNum()))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-08-01 11:51:14 +00:00
|
|
|
const SwPosition &rPos = *(rAnchor.GetCntntAnchor());
|
2010-01-08 17:13:53 +01:00
|
|
|
aRef = SwXTextRange::CreateXTextRange(*pFmt->GetDoc(), rPos, 0);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRef;
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
void SwXFrame::ResetDescriptor()
|
|
|
|
{
|
2011-01-03 20:35:28 +00:00
|
|
|
bIsDescriptor = false;
|
2001-10-15 09:06:21 +00:00
|
|
|
mxStyleData.clear();
|
|
|
|
mxStyleFamily.clear();
|
2000-09-18 23:08:29 +00:00
|
|
|
DELETEZ(pProps);
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange)
|
|
|
|
throw( lang::IllegalArgumentException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
if(!IsDescriptor())
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
|
|
|
uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
|
2000-09-18 23:08:29 +00:00
|
|
|
SwXTextRange* pRange = 0;
|
2003-04-01 14:34:01 +00:00
|
|
|
OTextCursorHelper* pCursor = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
if(xRangeTunnel.is())
|
|
|
|
{
|
2007-09-27 08:36:43 +00:00
|
|
|
pRange = reinterpret_cast< SwXTextRange * >(
|
|
|
|
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( SwXTextRange::getUnoTunnelId()) ));
|
|
|
|
pCursor = reinterpret_cast< OTextCursorHelper * >(
|
|
|
|
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SwDoc* pDoc = pRange ? (SwDoc*)pRange->GetDoc() : pCursor ? (SwDoc*)pCursor->GetDoc() : 0;
|
|
|
|
if(pDoc)
|
|
|
|
{
|
|
|
|
SwUnoInternalPaM aIntPam(*pDoc);
|
2011-01-03 20:35:28 +00:00
|
|
|
//das muss jetzt true liefern
|
2010-01-08 17:13:53 +01:00
|
|
|
::sw::XTextRangeToSwPaM(aIntPam, xTextRange);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SwNode& rNode = pDoc->GetNodes().GetEndOfContent();
|
|
|
|
SwPaM aPam(rNode);
|
|
|
|
aPam.Move( fnMoveBackward, fnGoDoc );
|
2010-12-12 10:15:19 +01:00
|
|
|
static sal_uInt16 const aFrmAttrRange[] =
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
|
|
|
|
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
|
2001-07-09 04:50:21 +00:00
|
|
|
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
|
2000-09-18 23:08:29 +00:00
|
|
|
0
|
|
|
|
};
|
2010-12-12 10:15:19 +01:00
|
|
|
static sal_uInt16 const aGrAttrRange[] =
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
SfxItemSet aGrSet(pDoc->GetAttrPool(), aGrAttrRange );
|
|
|
|
|
|
|
|
SfxItemSet aFrmSet(pDoc->GetAttrPool(), aFrmAttrRange );
|
|
|
|
//jetzt muessen die passenden Items in den Set
|
2011-01-03 20:35:28 +00:00
|
|
|
bool bSizeFound;
|
2001-10-23 16:40:05 +00:00
|
|
|
if(!pProps->AnyToItemSet( pDoc, aFrmSet, aGrSet, bSizeFound))
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2000-09-18 23:08:29 +00:00
|
|
|
//der TextRange wird einzeln behandelt
|
|
|
|
*aPam.GetPoint() = *aIntPam.GetPoint();
|
|
|
|
if(aIntPam.HasMark())
|
|
|
|
{
|
|
|
|
aPam.SetMark();
|
|
|
|
*aPam.GetMark() = *aIntPam.GetMark();
|
|
|
|
}
|
|
|
|
|
|
|
|
const SfxPoolItem* pItem;
|
2010-01-05 16:37:41 +01:00
|
|
|
RndStdIds eAnchorId = FLY_AT_PARA;
|
2011-01-03 20:35:28 +00:00
|
|
|
if(SFX_ITEM_SET == aFrmSet.GetItemState(RES_ANCHOR, false, &pItem) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-07-18 11:57:02 +00:00
|
|
|
eAnchorId = ((const SwFmtAnchor*)pItem)->GetAnchorId();
|
|
|
|
if( FLY_AT_FLY == eAnchorId &&
|
2001-03-13 14:50:56 +00:00
|
|
|
!aPam.GetNode()->FindFlyStartNode())
|
|
|
|
{
|
|
|
|
//rahmengebunden geht nur dort, wo ein Rahmen ist!
|
2010-01-05 16:37:41 +01:00
|
|
|
SwFmtAnchor aAnchor(FLY_AT_PARA);
|
2001-03-13 14:50:56 +00:00
|
|
|
aFrmSet.Put(aAnchor);
|
|
|
|
}
|
2010-01-05 16:37:41 +01:00
|
|
|
else if ((FLY_AT_PAGE == eAnchorId) &&
|
2001-03-13 14:50:56 +00:00
|
|
|
0 == ((const SwFmtAnchor*)pItem)->GetPageNum() )
|
|
|
|
{
|
|
|
|
SwFmtAnchor aAnchor( *((const SwFmtAnchor*)pItem) );
|
|
|
|
aAnchor.SetAnchor( aPam.GetPoint() );
|
|
|
|
aFrmSet.Put(aAnchor);
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2001-03-13 14:50:56 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pStyle;
|
2000-12-20 06:55:54 +00:00
|
|
|
SwFrmFmt *pParentFrmFmt = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_UNO_FRAME_STYLE_NAME, 0, pStyle))
|
2000-12-20 06:55:54 +00:00
|
|
|
pParentFrmFmt = lcl_GetFrmFmt( *pStyle, pDoc );
|
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFlyFrmFmt* pFmt = 0;
|
|
|
|
if( eType == FLYCNTTYPE_FRM)
|
|
|
|
{
|
|
|
|
UnoActionContext aCont(pDoc);
|
2007-07-18 11:57:02 +00:00
|
|
|
if(m_pCopySource)
|
|
|
|
{
|
|
|
|
SwFmtAnchor* pAnchorItem = 0;
|
|
|
|
// the frame is inserted bound to page
|
|
|
|
// to prevent conflicts if the to-be-anchored position is part of the to-be-copied text
|
2010-01-05 16:37:41 +01:00
|
|
|
if (eAnchorId != FLY_AT_PAGE)
|
2007-07-18 11:57:02 +00:00
|
|
|
{
|
|
|
|
pAnchorItem = static_cast<SwFmtAnchor*>(aFrmSet.Get(RES_ANCHOR).Clone());
|
2010-01-05 16:37:41 +01:00
|
|
|
aFrmSet.Put( SwFmtAnchor( FLY_AT_PAGE, 1 ));
|
2007-07-18 11:57:02 +00:00
|
|
|
}
|
|
|
|
|
2011-03-11 11:47:33 +01:00
|
|
|
aPam.DeleteMark(); // mark position node will be deleted!
|
|
|
|
aIntPam.DeleteMark(); // mark position node will be deleted!
|
2007-07-18 11:57:02 +00:00
|
|
|
pFmt = pDoc->MakeFlyAndMove( *m_pCopySource, aFrmSet,
|
|
|
|
0,
|
|
|
|
pParentFrmFmt );
|
|
|
|
if(pAnchorItem && pFmt)
|
|
|
|
{
|
|
|
|
pFmt->DelFrms();
|
|
|
|
pAnchorItem->SetAnchor( m_pCopySource->Start() );
|
|
|
|
SfxItemSet aAnchorSet( pDoc->GetAttrPool(), RES_ANCHOR, RES_ANCHOR );
|
|
|
|
aAnchorSet.Put( *pAnchorItem );
|
|
|
|
pDoc->SetFlyFrmAttr( *pFmt, aAnchorSet );
|
|
|
|
delete pAnchorItem;
|
|
|
|
}
|
|
|
|
DELETEZ( m_pCopySource );
|
|
|
|
}
|
|
|
|
else
|
2010-01-05 16:37:41 +01:00
|
|
|
{
|
|
|
|
pFmt = pDoc->MakeFlySection( FLY_AT_PARA, aPam.GetPoint(),
|
2000-12-20 06:55:54 +00:00
|
|
|
&aFrmSet, pParentFrmFmt );
|
2010-01-05 16:37:41 +01:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
pFmt->Add(this);
|
2013-08-18 02:26:26 +02:00
|
|
|
if(!m_sName.isEmpty())
|
|
|
|
pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
//den SwXText wecken
|
2009-06-03 11:26:39 +00:00
|
|
|
((SwXTextFrame*)this)->SetDoc( bIsDescriptor ? m_pDoc : GetFrmFmt()->GetDoc() );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else if( eType == FLYCNTTYPE_GRF)
|
|
|
|
{
|
|
|
|
UnoActionContext aCont(pDoc);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGraphicURL;
|
2013-08-22 22:41:04 +02:00
|
|
|
OUString sGraphicURL;
|
2000-11-29 13:57:24 +00:00
|
|
|
GraphicObject *pGrfObj = 0;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_UNO_GRAPHIC_U_R_L, 0, pGraphicURL))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-22 22:41:04 +02:00
|
|
|
(*pGraphicURL) >>= sGraphicURL;
|
|
|
|
if( sGraphicURL.startsWith(sPackageProtocol) )
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2001-03-02 13:08:50 +00:00
|
|
|
pGrfObj = new GraphicObject;
|
|
|
|
pGrfObj->SetUserData( sGraphicURL );
|
|
|
|
pGrfObj->SetSwapState();
|
2013-10-31 17:16:50 +02:00
|
|
|
sGraphicURL = "";
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
2013-08-22 22:41:04 +02:00
|
|
|
else if( sGraphicURL.startsWith(sGraphicObjectProtocol) )
|
2000-11-29 13:57:24 +00:00
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OString sId(OUStringToOString(
|
2013-08-22 22:41:04 +02:00
|
|
|
sGraphicURL.copy( sizeof(sGraphicObjectProtocol)-1 ),
|
2011-11-01 22:38:51 +00:00
|
|
|
RTL_TEXTENCODING_ASCII_US));
|
2000-11-29 13:57:24 +00:00
|
|
|
pGrfObj = new GraphicObject( sId );
|
2013-10-31 17:16:50 +02:00
|
|
|
sGraphicURL = "";
|
2000-11-29 13:57:24 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2007-07-18 11:57:02 +00:00
|
|
|
Graphic aGraphic;
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pGraphic;
|
2007-07-18 11:57:02 +00:00
|
|
|
if( pProps->GetProperty( FN_UNO_GRAPHIC, 0, pGraphic ))
|
|
|
|
{
|
|
|
|
uno::Reference< graphic::XGraphic > xGraphic;
|
|
|
|
(*pGraphic) >>= xGraphic;
|
|
|
|
aGraphic = Graphic( xGraphic );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2013-08-18 02:26:26 +02:00
|
|
|
OUString sFltName;
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pFilter;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_UNO_GRAPHIC_FILTER, 0, pFilter))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-08-18 02:26:26 +02:00
|
|
|
(*pFilter) >>= sFltName;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2000-12-06 10:36:14 +00:00
|
|
|
pFmt =
|
2000-12-20 06:55:54 +00:00
|
|
|
pGrfObj ? pDoc->Insert( aPam, *pGrfObj, &aFrmSet, &aGrSet,
|
|
|
|
pParentFrmFmt )
|
2007-07-18 11:57:02 +00:00
|
|
|
: pDoc->Insert( aPam, sGraphicURL, sFltName, &aGraphic,
|
2000-12-20 06:55:54 +00:00
|
|
|
&aFrmSet, &aGrSet, pParentFrmFmt );
|
2000-11-29 13:57:24 +00:00
|
|
|
delete pGrfObj;
|
2000-12-06 10:36:14 +00:00
|
|
|
if(pFmt)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-05-28 12:29:57 +00:00
|
|
|
SwGrfNode *pGrfNd = pDoc->GetNodes()[ pFmt->GetCntnt().GetCntntIdx()
|
|
|
|
->GetIndex()+1 ]->GetGrfNode();
|
|
|
|
pGrfNd->SetChgTwipSize( !bSizeFound );
|
2000-12-06 10:36:14 +00:00
|
|
|
pFmt->Add(this);
|
2013-08-18 02:26:26 +02:00
|
|
|
if(!m_sName.isEmpty())
|
|
|
|
pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt, m_sName);
|
2000-10-24 13:26:57 +00:00
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pSurroundContour;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUR, pSurroundContour))
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SURROUND_CONTOUR)), *pSurroundContour);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pContourOutside;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(RES_SURROUND, MID_SURROUND_CONTOUROUTSIDE, pContourOutside))
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_OUTSIDE)), *pContourOutside);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pContourPoly;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_PARAM_COUNTOUR_PP, 0, pContourPoly))
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_CONTOUR_POLY_POLYGON)), *pContourPoly);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pPixelContour;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_UNO_IS_PIXEL_CONTOUR, 0, pPixelContour))
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_PIXEL_CONTOUR)), *pPixelContour);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pAutoContour;
|
2001-06-15 13:27:58 +00:00
|
|
|
if(pProps->GetProperty(FN_UNO_IS_AUTOMATIC_CONTOUR, 0, pAutoContour))
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_AUTOMATIC_CONTOUR)), *pAutoContour);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pCLSID = 0;
|
|
|
|
const ::uno::Any* pStreamName = 0;
|
2011-11-15 13:47:36 +01:00
|
|
|
const ::uno::Any* pEmbeddedObject = 0;
|
|
|
|
if(!pProps->GetProperty(FN_UNO_CLSID, 0, pCLSID)
|
|
|
|
&& !pProps->GetProperty( FN_UNO_STREAM_NAME, 0, pStreamName )
|
|
|
|
&& !pProps->GetProperty( FN_EMBEDDED_OBJECT, 0, pEmbeddedObject ))
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2008-07-01 10:27:33 +00:00
|
|
|
if(pCLSID)
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
2008-07-01 10:27:33 +00:00
|
|
|
OUString aCLSID;
|
|
|
|
SvGlobalName aClassName;
|
|
|
|
uno::Reference < embed::XEmbeddedObject > xIPObj;
|
|
|
|
std::auto_ptr < comphelper::EmbeddedObjectContainer > pCnt;
|
|
|
|
if( (*pCLSID) >>= aCLSID )
|
2003-04-17 13:43:12 +00:00
|
|
|
{
|
2008-07-01 10:27:33 +00:00
|
|
|
if( !aClassName.MakeId( aCLSID ) )
|
|
|
|
{
|
|
|
|
lang::IllegalArgumentException aExcept;
|
2013-10-31 17:16:50 +02:00
|
|
|
aExcept.Message = "CLSID invalid";
|
2008-07-01 10:27:33 +00:00
|
|
|
throw aExcept;
|
|
|
|
}
|
|
|
|
|
|
|
|
pCnt.reset( new comphelper::EmbeddedObjectContainer );
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString aName;
|
2008-07-01 10:27:33 +00:00
|
|
|
xIPObj = pCnt->CreateEmbeddedObject( aClassName.GetByteSequence(), aName );
|
2003-04-17 13:43:12 +00:00
|
|
|
}
|
2008-07-01 10:27:33 +00:00
|
|
|
if ( xIPObj.is() )
|
|
|
|
{
|
|
|
|
//TODO/LATER: MISCSTATUS_RESIZEONPRINTERCHANGE
|
|
|
|
//if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xIPObj->GetMiscStatus() && pDoc->getPrinter( false ) )
|
|
|
|
// xIPObj->OnDocumentPrinterChanged( pDoc->getPrinter( false ) );
|
2004-10-04 18:13:38 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
UnoActionContext aAction(pDoc);
|
2010-11-25 14:31:08 +01:00
|
|
|
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
|
2008-07-01 10:27:33 +00:00
|
|
|
if(!bSizeFound)
|
|
|
|
{
|
|
|
|
//TODO/LATER: from where do I get a ViewAspect? And how do I transport it to the OLENode?
|
|
|
|
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
|
2003-04-17 13:43:12 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
// TODO/LEAN: VisualArea still needs running state
|
|
|
|
svt::EmbeddedObjectRef::TryRunningState( xIPObj );
|
2004-10-04 18:13:38 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
// set parent to get correct VisArea(in case of object needing parent printer)
|
|
|
|
uno::Reference < container::XChild > xChild( xIPObj, uno::UNO_QUERY );
|
|
|
|
if ( xChild.is() )
|
|
|
|
xChild->setParent( pDoc->GetDocShell()->GetModel() );
|
2005-04-04 07:22:36 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
//The Size should be suggested by the OLE server if not manually set
|
|
|
|
MapUnit aRefMap = VCLUnoHelper::UnoEmbed2VCLMapUnit( xIPObj->getMapUnit( nAspect ) );
|
|
|
|
awt::Size aSize;
|
|
|
|
try
|
|
|
|
{
|
|
|
|
aSize = xIPObj->getVisualAreaSize( nAspect );
|
|
|
|
}
|
|
|
|
catch ( embed::NoVisualAreaSizeException& )
|
|
|
|
{
|
|
|
|
// the default size will be set later
|
|
|
|
}
|
2005-04-04 07:22:36 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
Size aSz( aSize.Width, aSize.Height );
|
|
|
|
if ( !aSz.Width() || !aSz.Height() )
|
|
|
|
{
|
|
|
|
aSz.Width() = aSz.Height() = 5000;
|
|
|
|
aSz = OutputDevice::LogicToLogic
|
|
|
|
( aSz, MapMode( MAP_100TH_MM ), aRefMap );
|
|
|
|
}
|
|
|
|
MapMode aMyMap( MAP_TWIP );
|
|
|
|
aSz = OutputDevice::LogicToLogic( aSz, aRefMap, aMyMap );
|
|
|
|
SwFmtFrmSize aFrmSz;
|
|
|
|
aFrmSz.SetSize(aSz);
|
|
|
|
aFrmSet.Put(aFrmSz);
|
2005-03-15 10:25:26 +00:00
|
|
|
}
|
2008-07-01 10:27:33 +00:00
|
|
|
SwFlyFrmFmt* pFmt2 = 0;
|
2005-03-15 10:25:26 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
// TODO/LATER: Is it the only possible aspect here?
|
|
|
|
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
|
2008-07-08 07:34:51 +00:00
|
|
|
::svt::EmbeddedObjectRef xObjRef( xIPObj, nAspect );
|
|
|
|
pFmt2 = pDoc->Insert(aPam, xObjRef, &aFrmSet, NULL, NULL );
|
2010-11-25 17:08:45 +01:00
|
|
|
OSL_ENSURE( pFmt2, "Doc->Insert(notxt) failed." );
|
2003-04-17 13:43:12 +00:00
|
|
|
|
2010-11-25 14:31:08 +01:00
|
|
|
pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
|
2008-07-01 10:27:33 +00:00
|
|
|
pFmt2->Add(this);
|
2013-08-18 02:26:26 +02:00
|
|
|
if(!m_sName.isEmpty())
|
|
|
|
pDoc->SetFlyName((SwFlyFrmFmt&)*pFmt2, m_sName);
|
2008-07-01 10:27:33 +00:00
|
|
|
}
|
|
|
|
}
|
2011-11-25 18:55:53 +01:00
|
|
|
else if( pStreamName )
|
2008-07-01 10:27:33 +00:00
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString sStreamName;
|
2008-07-01 10:27:33 +00:00
|
|
|
(*pStreamName) >>= sStreamName;
|
2010-11-25 14:31:08 +01:00
|
|
|
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
|
2003-04-17 13:43:12 +00:00
|
|
|
|
2008-07-01 10:27:33 +00:00
|
|
|
SwFlyFrmFmt* pFrmFmt = 0;
|
|
|
|
pFrmFmt = pDoc->InsertOLE( aPam, sStreamName, embed::Aspects::MSOLE_CONTENT, &aFrmSet, NULL, NULL );
|
2010-11-25 14:31:08 +01:00
|
|
|
pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
|
2008-07-01 10:27:33 +00:00
|
|
|
pFrmFmt->Add(this);
|
2013-08-18 02:26:26 +02:00
|
|
|
if(!m_sName.isEmpty())
|
|
|
|
pDoc->SetFlyName((SwFlyFrmFmt&)*pFrmFmt, m_sName);
|
2003-04-17 13:43:12 +00:00
|
|
|
}
|
2011-11-15 13:47:36 +01:00
|
|
|
else if( pEmbeddedObject || pStreamName )
|
|
|
|
{
|
|
|
|
uno::Reference< embed::XEmbeddedObject > obj;
|
2011-11-25 18:55:53 +01:00
|
|
|
(*pEmbeddedObject) >>= obj;
|
2011-11-15 13:47:36 +01:00
|
|
|
svt::EmbeddedObjectRef xObj;
|
|
|
|
xObj.Assign( obj, embed::Aspects::MSOLE_CONTENT );
|
|
|
|
|
|
|
|
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
|
|
|
|
|
2011-11-25 15:15:47 +01:00
|
|
|
// Not sure if these setParent() and InsertEmbeddedObject() calls are really
|
|
|
|
// needed, it seems to work without, but logic from code elsewhere suggests
|
|
|
|
// they should be done.
|
|
|
|
SfxObjectShell& mrPers = *pDoc->GetPersist();
|
|
|
|
uno::Reference < container::XChild > xChild( obj, uno::UNO_QUERY );
|
|
|
|
if ( xChild.is() )
|
|
|
|
xChild->setParent( mrPers.GetModel() );
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString rName;
|
2011-11-25 15:15:47 +01:00
|
|
|
mrPers.GetEmbeddedObjectContainer().InsertEmbeddedObject( obj, rName );
|
|
|
|
|
2011-11-15 13:47:36 +01:00
|
|
|
SwFlyFrmFmt* pFrmFmt = 0;
|
|
|
|
pFrmFmt = pDoc->Insert( aPam, xObj, &aFrmSet, NULL, NULL );
|
|
|
|
pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL);
|
|
|
|
pFrmFmt->Add(this);
|
2013-08-18 02:26:26 +02:00
|
|
|
if(!m_sName.isEmpty())
|
|
|
|
pDoc->SetFlyName((SwFlyFrmFmt&)*pFrmFmt, m_sName);
|
2011-11-15 13:47:36 +01:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2000-12-06 10:36:14 +00:00
|
|
|
if( pFmt && pDoc->GetDrawModel() )
|
2002-11-26 11:35:55 +00:00
|
|
|
GetOrCreateSdrObject( pFmt );
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pOrder;
|
2001-06-15 13:27:58 +00:00
|
|
|
if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) )
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder);
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any* pReplacement;
|
2008-07-22 12:01:18 +00:00
|
|
|
if( pProps->GetProperty(FN_UNO_REPLACEMENT_GRAPHIC, 0, pReplacement) )
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_GRAPHIC)), *pReplacement);
|
2009-08-27 11:59:20 +00:00
|
|
|
// new attribute Title
|
|
|
|
const ::uno::Any* pTitle;
|
|
|
|
if ( pProps->GetProperty(FN_UNO_TITLE, 0, pTitle) )
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)), *pTitle);
|
2009-08-27 11:59:20 +00:00
|
|
|
}
|
|
|
|
// new attribute Description
|
|
|
|
const ::uno::Any* pDescription;
|
|
|
|
if ( pProps->GetProperty(FN_UNO_DESCRIPTION, 0, pDescription) )
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
setPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_DESCRIPTION)), *pDescription);
|
2009-08-27 11:59:20 +00:00
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2000-09-18 23:08:29 +00:00
|
|
|
//setzt das Flag zurueck und loescht den Descriptor-Pointer
|
|
|
|
ResetDescriptor();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
|
|
|
|
throw( lang::IllegalArgumentException, uno::RuntimeException )
|
2001-04-05 12:25:40 +00:00
|
|
|
{
|
|
|
|
SwFrmFmt* pFmt;
|
|
|
|
if(IsDescriptor())
|
|
|
|
attachToRange(xTextRange);
|
|
|
|
else if(0 != (pFmt = GetFrmFmt()))
|
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY);
|
2001-04-05 12:25:40 +00:00
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
SwUnoInternalPaM aIntPam(*pDoc);
|
2010-01-08 17:13:53 +01:00
|
|
|
if (::sw::XTextRangeToSwPaM(aIntPam, xTextRange))
|
2001-04-05 12:25:40 +00:00
|
|
|
{
|
2011-02-17 03:24:41 -05:00
|
|
|
SfxItemSet aSet( pDoc->GetAttrPool(), RES_ANCHOR, RES_ANCHOR );
|
2001-04-05 12:25:40 +00:00
|
|
|
aSet.SetParent(&pFmt->GetAttrSet());
|
|
|
|
SwFmtAnchor aAnchor = (const SwFmtAnchor&)aSet.Get(RES_ANCHOR);
|
|
|
|
aAnchor.SetAnchor( aIntPam.Start() );
|
|
|
|
aSet.Put(aAnchor);
|
|
|
|
pDoc->SetFlyFrmAttr( *pFmt, aSet );
|
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw lang::IllegalArgumentException();
|
2001-04-05 12:25:40 +00:00
|
|
|
}
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::RuntimeException aRuntime;
|
2012-12-26 22:49:14 +01:00
|
|
|
aRuntime.Message = "position cannot be determined with this method";
|
2000-11-27 10:13:17 +00:00
|
|
|
throw aRuntime;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2012-02-23 14:29:51 +01:00
|
|
|
void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::RuntimeException aRuntime;
|
2012-12-26 22:49:14 +01:00
|
|
|
aRuntime.Message = "position cannot be changed with this method";
|
2000-11-27 10:13:17 +00:00
|
|
|
throw aRuntime;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
awt::Size SwXFrame::getSize(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
const ::uno::Any aVal = getPropertyValue("Size");
|
2000-09-18 23:08:29 +00:00
|
|
|
awt::Size* pRet = (awt::Size*)aVal.getValue();
|
|
|
|
return *pRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SwXFrame::setSize(const awt::Size& aSize)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::PropertyVetoException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
const ::uno::Any aVal(&aSize, ::getCppuType(static_cast<const awt::Size*>(0)));
|
2012-12-26 22:49:14 +01:00
|
|
|
setPropertyValue("Size", aVal);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
return OUString("FrameShape");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************
|
|
|
|
* SwXTextFrame
|
|
|
|
******************************************************************/
|
2007-09-27 08:36:43 +00:00
|
|
|
SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) :
|
|
|
|
SwXText(0, CURSOR_FRAME),
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextFrame::SwXTextFrame(SwFrmFmt& rFmt) :
|
2007-09-27 08:36:43 +00:00
|
|
|
SwXText(rFmt.GetDoc(), CURSOR_FRAME),
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(rFmt, FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextFrame::~SwXTextFrame()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextFrame::acquire( )throw()
|
|
|
|
{
|
|
|
|
SwXFrame::acquire();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextFrame::release( )throw()
|
|
|
|
{
|
|
|
|
SwXFrame::release();
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any SAL_CALL SwXTextFrame::queryInterface( const uno::Type& aType )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw (uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any aRet = SwXFrame::queryInterface(aType);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(aRet.getValueType() == ::getCppuVoidType())
|
2002-03-19 14:59:14 +00:00
|
|
|
aRet = SwXText::queryInterface(aType);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(aRet.getValueType() == ::getCppuVoidType())
|
|
|
|
aRet = SwXTextFrameBaseClass::queryInterface(aType);
|
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
uno::Sequence< uno::Type > aTextFrameTypes = SwXTextFrameBaseClass::getTypes();
|
|
|
|
uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes();
|
|
|
|
uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
|
|
|
|
|
|
|
|
long nIndex = aTextFrameTypes.getLength();
|
|
|
|
aTextFrameTypes.realloc(
|
|
|
|
aTextFrameTypes.getLength() +
|
|
|
|
aFrameTypes.getLength() +
|
|
|
|
aTextTypes.getLength());
|
|
|
|
|
|
|
|
uno::Type* pTextFrameTypes = aTextFrameTypes.getArray();
|
|
|
|
const uno::Type* pFrameTypes = aFrameTypes.getConstArray();
|
|
|
|
long nPos;
|
|
|
|
for(nPos = 0; nPos <aFrameTypes.getLength(); nPos++)
|
|
|
|
pTextFrameTypes[nIndex++] = pFrameTypes[nPos];
|
|
|
|
|
|
|
|
const uno::Type* pTextTypes = aTextTypes.getConstArray();
|
|
|
|
for(nPos = 0; nPos <aTextTypes.getLength(); nPos++)
|
|
|
|
pTextFrameTypes[nIndex++] = pTextTypes[nPos];
|
|
|
|
|
|
|
|
return aTextFrameTypes;
|
|
|
|
}
|
|
|
|
|
2011-06-01 22:40:08 +01:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
class theSwXTextFrameImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextFrameImplementationId > {};
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-06-01 22:40:08 +01:00
|
|
|
return theSwXTextFrameImplementationId::get().getSeq();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XText > SwXTextFrame::getText(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
2001-06-12 06:28:29 +00:00
|
|
|
const SwStartNode *SwXTextFrame::GetStartNode() const
|
|
|
|
{
|
|
|
|
const SwStartNode *pSttNd = 0;
|
|
|
|
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
const SwFmtCntnt& rFlyCntnt = pFmt->GetCntnt();
|
|
|
|
if( rFlyCntnt.GetCntntIdx() )
|
|
|
|
pSttNd = rFlyCntnt.GetCntntIdx()->GetNode().GetStartNode();
|
|
|
|
}
|
|
|
|
|
|
|
|
return pSttNd;
|
|
|
|
}
|
|
|
|
|
2010-01-08 17:13:56 +01:00
|
|
|
uno::Reference< text::XTextCursor >
|
|
|
|
SwXTextFrame::CreateCursor() throw (uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
return createTextCursor();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextCursor > aRef;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
2001-11-15 14:48:44 +00:00
|
|
|
//save current start node to be able to check if there is content after the table -
|
|
|
|
//otherwise the cursor would be in the body text!
|
|
|
|
const SwNode& rNode = pFmt->GetCntnt().GetCntntIdx()->GetNode();
|
|
|
|
const SwStartNode* pOwnStartNode = rNode.FindSttNodeByType(SwFlyStartNode);
|
|
|
|
|
|
|
|
SwPaM aPam(rNode);
|
2000-11-08 13:56:39 +00:00
|
|
|
aPam.Move(fnMoveForward, fnGoNode);
|
|
|
|
SwTableNode* pTblNode = aPam.GetNode()->FindTableNode();
|
|
|
|
SwCntntNode* pCont = 0;
|
|
|
|
while( pTblNode )
|
|
|
|
{
|
|
|
|
aPam.GetPoint()->nNode = *pTblNode->EndOfSectionNode();
|
|
|
|
pCont = GetDoc()->GetNodes().GoNext(&aPam.GetPoint()->nNode);
|
|
|
|
pTblNode = pCont->FindTableNode();
|
|
|
|
}
|
|
|
|
if(pCont)
|
|
|
|
aPam.GetPoint()->nContent.Assign(pCont, 0);
|
|
|
|
|
2001-11-15 14:48:44 +00:00
|
|
|
const SwStartNode* pNewStartNode =
|
|
|
|
aPam.GetNode()->FindSttNodeByType(SwFlyStartNode);
|
|
|
|
if(!pNewStartNode || pNewStartNode != pOwnStartNode)
|
|
|
|
{
|
|
|
|
uno::RuntimeException aExcept;
|
2013-07-23 14:32:10 +02:00
|
|
|
aExcept.Message = "no text available";
|
2001-11-15 14:48:44 +00:00
|
|
|
throw aExcept;
|
|
|
|
}
|
|
|
|
|
2010-01-08 17:13:55 +01:00
|
|
|
SwXTextCursor *const pXCursor = new SwXTextCursor(
|
|
|
|
*pFmt->GetDoc(), this, CURSOR_FRAME, *aPam.GetPoint());
|
|
|
|
aRef = static_cast<text::XWordCursor*>(pXCursor);
|
2007-09-27 08:36:43 +00:00
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
2010-01-08 17:13:55 +01:00
|
|
|
SwUnoCrsr *const pUnoCrsr = pXCursor->GetCursor();
|
2007-09-27 08:36:43 +00:00
|
|
|
(void) pUnoCrsr;
|
|
|
|
#endif
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRef;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextCursor > aRef;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
SwUnoInternalPaM aPam(*GetDoc());
|
2010-01-08 17:13:53 +01:00
|
|
|
if (pFmt && ::sw::XTextRangeToSwPaM(aPam, aTextPosition))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwNode& rNode = pFmt->GetCntnt().GetCntntIdx()->GetNode();
|
2003-04-15 15:58:20 +00:00
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
2000-09-18 23:08:29 +00:00
|
|
|
const SwStartNode* p1 = aPam.GetNode()->FindFlyStartNode();
|
|
|
|
const SwStartNode* p2 = rNode.FindFlyStartNode();
|
2007-09-27 08:36:43 +00:00
|
|
|
(void)p1;
|
|
|
|
(void)p2;
|
2000-09-18 23:08:29 +00:00
|
|
|
#endif
|
|
|
|
if(aPam.GetNode()->FindFlyStartNode() == rNode.FindFlyStartNode())
|
2010-01-08 17:13:55 +01:00
|
|
|
{
|
|
|
|
aRef = static_cast<text::XWordCursor*>(
|
|
|
|
new SwXTextCursor(*pFmt->GetDoc(), this, CURSOR_FRAME,
|
|
|
|
*aPam.GetPoint(), aPam.GetMark()));
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
else
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRef;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
uno::Reference< container::XEnumeration > aRef;
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwPosition aPos(pFmt->GetCntnt().GetCntntIdx()->GetNode());
|
2010-01-08 17:13:51 +01:00
|
|
|
::std::auto_ptr<SwUnoCrsr> pUnoCursor(
|
2011-01-03 20:35:28 +00:00
|
|
|
GetDoc()->CreateUnoCrsr(aPos, false));
|
2010-01-08 17:13:51 +01:00
|
|
|
pUnoCursor->Move(fnMoveForward, fnGoNode);
|
2000-09-18 23:08:29 +00:00
|
|
|
// // no Cursor in protected sections
|
|
|
|
// SwCrsrSaveState aSave( *pUnoCrsr );
|
2011-01-03 20:35:28 +00:00
|
|
|
// if(pUnoCrsr->IsInProtectTable(true) ||
|
2000-09-18 23:08:29 +00:00
|
|
|
// pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
|
2007-06-05 16:33:19 +00:00
|
|
|
// throw uno::RuntimeException() );
|
2010-01-08 17:13:51 +01:00
|
|
|
aRef = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FRAME);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
return aRef;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Type SwXTextFrame::getElementType(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
return ::getCppuType(static_cast<uno::Reference<text::XTextRange>*>(0));
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
sal_Bool SwXTextFrame::hasElements(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
return sal_True;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
|
|
|
|
throw( lang::IllegalArgumentException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-04-05 12:25:40 +00:00
|
|
|
SwXFrame::attach(xTextRange);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextRange > SwXTextFrame::getAnchor(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
return SwXFrame::getAnchor();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextFrame::dispose(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwXFrame::dispose();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextFrame::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::addEventListener(aListener);
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextFrame::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::removeEventListener(aListener);
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXTextFrame::getImplementationName(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
return OUString("SwXTextFrame");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-10-21 12:23:14 +01:00
|
|
|
return rServiceName == "com.sun.star.text.Text" ||
|
|
|
|
rServiceName == "com.sun.star.text.TextFrame" ||
|
|
|
|
SwXFrame::supportsService(rServiceName);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-02-12 06:14:16 +00:00
|
|
|
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
|
|
|
|
aRet.realloc(aRet.getLength() + 2);
|
2000-09-18 23:08:29 +00:00
|
|
|
OUString* pArray = aRet.getArray();
|
2012-12-26 22:49:14 +01:00
|
|
|
pArray[aRet.getLength() - 2] = "com.sun.star.text.TextFrame";
|
|
|
|
pArray[aRet.getLength() - 1] = "com.sun.star.text.Text";
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
void * SAL_CALL SwXTextFrame::operator new( size_t t) throw()
|
|
|
|
{
|
|
|
|
return SwXTextFrameBaseClass::operator new( t);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextFrame::operator delete( void * p) throw()
|
|
|
|
{
|
|
|
|
SwXTextFrameBaseClass::operator delete(p);
|
|
|
|
}
|
2000-12-19 16:28:58 +00:00
|
|
|
|
|
|
|
uno::Reference<container::XNameReplace > SAL_CALL SwXTextFrame::getEvents()
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2000-12-19 16:28:58 +00:00
|
|
|
{
|
|
|
|
return new SwFrameEventDescriptor( *this );
|
|
|
|
}
|
|
|
|
|
2001-01-15 10:28:36 +00:00
|
|
|
sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& rId )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2001-01-15 10:28:36 +00:00
|
|
|
{
|
|
|
|
sal_Int64 nRet = SwXFrame::getSomething( rId );
|
|
|
|
if( !nRet )
|
|
|
|
nRet = SwXText::getSomething( rId );
|
|
|
|
|
|
|
|
return nRet;
|
|
|
|
}
|
2002-03-19 14:59:14 +00:00
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any SwXTextFrame::getPropertyValue(const OUString& rPropertyName)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
|
2002-03-19 14:59:14 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any aRet;
|
2002-03-19 14:59:14 +00:00
|
|
|
if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_START_REDLINE))||
|
|
|
|
rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_END_REDLINE)))
|
2002-03-20 07:04:08 +00:00
|
|
|
{
|
|
|
|
//redline can only be returned if it's a living object
|
|
|
|
if(!IsDescriptor())
|
|
|
|
aRet = SwXText::getPropertyValue(rPropertyName);
|
|
|
|
}
|
2002-03-19 14:59:14 +00:00
|
|
|
else
|
2002-03-20 07:04:08 +00:00
|
|
|
aRet = SwXFrame::getPropertyValue(rPropertyName);
|
|
|
|
return aRet;
|
2002-03-19 14:59:14 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
/******************************************************************
|
|
|
|
* SwXTextGraphicObject
|
|
|
|
******************************************************************/
|
2001-10-12 12:57:26 +00:00
|
|
|
SwXTextGraphicObject::SwXTextGraphicObject( SwDoc *pDoc ) :
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC), pDoc)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextGraphicObject::SwXTextGraphicObject(SwFrmFmt& rFmt) :
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(rFmt, FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextGraphicObject::~SwXTextGraphicObject()
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextGraphicObject::acquire( )throw()
|
|
|
|
{
|
|
|
|
SwXFrame::acquire();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextGraphicObject::release( )throw()
|
|
|
|
{
|
|
|
|
SwXFrame::release();
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any SAL_CALL SwXTextGraphicObject::queryInterface( const uno::Type& aType )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any aRet = SwXFrame::queryInterface(aType);
|
2000-09-18 23:08:29 +00:00
|
|
|
if(aRet.getValueType() == ::getCppuVoidType())
|
|
|
|
aRet = SwXTextGraphicObjectBaseClass::queryInterface(aType);
|
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< uno::Type > SAL_CALL
|
|
|
|
SwXTextGraphicObject::getTypes( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
uno::Sequence< uno::Type > aGraphicTypes = SwXTextGraphicObjectBaseClass::getTypes();
|
|
|
|
uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes();
|
|
|
|
|
|
|
|
long nIndex = aGraphicTypes.getLength();
|
|
|
|
aGraphicTypes.realloc(
|
|
|
|
aGraphicTypes.getLength() +
|
|
|
|
aFrameTypes.getLength());
|
|
|
|
|
|
|
|
uno::Type* pGraphicTypes = aGraphicTypes.getArray();
|
|
|
|
const uno::Type* pFrameTypes = aFrameTypes.getConstArray();
|
|
|
|
long nPos;
|
|
|
|
for(nPos = 0; nPos <aFrameTypes.getLength(); nPos++)
|
|
|
|
pGraphicTypes[nIndex++] = pFrameTypes[nPos];
|
|
|
|
|
|
|
|
return aGraphicTypes;
|
|
|
|
}
|
|
|
|
|
2011-06-01 22:40:08 +01:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
class theSwXTextGraphicObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextGraphicObjectImplementationId > {};
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-06-01 22:40:08 +01:00
|
|
|
return theSwXTextGraphicObjectImplementationId::get().getSeq();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-04-05 12:25:40 +00:00
|
|
|
SwXFrame::attach(xTextRange);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
return SwXFrame::getAnchor();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextGraphicObject::dispose(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwXFrame::dispose();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextGraphicObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener)
|
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::addEventListener(aListener);
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextGraphicObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener)
|
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::removeEventListener(aListener);
|
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXTextGraphicObject::getImplementationName(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
return OUString("SwXTextGraphicObject");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-10-21 12:23:14 +01:00
|
|
|
return rServiceName == "com.sun.star.text.TextGraphicObject" ||
|
|
|
|
SwXFrame::supportsService(rServiceName);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-02-12 06:14:16 +00:00
|
|
|
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
|
|
|
|
aRet.realloc(aRet.getLength() + 1);
|
2000-09-18 23:08:29 +00:00
|
|
|
OUString* pArray = aRet.getArray();
|
2012-12-26 22:49:14 +01:00
|
|
|
pArray[aRet.getLength() - 1] = "com.sun.star.text.TextGraphicObject";
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
void * SAL_CALL SwXTextGraphicObject::operator new( size_t t) throw()
|
|
|
|
{
|
|
|
|
return SwXTextGraphicObjectBaseClass::operator new(t);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextGraphicObject::operator delete( void * p) throw()
|
|
|
|
{
|
|
|
|
SwXTextGraphicObjectBaseClass::operator delete(p);
|
|
|
|
}
|
2000-12-19 16:28:58 +00:00
|
|
|
|
|
|
|
uno::Reference<container::XNameReplace> SAL_CALL
|
|
|
|
SwXTextGraphicObject::getEvents()
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2000-12-19 16:28:58 +00:00
|
|
|
{
|
|
|
|
return new SwFrameEventDescriptor( *this );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2001-10-12 12:57:26 +00:00
|
|
|
SwXTextEmbeddedObject::SwXTextEmbeddedObject( SwDoc *pDoc ) :
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT), pDoc)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextEmbeddedObject::SwXTextEmbeddedObject(SwFrmFmt& rFmt) :
|
2009-06-03 11:26:39 +00:00
|
|
|
SwXFrame(rFmt, FLYCNTTYPE_OLE, aSwMapProvider.GetPropertySet(PROPERTY_MAP_EMBEDDED_OBJECT))
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXTextEmbeddedObject::~SwXTextEmbeddedObject()
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
void SAL_CALL SwXTextEmbeddedObject::acquire()throw()
|
|
|
|
{
|
|
|
|
SwXFrame::acquire();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextEmbeddedObject::release()throw()
|
|
|
|
{
|
|
|
|
SwXFrame::release();
|
|
|
|
}
|
|
|
|
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any SAL_CALL SwXTextEmbeddedObject::queryInterface( const uno::Type& aType )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2009-06-03 11:26:39 +00:00
|
|
|
::uno::Any aRet = SwXFrame::queryInterface(aType);;
|
2000-09-18 23:08:29 +00:00
|
|
|
if(aRet.getValueType() == ::getCppuVoidType())
|
|
|
|
aRet = SwXTextEmbeddedObjectBaseClass::queryInterface(aType);
|
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
uno::Sequence< uno::Type > aTextEmbeddedTypes = SwXTextEmbeddedObjectBaseClass::getTypes();
|
|
|
|
uno::Sequence< uno::Type > aFrameTypes = SwXFrame::getTypes();
|
|
|
|
|
|
|
|
long nIndex = aTextEmbeddedTypes.getLength();
|
|
|
|
aTextEmbeddedTypes.realloc(
|
|
|
|
aTextEmbeddedTypes.getLength() +
|
|
|
|
aFrameTypes.getLength());
|
|
|
|
|
|
|
|
uno::Type* pTextEmbeddedTypes = aTextEmbeddedTypes.getArray();
|
|
|
|
|
|
|
|
const uno::Type* pFrameTypes = aFrameTypes.getConstArray();
|
|
|
|
long nPos;
|
|
|
|
for(nPos = 0; nPos <aFrameTypes.getLength(); nPos++)
|
|
|
|
pTextEmbeddedTypes[nIndex++] = pFrameTypes[nPos];
|
|
|
|
|
|
|
|
return aTextEmbeddedTypes;
|
|
|
|
}
|
|
|
|
|
2011-06-01 22:40:08 +01:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
class theSwXTextEmbeddedObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextEmbeddedObjectImplementationId > {};
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(uno::RuntimeException)
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2011-06-01 22:40:08 +01:00
|
|
|
return theSwXTextEmbeddedObjectImplementationId::get().getSeq();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-04-05 12:25:40 +00:00
|
|
|
SwXFrame::attach(xTextRange);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
return SwXFrame::getAnchor();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextEmbeddedObject::dispose(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwXFrame::dispose();
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextEmbeddedObject::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::addEventListener(aListener);
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
|
|
|
SwXFrame::removeEventListener(aListener);
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< lang::XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< lang::XComponent > xRet;
|
2000-09-18 23:08:29 +00:00
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2000-09-18 23:08:29 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
SwOLENode* pOleNode = pDoc->GetNodes()[ pCnt->GetCntntIdx()
|
|
|
|
->GetIndex() + 1 ]->GetOLENode();
|
2004-10-04 18:13:38 +00:00
|
|
|
uno::Reference < embed::XEmbeddedObject > xIP = pOleNode->GetOLEObj().GetOleRef();
|
2004-11-26 15:27:27 +00:00
|
|
|
if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2008-07-08 07:34:51 +00:00
|
|
|
// TODO/LATER: the listener registered after client creation should be able to handle scaling, after that the client is not necessary here
|
|
|
|
if ( pDoc->GetDocShell() )
|
|
|
|
pDoc->GetDocShell()->GetIPClient( svt::EmbeddedObjectRef( xIP, embed::Aspects::MSOLE_CONTENT ) );
|
|
|
|
|
2004-11-26 15:27:27 +00:00
|
|
|
xRet = uno::Reference < lang::XComponent >( xIP->getComponent(), uno::UNO_QUERY );
|
2004-10-04 18:13:38 +00:00
|
|
|
uno::Reference< util::XModifyBroadcaster > xBrdcst( xRet, uno::UNO_QUERY);
|
|
|
|
uno::Reference< frame::XModel > xModel( xRet, uno::UNO_QUERY);
|
|
|
|
if( xBrdcst.is() && xModel.is() )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-12-17 09:02:23 +01:00
|
|
|
SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>::FirstElement( *pFmt );
|
2004-10-04 18:13:38 +00:00
|
|
|
//create a new one if the OLE object doesn't have one already
|
|
|
|
if( !pListener )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-10-04 18:13:38 +00:00
|
|
|
uno::Reference< util::XModifyListener > xOLEListener = new SwXOLEListener(*pFmt, xModel);
|
|
|
|
xBrdcst->addModifyListener( xOLEListener );
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return xRet;
|
|
|
|
}
|
2006-10-13 10:09:53 +00:00
|
|
|
|
|
|
|
uno::Reference< embed::XEmbeddedObject > SAL_CALL SwXTextEmbeddedObject::getExtendedControlOverEmbeddedObject()
|
|
|
|
throw( uno::RuntimeException )
|
|
|
|
{
|
|
|
|
uno::Reference< embed::XEmbeddedObject > xResult;
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2006-10-13 10:09:53 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2006-10-13 10:09:53 +00:00
|
|
|
|
|
|
|
SwOLENode* pOleNode = pDoc->GetNodes()[ pCnt->GetCntntIdx()
|
|
|
|
->GetIndex() + 1 ]->GetOLENode();
|
|
|
|
xResult = pOleNode->GetOLEObj().GetOleRef();
|
|
|
|
if ( svt::EmbeddedObjectRef::TryRunningState( xResult ) )
|
|
|
|
{
|
2008-07-08 07:34:51 +00:00
|
|
|
// TODO/LATER: the listener registered after client creation should be able to handle scaling, after that the client is not necessary here
|
|
|
|
if ( pDoc->GetDocShell() )
|
|
|
|
pDoc->GetDocShell()->GetIPClient( svt::EmbeddedObjectRef( xResult, embed::Aspects::MSOLE_CONTENT ) );
|
|
|
|
|
2006-10-13 10:09:53 +00:00
|
|
|
uno::Reference < lang::XComponent > xComp( xResult->getComponent(), uno::UNO_QUERY );
|
|
|
|
uno::Reference< util::XModifyBroadcaster > xBrdcst( xComp, uno::UNO_QUERY);
|
|
|
|
uno::Reference< frame::XModel > xModel( xComp, uno::UNO_QUERY);
|
|
|
|
if( xBrdcst.is() && xModel.is() )
|
|
|
|
{
|
2010-12-17 09:02:23 +01:00
|
|
|
SwXOLEListener* pListener = SwIterator<SwXOLEListener,SwFmt>::FirstElement( *pFmt );
|
2006-10-13 10:09:53 +00:00
|
|
|
//create a new one if the OLE object doesn't have one already
|
|
|
|
if( !pListener )
|
|
|
|
{
|
|
|
|
uno::Reference< util::XModifyListener > xOLEListener = new SwXOLEListener(*pFmt, xModel);
|
|
|
|
xBrdcst->addModifyListener( xOLEListener );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return xResult;
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
sal_Int64 SAL_CALL SwXTextEmbeddedObject::getAspect() throw (uno::RuntimeException)
|
2006-10-13 10:09:53 +00:00
|
|
|
{
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2006-10-13 10:09:53 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2006-10-13 10:09:53 +00:00
|
|
|
|
|
|
|
return pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetAspect();
|
|
|
|
}
|
|
|
|
|
|
|
|
return embed::Aspects::MSOLE_CONTENT; // return the default value
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SAL_CALL SwXTextEmbeddedObject::setAspect( sal_Int64 nAspect ) throw (uno::RuntimeException)
|
2006-10-13 10:09:53 +00:00
|
|
|
{
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2006-10-13 10:09:53 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2006-10-13 10:09:53 +00:00
|
|
|
|
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->SetAspect( nAspect );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
uno::Reference< graphic::XGraphic > SAL_CALL SwXTextEmbeddedObject::getReplacementGraphic() throw (uno::RuntimeException)
|
2006-10-13 10:09:53 +00:00
|
|
|
{
|
|
|
|
SwFrmFmt* pFmt = GetFrmFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{
|
|
|
|
SwDoc* pDoc = pFmt->GetDoc();
|
|
|
|
const SwFmtCntnt* pCnt = &pFmt->GetCntnt();
|
2011-05-08 22:14:45 +02:00
|
|
|
OSL_ENSURE( pCnt->GetCntntIdx() &&
|
2006-10-13 10:09:53 +00:00
|
|
|
pDoc->GetNodes()[ pCnt->GetCntntIdx()->
|
2008-11-10 15:06:12 +00:00
|
|
|
GetIndex() + 1 ]->GetOLENode(), "kein OLE-Node?");
|
2006-10-13 10:09:53 +00:00
|
|
|
|
2013-01-17 14:28:41 -05:00
|
|
|
const Graphic* pGraphic = pDoc->GetNodes()[ pCnt->GetCntntIdx()->GetIndex() + 1 ]->GetOLENode()->GetGraphic();
|
2006-10-13 10:09:53 +00:00
|
|
|
if ( pGraphic )
|
|
|
|
return pGraphic->GetXGraphic();
|
|
|
|
}
|
|
|
|
|
|
|
|
return uno::Reference< graphic::XGraphic >();
|
|
|
|
}
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
{
|
2012-12-26 22:49:14 +01:00
|
|
|
return OUString("SwXTextEmbeddedObject");
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2013-10-21 12:23:14 +01:00
|
|
|
return rServiceName == "com.sun.star.text.TextEmbeddedObject" ||
|
|
|
|
SwXFrame::supportsService(rServiceName);
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-13 16:05:00 +05:30
|
|
|
|
2000-09-18 23:08:29 +00:00
|
|
|
uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2001-02-12 06:14:16 +00:00
|
|
|
uno::Sequence < OUString > aRet = SwXFrame::getSupportedServiceNames();
|
|
|
|
aRet.realloc(aRet.getLength() + 1);
|
2000-09-18 23:08:29 +00:00
|
|
|
OUString* pArray = aRet.getArray();
|
2012-12-26 22:49:14 +01:00
|
|
|
pArray[aRet.getLength() - 1] = "com.sun.star.text.TextEmbeddedObject";
|
2000-09-18 23:08:29 +00:00
|
|
|
return aRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
void * SAL_CALL SwXTextEmbeddedObject::operator new( size_t t) throw()
|
|
|
|
{
|
|
|
|
return SwXTextEmbeddedObjectBaseClass::operator new(t);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SAL_CALL SwXTextEmbeddedObject::operator delete( void * p) throw()
|
|
|
|
{
|
|
|
|
SwXTextEmbeddedObjectBaseClass::operator delete(p);
|
|
|
|
}
|
2000-12-19 16:28:58 +00:00
|
|
|
|
|
|
|
uno::Reference<container::XNameReplace> SAL_CALL
|
|
|
|
SwXTextEmbeddedObject::getEvents()
|
2007-06-05 16:33:19 +00:00
|
|
|
throw(uno::RuntimeException)
|
2000-12-19 16:28:58 +00:00
|
|
|
{
|
|
|
|
return new SwFrameEventDescriptor( *this );
|
|
|
|
}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2003-09-11 08:40:41 +00:00
|
|
|
TYPEINIT1(SwXOLEListener, SwClient);
|
|
|
|
|
|
|
|
SwXOLEListener::SwXOLEListener( SwFmt& rOLEFmt, uno::Reference< XModel > xOLE) :
|
|
|
|
SwClient(&rOLEFmt),
|
|
|
|
xOLEModel(xOLE)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SwXOLEListener::~SwXOLEListener()
|
|
|
|
{}
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2007-09-27 08:36:43 +00:00
|
|
|
void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ )
|
2007-06-05 16:33:19 +00:00
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2003-09-11 08:40:41 +00:00
|
|
|
SwOLENode* pNd = 0;
|
|
|
|
SwFmt* pFmt = GetFmt();
|
|
|
|
if(pFmt)
|
|
|
|
{const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
|
|
|
|
if(pIdx)
|
|
|
|
{
|
|
|
|
SwNodeIndex aIdx(*pIdx, 1);
|
|
|
|
SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
|
|
|
|
pNd = pNoTxt->GetOLENode();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!pNd)
|
2007-06-05 16:33:19 +00:00
|
|
|
throw uno::RuntimeException();
|
2004-10-04 18:13:38 +00:00
|
|
|
|
|
|
|
uno::Reference < embed::XEmbeddedObject > xIP = pNd->GetOLEObj().GetOleRef();
|
|
|
|
if ( xIP.is() )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2004-10-04 18:13:38 +00:00
|
|
|
sal_Int32 nState = xIP->getCurrentState();
|
|
|
|
if ( nState == embed::EmbedStates::INPLACE_ACTIVE || nState == embed::EmbedStates::UI_ACTIVE )
|
|
|
|
return;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-10-04 18:13:38 +00:00
|
|
|
|
|
|
|
// if the OLE-Node is UI-Active do nothing
|
2011-01-03 20:35:28 +00:00
|
|
|
pNd->SetOLESizeInvalid(true);
|
2004-10-04 18:13:38 +00:00
|
|
|
pNd->GetDoc()->SetOLEObjModified();
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2004-10-04 18:13:38 +00:00
|
|
|
|
2007-06-05 16:33:19 +00:00
|
|
|
void SwXOLEListener::disposing( const lang::EventObject& rEvent )
|
|
|
|
throw( uno::RuntimeException )
|
2000-09-18 23:08:29 +00:00
|
|
|
{
|
2010-10-13 01:44:10 -05:00
|
|
|
SolarMutexGuard aGuard;
|
2000-09-18 23:08:29 +00:00
|
|
|
|
|
|
|
uno::Reference< util::XModifyListener > xListener( this );
|
|
|
|
|
|
|
|
|
2003-09-11 08:40:41 +00:00
|
|
|
uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY );
|
|
|
|
uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY);
|
2000-09-18 23:08:29 +00:00
|
|
|
|
2003-09-11 08:40:41 +00:00
|
|
|
try
|
|
|
|
{
|
2000-09-18 23:08:29 +00:00
|
|
|
if( xBrdcst.is() )
|
|
|
|
xBrdcst->removeModifyListener( xListener );
|
|
|
|
}
|
2007-06-05 16:33:19 +00:00
|
|
|
catch(uno::Exception const &)
|
2003-03-27 14:45:43 +00:00
|
|
|
{
|
2011-03-01 19:09:12 +01:00
|
|
|
OSL_FAIL("OLE Listener couldn't be removed");
|
2003-03-27 14:45:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-17 09:02:23 +01:00
|
|
|
void SwXOLEListener::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
|
2003-03-27 14:45:43 +00:00
|
|
|
{
|
2003-09-11 08:40:41 +00:00
|
|
|
ClientModify(this, pOld, pNew);
|
|
|
|
if(!GetRegisteredIn())
|
|
|
|
xOLEModel = 0;
|
2000-09-18 23:08:29 +00:00
|
|
|
}
|
2010-10-14 08:30:41 +02:00
|
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|