summaryrefslogtreecommitdiff
path: root/sw/source/core/graphic/ndgrf.cxx
AgeCommit message (Collapse)AuthorFilesLines
2014-05-27various situations where graphic go missing on saveOliver-Rainer Wittmann1-9/+9
Resolves: #i114361# provide and accept changed URL... of embedded graphic file during save (ODF export) (cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Conflicts: sw/inc/ndgrf.hxx Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 Resolves: #i124946# only apply new embedded stream name... for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 Resolves: #i124966# keep picture format information - <GfxLink> instance - also for the reading of preview picture data in order to avoid trouble on save in case that the preview data equals the picture data (cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366) Conflicts: svx/source/svdraw/svdograf.cxx (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d Reviewed-on: https://gerrit.libreoffice.org/9456 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-14fdo#50763: handle inlined base64 imagesChr. Rossmanith1-1/+8
Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: I2e9d17dafcf91872d8ea19089e68d8fe652b3e4e Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-02-04fdo#73300: sw: GraphicObjects are never swapped outMichael Stahl1-3/+5
In SwNoTxtFrm::PaintPicture() the GraphicObjects are no longer painted via GraphicObject::Draw() any more there is the problem that they are not cached any more in the display cache of the GraphicManager; that used to immediately swap out the Graphic but now they are never swapped out. Since there appears to be no use of the GraphicManager's display cache in the new drawinglayer based rendering path i have no idea how to swap out the Graphic immediately; instead use the same time-out that SdrGrafObj is using already. This timeout is derived from the setting: Tools->Options->LibreOffice->Memory->Graphics cache->"Remove from memory after". (regression from 2e5167528f7566dd9b000e50fc1610b7bf99132a) Change-Id: I0d9b535a82646d9b6635cfb3917f74dcc3ad8720 (cherry picked from commit 2d9d20edc999ef2c2ad2ee628a6a5f27efb801d8) Reviewed-on: https://gerrit.libreoffice.org/7810 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-04fdo#73300: sw: don't swap in all images when loading filesMichael Stahl1-0/+3
(regression from bd55f05b332c1573bd410fd9e21ea7fcf977e1b0) Change-Id: I55532ac0fe983461e961a61149479343d2b879a1 (cherry picked from commit 9b9eb2e4f619c63eabdc54b5d749ac55d8eaf333) Reviewed-on: https://gerrit.libreoffice.org/7809 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-14rhbz#887420 Implement "block untrusted referer links" featureStephan Bergmann1-2/+8
For now, this checks for a trusted referer (if the BlockUntrustedRefererLinks configuration prop is set) in utl::MediaDescriptor::impl_openStreamWithURL and SvxBrushItem::GetGraphicObject. Checking in additional places will probably be necessary to block /all/ unwanted communication. Also, some places marked /*TODO?*/ currently pass in an empty referer (which is always considered trusted) and will probably need to be adapted. Ideally, Referer URIs would never be empty (and consistently use something like <private:user> for cases where access is explicitly initiated by the user and should never be blocked), but that's a very daunting task, so start small by identifying the places that potentially need blocking and adding appropriate Referer URIs there. Also, Referer information should always be computed as freshly as possible from the context in which an access attempt is made, but, again, always carrying the information from the context all the way to the relevant functions is a very daunting task, so for now store the information upon object instantiation in some cases (SvxBrushItem, SdrGrafObj, ...). The Referer URI (css.document.MediaDescriptor property; SID_REFERER) was already used to track macro execution, and there is one place in SfxApplication::OpenDocExec_Impl where opening of hyperlinks (explicitly clicked by the user) is done that needs the current document's URI as Referer to check execution of macro URIs but needs an empty (or <private:user>, see above) Referer to not block non-macro URIs. Special code has been added there to handle that. Change-Id: Iafbdc07a9fe925d9ee580d4f5778448f18f2ebd9
2013-10-26sw: ViewShell -> SwViewShell renameMiklos Vajna1-2/+2
It's a public class, so it should have the 'Sw' prefix. Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
2013-10-22Bin useless swmod commentsTor Lillqvist1-1/+1
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
2013-10-18converting remaining usage of String in SW to OUStringNoel Grandin1-8/+8
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-17URI schemes must be matched case-insensitiveMatteo Casalin1-1/+1
Change-Id: I0ca761cdbf2509ab225101984484905c94e8b3a1
2013-10-17Remove dead check for start of stringMatteo Casalin1-3/+1
Change-Id: Ib8fcc3dc5d216d1cfae569f605a3f415f80770c4
2013-10-15convert sw/inc/ndgrf.hxx from String to OUStringNoel Grandin1-10/+10
Change-Id: Iac457f283a2e16ee7fd6c104b86131cbe980aa5e
2013-10-05Correct prefix for OUString + constifyMatteo Casalin1-8/+8
Change-Id: I4662fa9c63717c57ccfb6bcee685c4d47c715eff
2013-10-05String to OUString + better namesMatteo Casalin1-13/+12
Change-Id: I811789b9fec38d7745ffffbcb57659aa5e3dc59f
2013-10-05String to OUString + use return instead of reference argsMatteo Casalin1-35/+33
Change-Id: I0c0857b4b4ac87586675e8540ef5135dbce82b5c
2013-10-05This reference argument can be constMatteo Casalin1-2/+3
Change-Id: I4d8d23d34aa72a0101bc18e98983ea8840806462
2013-10-05This does not need to be a member functionMatteo Casalin1-40/+45
Change-Id: I4d008ac516c66243d436a3afe3322ba1b6c9ef22
2013-10-05Unused data member and setterMatteo Casalin1-4/+0
Change-Id: Ib11213ecad715948793f0b608ebb99d22fbc3152
2013-09-19convert sw/inc/ndarr.hxx from String to OUStringNoel Grandin1-2/+2
Change-Id: I21446a34aed1c9fc7e64f085839b1012031ba1e2
2013-08-29convert include/sfx2/linkmgr.hxx from String to OUStringNoel Grandin1-19/+18
along the way, de-virtual ScDocFunc::InsertAreaLink, since it only has one implementation. Change-Id: I3fc836f9954628f154e01b1c7ae8f90eb7600a76
2013-08-25String to OUStringMatteo Casalin1-6/+8
Change-Id: I364c5eabf45a3a5011c0b1709da68cbeb38a6997 Reviewed-on: https://gerrit.libreoffice.org/5610 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-06Some more modules at least building with mingw64Fridrich Štrba1-1/+1
Change-Id: I3ea039655aecb7885bb310b1f2c29d66f9f7bb4f
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-4/+4
2013-05-05work on comments and remove commented-out code in sw/source/core/graphicPhilipp Riemer1-39/+10
Change-Id: I2b1b29d469277998dafed41fb7c0bb33e8064a16
2013-05-05fdo#39468: Translate German comments in sw/source/core/graphicPhilipp Riemer1-59/+56
Change-Id: Ic78269f73b31125d7326b9aa1bfca76d7e881177
2013-05-05fdo#62475 - remove ASCII art in sw/source/core/graphicPhilipp Riemer1-18/+0
Change-Id: Ie37dbb1c0c5d01c958d168d15ec5285c36bbf28d
2013-04-20fdo#63154: Change Min/Max/Abs for std::min/max/absMarcos Paulo de Souza1-1/+1
Now all these usages were removed from LO. Change-Id: I8a7233db20abdcdbb18428ad4004c78cc516a0e6 Reviewed-on: https://gerrit.libreoffice.org/3326 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák1-1/+1
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-03-16Resolves: #i118780# Moved ObjectInfoPrimitive2D extractor to drawinglayer...Armin Le Grand1-50/+121
changed name to be the filename only, added code to SW to set Title and Desc Conflicts: drawinglayer/Library_drawinglayer.mk drawinglayer/Package_inc.mk svx/source/svdraw/svdograf.cxx sw/inc/ndgrf.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/docnode/swbaslnk.cxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/rtf/rtffly.cxx Change-Id: Id433031958529498441574dafe2fbd5261371efc Notes: merged as: 977a0eff5415a2a4716e02bfab8e69ffb64ad7ce
2013-03-11fdo#38838: Converting String/UniString to OUStringelixir1-1/+1
Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9 Reviewed-on: https://gerrit.libreoffice.org/2586 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-01RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removalsKrisztian Pinter1-2/+2
Change-Id: I3ef372b07f2bacc2b9bbbb034e3d61b9cc8a3677 Reviewed-on: https://gerrit.libreoffice.org/2486 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-02-22s/the the/the/Tor Lillqvist1-1/+1
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-01-04Make LO buildable again after the GraphicFilter move.Jan Holesovsky1-1/+1
Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
2012-11-25sal_Bool to boolTakeshi Abe1-3/+3
Change-Id: Ieb7ddea4c5934717a22e2fdc78883a5d13cfc448
2012-11-21sal_Bool to boolTakeshi Abe1-1/+1
Change-Id: I0845702a9d0d590b0410df8bdcc3a12661f87714
2012-11-08sal_Bool to boolTakeshi Abe1-3/+3
Change-Id: Idfbc33106b20b06c5247c50d099972305f016a51
2012-11-06Fix some file modesStephan Bergmann1-0/+0
Change-Id: Ib1746fff848a4f5cc7dd1baec68d9acdc4f7ac1e
2012-11-06re-base on ALv2 code. Includes (at least) relevant parts of:Michael Meeks1-30/+52
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-22loplugin: various warningsCaolán McNamara1-1/+1
Change-Id: I605bffb518d804ee69edda5e7641e13e4c14ef01
2012-09-18deprecate oustringostreaminserter.hxxNorbert Thiebaud1-1/+1
the intent of this header has canged over time. now it is already systematically included with ustring.hxx and the operator overload it provide fit nicely there... Just to be safe, since that include as been added to the api during the 3.5 timeframe and therefore is already in 'production' the header remain and simply attempt to include ustring.hxx but a warning is issued indicating that this header should not be used anymore... in a couple of major release we will thenr emove it completely All internal users of that header are converted. Change-Id: I8934c55f089e29d78c0f5649b7c87b2ecf024bad Reviewed-on: https://gerrit.libreoffice.org/634 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-07-11Decrease header files dependenciesMatteo Casalin1-1/+1
Change-Id: I654e71e56d60bf629625df09eb93b21c9ef670e8
2012-06-12Convert SV_DECL_PTRARR(SvBaseLinks) to std::vectorNoel Grandin1-1/+1
Change-Id: I9197dc4fd7ed32f030de8121913265ec78c83585
2012-02-22revert slew of debug code committed in errorMichael Meeks1-33/+0
2012-02-22fdo#37210 - UI: Calc usability improvement: Merge cells on right mouse clickGreggory Hernandez1-0/+33
2012-01-08sw: drop exec bit of cxx filesMiklos Vajna1-0/+0
2012-01-06Removed unnecessary tools/link.hxx includes.Marcel Metz1-1/+0
2012-01-05more informative debugging outputCaolán McNamara1-2/+3
2011-11-27remove include of pch header from swNorbert Thiebaud1-2/+0
2011-10-25Fix fdo#41995 fallout - recognize .svg in odf containersThorsten Behrens1-5/+5
More code paths that needed fixing - Writer sports its own Graphic loading implementation, so that had the need for the stream name fwd-ing, too. The svg deep type detection was necessary for e.g. the flat odf - which has inline svg without any filename.
2011-09-22ByteString->rtl::OString[Buffer]Caolán McNamara1-1/+2
2011-08-02catch by const referenceCaolán McNamara1-4/+4
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 21:48:22 +0000