summaryrefslogtreecommitdiff
path: root/embeddedobj
AgeCommit message (Collapse)AuthorFilesLines
2018-08-08Resolves: tdf#118919 crash on double click ole objectCaolán McNamara1-1/+1
Change-Id: Id7b3df447db56f6f80d6255dabdcc7f6ab149e95 Reviewed-on: https://gerrit.libreoffice.org/57956 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit d595829c64e149896d2b5e8a4974636f8d9bd892) (cherry picked from commit 960b781ba14af8286f49012b47515b5babfb8737)
2017-07-18Embedded documents: show title in menu entriesSzymon Kłos3-4/+12
Change-Id: I478d81798e6f1e2d96e570cb6788a438c6a0be62 Reviewed-on: https://gerrit.libreoffice.org/40080 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-17Embedded obj: don't change new window sizeSzymon Kłos1-1/+1
Change-Id: Idc5e1e26fa1a98c6f96a1f0f15b6e5c3c9398402 Reviewed-on: https://gerrit.libreoffice.org/39957 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit f9d5877f41b54882a7f364f33b314cbaeb3b44c0) Reviewed-on: https://gerrit.libreoffice.org/39985 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
2017-07-14Show document title for embedded documentsSzymon Kłos4-0/+21
Embedded documents had "Untitled" name. This patch shows "<root document> (Embedded document)" string in the title bar. Change-Id: I6283240415f9e0c07c4c69672732a7c14eea9f5d Reviewed-on: https://gerrit.libreoffice.org/39835 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/39934 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-07-14OLE: show title of parent document in MSOSzymon Kłos2-5/+3
Change-Id: I5eee6568e0805eb0c609640923a77ebc4244cb12 Reviewed-on: https://gerrit.libreoffice.org/39859 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/39935 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-07-14tdf#108545 editable DOC/XLS embeddings inside DOCXSzymon Kłos1-3/+3
Change-Id: Ia6cbe829f94b3f27e4ea633c02d6b1ec6e98e984 Reviewed-on: https://gerrit.libreoffice.org/39860 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/39936 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2017-07-13tdf#108545 tdf#108544: DOCX, XLSX embedded in DOCSzymon Kłos2-19/+48
When on Windows the MSO wasn't installed DOCX and XLSX embedded documents weren't accessible. General OLE error was shown after doubleclick on the object. Linux solution is reused, OLE storage is extracted to get the document inside. Change-Id: If4d00fddad8e127fcf1a222836896d2907549d0c Reviewed-on: https://gerrit.libreoffice.org/39814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-06-27Resolves: tdf#108643 don't restore orig size on first chart activateCaolán McNamara1-1/+3
Change-Id: Ibe51eb81ea1b0874fc1a9018871f07c9af38e8d2 Reviewed-on: https://gerrit.libreoffice.org/39268 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 59d93d41537fa806219d705a6d06ed26bf09f2f3) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2017-05-10Related: tdf#62702 handle EmbeddedOdf like CONTENTS on ole activate attemptCaolán McNamara1-8/+23
(cherry picked from commit 8db9cfd2973b3e6f0c682fe8961540d528e6d493) Related: tdf#62702 also try various other known streams for object content (cherry picked from commit 013e34d875aeb75d9660af7c18967c2d468cbd74) Change-Id: I11f1d6ad049cada1cadfe97a440b7ae562ba4ced 5b5fa61e9930ba0eaa5ac86e4231050c9ebebf8a Reviewed-on: https://gerrit.libreoffice.org/37434 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 8f45915b6c76ace7aeffaa042d487e8e2d7f4d89)
2017-01-25Ole10Native payload truncatedCaolán McNamara1-5/+5
Change-Id: If2c0c2788e54eb01a1b6998c81df016061a0ad6b (cherry picked from commit da55a0e5158e14c3743b186d3b1d4022a278e4d5) Reviewed-on: https://gerrit.libreoffice.org/33450 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-01-16in extremis dump Ole10Native payload and launch system viewer on itCaolán McNamara1-4/+57
so embedded plain text documents/source code/etc in word documents can be viewed by us under Linux Change-Id: I19e19619070841fe097c70297adc2e8b96d1c581 (cherry picked from commit 75367918028dffb7a137d29644a7a6e1f7af7c9b) Reviewed-on: https://gerrit.libreoffice.org/32992 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-10-19replace <<= with assign for <<= with rhs AnyJochen Nitschke2-2/+2
queryAggregation and queryInterface return Any Change-Id: Ib8e3e742bd66f7419cad583988b247bb628f7b4a Reviewed-on: https://gerrit.libreoffice.org/29912 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
2016-10-16clang-cl loplugin: embeddedobjStephan Bergmann18-344/+356
Change-Id: Id8359ff2bc2ae177837f5c58f949d40b818a8684 Reviewed-on: https://gerrit.libreoffice.org/29869 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-05Remove _TYPED suffix from tools/link.hxx macrosStephan Bergmann3-3/+3
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually typed Link" to distinguish the new, typed versions from the old, untyped ones, but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173 "remove untyped Link<>" removed the old versions. Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
2016-09-27SAL_WARN in case bBackToLoaded failedStephan Bergmann1-1/+4
Change-Id: I3ee3801ae36b7394a97f46e76116cfd11c74de2d
2016-09-27Resolves: tdf#98946 too many running MathTypes...Caolán McNamara1-0/+16
causes mathtype to display a warning dialog, so try restoring them back to loaded after loading them in order to get their preferred size Change-Id: Idff714efa228a739f380dbae429d852a8f8c5298 Reviewed-on: https://gerrit.libreoffice.org/29234 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-23Resolves: tdf#101971 OleLoad under structured exception guardsCaolán McNamara1-2/+15
sample pptx crashes down in the depths of (apparently pre-installed on 32bit Windows 10) Flash.ocx Change-Id: I4e083d492e56e72df47b2c172d7f07f0e39b82ea Reviewed-on: https://gerrit.libreoffice.org/29199 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-16embeddedobj: add a comment why the original size is restoredMichael Stahl1-0/+2
... in OCommonEmbeddedObject::getPreferredVisualRepresentation() Change-Id: I326b7df4350f34fc9a1c363ea0e9bc77d8f1e976
2016-09-16loplugin:singlevalfields in basic..idlNoel Grandin2-4/+0
Also fix obvious bug in the initialisation of the connectivity::odbc::OConnection::m_bClosed field. Probably closes some kind of connection leak there. Change-Id: I04579cf91bcd6d6c51c697d83971da4142743a82 Reviewed-on: https://gerrit.libreoffice.org/28932 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-09-15disable generation of ole previews in ODF format until after loadCaolán McNamara1-1/+4
so the user update links dialog can control their generation SdrEmbedObjectLink becomes exposed to calc so it can detect if the link dialog needs to be used to update ole links. Change-Id: Id1dd7ea17342140eab9307d546528747e3a98090 Reviewed-on: https://gerrit.libreoffice.org/28879 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann7-7/+7
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
2016-08-30loplugin:stringconstant: adapt to improved OUStringLiteral1 (embeddedobj)Stephan Bergmann1-1/+1
Change-Id: I4d1d29155c09b15514f96a8b53f9865eefc78704
2016-08-16loplugin:salboolTakeshi Abe1-1/+1
Change-Id: Ib758a0b1c33173097aee80bff49b7c4937cf9fdf
2016-08-15Resolves: tdf#96451 do magic to enable embedded chart sidebar only for chartCaolán McNamara1-2/+9
objects, and do the normal thing for other objects, e.g. math Change-Id: Ifb786a841b843b0317713769cb214a44dceaf546
2016-07-29Fix typo: completelly -> completelyTakeshi Abe2-3/+3
Change-Id: I566c5554bf32ea18121c5a186365b97c91667c5d
2016-07-27improve passstuffbyref return analysisNoel Grandin4-4/+4
Change-Id: I4258bcc97273d8bb7a8c4879fac02a427f76e18c Reviewed-on: https://gerrit.libreoffice.org/27317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-11tdf#56818, use SolarMutex instead of own MutexMarkus Mohrhard1-10/+12
There is a SolarMutexReleaser in the call chain so that using an own mutex can deadlock. Change-Id: I1dd0b0c78ce6cf436a470319e616099cb947b6e0 Reviewed-on: https://gerrit.libreoffice.org/27085 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-15Resolves: tdf#100140 crash on exit of report designCaolán McNamara1-2/+2
This was triggered by This appears to be triggered by 08cf2fd01064306eef7fdbb5b62320947c4d1089 commit 08cf2fd01064306eef7fdbb5b62320947c4d1089 Author: Thorsten Behrens <Thorsten.Behrens@CIB.de> Date: Fri May 20 16:48:00 2016 +0200 which changed the order that things registered through registerDispatchProviderInterceptor are used by, so swap the order of registerDispatchProviderInterceptor calls here to sync with that Change-Id: I047e4c7f6cb488c646df717e22c8ac91864c3938
2016-05-24Fix tdf#99506: Insert OLE object with icon failedGuillaume Smaha1-0/+2
Change-Id: I7fe5814b268e4c70977699edaa89926ca3fda92e Reviewed-on: https://gerrit.libreoffice.org/25080 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-05-10Add SAL_FALLTHROUGH, where apparently appropriateStephan Bergmann1-0/+1
Change-Id: I49c216ed6e1e401fcc2029c047d7a7feeb767b36
2016-05-10Replace fallthrough comments with new SAL_FALLTHROUGH macroStephan Bergmann1-1/+1
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
2016-04-30Fix typosAndrea Gelmini1-1/+1
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-04-20loplugin:salbool: Automatic rewrite of sal_False/TrueStephan Bergmann8-59/+59
Change-Id: I8542bfaf9e27792369617c44258ddcc393e490a2
2016-04-14clang-tidy performance-unnecessary-value-param in variousNoel Grandin3-5/+5
Change-Id: I7168d44dab8e6a8e37bb7920d744ff32f5e52907 Reviewed-on: https://gerrit.libreoffice.org/24019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-14loplugin:passstuffbyref in variousNoel Grandin2-3/+3
Change-Id: I80070c83204e531c2f599f8a56193d6ffe0e5022
2016-04-12cleanup: remove unused com/sun/star/uno includesJochen Nitschke2-2/+0
Sequence.h(xx), Any.h(xx) and Type.h(xx) and remove unused using-declarations from these files. Add a few missing includes provided by them. Change-Id: I6b91b6d1fdf9d0496dd546c0aab9bdcc6831a5d4 Reviewed-on: https://gerrit.libreoffice.org/23805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-02-17use consistent #define checks for the Windows platformNoel Grandin8-46/+46
stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-02-09Remove excess newlinesChris Sherlock8-11/+0
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-02-05Fix typosAndrea Gelmini2-2/+2
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3 Reviewed-on: https://gerrit.libreoffice.org/21797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-25more Windows build fixesNoel Grandin2-3/+3
after my OInterfaceContainer2 change Change-Id: I4adb4a1937c12c1f6cb9183d567afb729d4e78ea
2016-01-25InterfaceContainer2 with vector instead of SequenceNoel Grandin5-5/+7
create an InterfaceContainer2 class to replace InterfaceContainer. It uses a std::vector instead of a Sequence for the mutable listener list, which provides far better performance. Switch all our internal use-sites to the new class. Change-Id: I6b56cfa511ded2395faa22e68fab3b2f16c3cb88
2016-01-13Fix memory leakStephan Bergmann2-8/+11
Change-Id: I82ce013a42ac1cd9bb4f3842e9fba8fbc6056b3c
2016-01-10Fix typosAndrea Gelmini3-3/+3
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-07cppcheck: noExplicitConstructorCaolán McNamara6-6/+6
Change-Id: Ifdcb1cc12645d6cdba81d16f94f0268696187cde Reviewed-on: https://gerrit.libreoffice.org/21201 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-12-23loplugin:unusedfields in desktopNoel Grandin1-2/+0
Change-Id: Ic816a7faf4d357d16c13f67533b3b409a531d14c
2015-12-20embeddedobj: do not automatically convert alien objects to ownMichael Stahl1-11/+0
OleEmbeddedObject::changeState() calls TryToConvertToOOo() on non-WNT platforms, which appears highly questionable to me, added in commit 0c3d5fb0ad35ff7fc18917fc86fa58d9312fe3ae. What this does effectively is load the embedded object, store it as ODF, and then load it again as ODF. For one, it doesn't work in all cases currently. If changeState() is not called from the UI but from some filter code, then no m_xClient may be set on the OleEmbeddedObject, hence no m_xClient will be set on the new m_xWrappedObject. Then loading the embedded object will raise errors due to missing BaseURL, and storing it will fail in SfxObjectShell::SaveTo_Impl(). (It would be possible to solve that by copying the "DefaultParentBaseURL" handling code from OCommonEmbeddedObject.) The only reason why the previous code in ShapeExport::WriteOLE2Shape() was able to export the object despite the error is that it does not call SfxBaseModel functions but directly invokes the export filter, so the sfx2 code does not get an opportunity to check its error status. For another, doing this only on non-WNT platforms is also hazardous. It's probably better to leave conversion to own formats to an explicit UI action, as the OleEmbeddedObject::doVerb(-9) magic currently does, where it can hopefully be assumed that the caller at least established the client connection first. Change-Id: Ice3d8f8ceabe81b6e9025957c3eb87de9dbfe61a
2015-12-08consolidate MSO format ClassID magic numbers in msfilter/classids.hxxMichael Stahl1-2/+2
Change-Id: I673eeaa4168f769cb002995c43d986ee5f2030b2
2015-11-28-Werror,-Wunused-functionStephan Bergmann1-0/+2
Change-Id: I6103a8539c4d788fff1a7e3c3530a6ec7cd1f0c6
2015-11-26mark UNO structs as SAL_WARN_UNUSED, where possibleNoel Grandin1-1/+0
Change-Id: Ie3de518f60c9f1313c68df54dbdc1fb2804f1f0d
2015-11-15use initialiser syntax for Sequence<OUString>Noel Grandin1-2/+1
replaced using the script: git grep -lP 'Sequence.*OUString.*\(1\)' | xargs perl -0777 -pi -e "s/Sequence< OUString > (\w+)\(1\); .*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g" Change-Id: I23688a91562051a8eed11fc2a85599545c285c34 Reviewed-on: https://gerrit.libreoffice.org/19967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>