summaryrefslogtreecommitdiff
path: root/sw/source
AgeCommit message (Collapse)AuthorFilesLines
2015-12-24remove (now) unused functionfeature/unostyles2Bjoern Michaelsen1-2/+0
Change-Id: Iddf0fce5343abeb199cb5d0c37d933d68c0e4c6a
2015-12-24refactor SwXStyle::ApplyDescriptorPropertiesBjoern Michaelsen1-12/+10
Change-Id: I219e75082c655a0895c75932863e596fcfccc656
2015-12-24refactor SwXStyle::getPropertySetInfoBjoern Michaelsen1-68/+10
Change-Id: If2ecee5c0e97c3955cffe4eb23d2bf651ec4ef2a
2015-12-24refactor SwXStyle::get/setParentStyleBjoern Michaelsen1-45/+29
Change-Id: Ifb578244d511af153484d14ee92c5c22c2db0a3f
2015-12-24refactor SwXStyle::isUserDefined/isInUseBjoern Michaelsen1-21/+9
Change-Id: I67d8408d410698f0f31738fcc30321c627307c73
2015-12-24refactor SwXStyle::get/setNameBjoern Michaelsen1-28/+22
Change-Id: If814b6873796fcfa4cc7a2f62711a8b20f2f7d6b
2015-12-24use local init function for conditional tooBjoern Michaelsen1-35/+29
Change-Id: I687161aa9295a1b815d11dd10fa83d23b010764a
2015-12-24use init helpers in ctorBjoern Michaelsen1-34/+32
Change-Id: If06321f5b353a09985d071290ece612fb98b34a1
2015-12-24have PROPERTY_MAP values in entries ...Bjoern Michaelsen1-35/+14
Change-Id: I478eb10315ee0709c43943945d500b82a8d9c8c9
2015-12-24lets have a ref to a StyleEntry from a SwXStyle tooBjoern Michaelsen1-53/+58
Change-Id: I368b2a6a6b5c54a962fed637c7e8cd472414be5c
2015-12-24refactor SwXStyle ctorBjoern Michaelsen1-26/+31
Change-Id: I306ca1b20af83519f81ca0867eb73cbbaa1874d2
2015-12-24remove GetPropImpl wrapperBjoern Michaelsen1-6/+5
Change-Id: I53c3f97d35621af9b6c5c0336b8c998d3fe0b270
2015-12-24remove GetBasePool wrappersBjoern Michaelsen1-22/+19
Change-Id: I0e7e8309c5d8873b9bde738a00579989d7b105fb
2015-12-24instead of lying with friendship, lets be honestBjoern Michaelsen1-20/+15
Change-Id: I0582734a0995638f45888e32c108e56ab3f28e80
2015-12-24use a proper smart pointer hereBjoern Michaelsen1-6/+6
Change-Id: Ic413e08bbaf38a6858926b1309618762a9ed1444
2015-12-24move trivial functions inlineBjoern Michaelsen1-67/+18
Change-Id: Icc7c58e847a4087460a86686c790722e6651c85a
2015-12-24move SwXStyle entirely into compilation unitBjoern Michaelsen5-140/+324
Change-Id: Icfcb4320aef9ebe2c5fcc84106de005934d51a3f
2015-12-24remove SwXStyle creation outside of compilation unitBjoern Michaelsen2-11/+26
Change-Id: I136822a0ad581d1490fc6f8842c95f2d25dfeba4
2015-12-23New saving behaviorMaxim Monastirsky1-4/+0
Changes in this commit: - AlwaysAllowSave config is gone. Saving is always permitted, unless in a read only document. Also changed the behavior in dbaccess to match sfx2. - The toolbar save button is always enabled, to always give access to the dropdown. That's the case even in a read only document, except that it changes to DROPDOWNONLY, and the save as command icon+tooltip. In table/query designers we still disable the button in read only state. - When the document is modified, the toolbar button gets a special icon to indicate that. TODO: - Icons for the document modified state are still missing. I added some fake links to Tango's links.txt in order to test the new behavior. These links shouldn't stay as-is in a production version! Change-Id: I56c169bf48b78faaf53c2989ce8624f8297ffb6e Reviewed-on: https://gerrit.libreoffice.org/20839 Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
2015-12-22crashtesting: CreateShellID returns the mediums base url...Caolán McNamara2-3/+3
when it works the way we want it to work, so presumably we can cut out the middle man and use getDocumentBaseURL directly which does the same thing. This has the advantage of being in the IEmbeddedHelper api so assignFrom can be tweaked to pull the src and dest ids arguments to CopyAndGetEmbeddedObject from the src and dest IEmbeddedHelpers always available there. So we ensure we have some ids to present to CopyAndGetEmbeddedObject, avoiding the assert on converting documents such as ooo89433-1.ppt to pdf So the explicit args can apparently be dropped, bubbling up then means we don't need a CloneWithShellIDs (introduced with tdf#71076 and tdf#71767) as normal Clone should now do the right thing. And various other arguments in various callers of these, which are typically filled in with an unhelpful empty OUString placeholder, can go Change-Id: I9c0be0340e72f98b10ee87ada7d2a021fcc39e23
2015-12-22Avoid bad downcast during destructionStephan Bergmann1-1/+1
...as reported by UBSan in CppunitTest_sw_filters_test: > /sw/inc/format.hxx:110:73: runtime error: downcast of address 0x2af2d8024000 which does not point to an object of type 'const SwFormat' > 0x2af2d8024000: note: object is of type 'SwModify' > f2 2a 00 00 70 33 2f 87 f2 2a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > ^~~~~~~~~~~~~~~~~~~~~~~ > vptr for 'SwModify' > #0 0x2af27bbe8083 in SwFormat::DerivedFrom() const /sw/inc/format.hxx:110:73 > #1 0x2af27bbc8401 in SwFormat::Modify(SfxPoolItem const*, SfxPoolItem const*) /sw/source/core/attr/format.cxx:282:21 > #2 0x2af27e9934a3 in SwFrameFormat::Modify(SfxPoolItem const*, SfxPoolItem const*) /sw/source/core/layout/atrfrm.cxx:2597:5 > #3 0x2af27f8207d5 in SwTableBoxFormat::Modify(SfxPoolItem const*, SfxPoolItem const*) /sw/source/core/table/swtable.cxx:2353:5 > #4 0x2af27bb9cd52 in SwClient::SwClientNotify(SwModify const&, SfxHint const&) /sw/source/core/attr/calbck.cxx:68:9 > #5 0x2af27bba4bee in SwModify::CallSwClientNotify(SfxHint const&) const /sw/inc/calbck.hxx:349:9 > #6 0x2af27bba290b in SwModify::ModifyBroadcast(SfxPoolItem const*, SfxPoolItem const*) /sw/inc/calbck.hxx:173:11 > #7 0x2af27bb9fbc0 in SwModify::NotifyClients(SfxPoolItem const*, SfxPoolItem const*) /sw/source/core/attr/calbck.cxx:143:5 > #8 0x2af27bb9e0e7 in SwModify::~SwModify() /sw/source/core/attr/calbck.cxx:101:5 > #9 0x2af27bbc6bb4 in SwFormat::~SwFormat() /sw/source/core/attr/format.cxx:251:1 > #10 0x2af27e98fdf3 in SwFrameFormat::~SwFrameFormat() /sw/source/core/layout/atrfrm.cxx:2534:1 > #11 0x2af27e9900af in SwFrameFormat::~SwFrameFormat() /sw/source/core/layout/atrfrm.cxx:2525:1 > #12 0x2af27cb1646e in SwDoc::~SwDoc() /sw/source/core/doc/docnew.cxx:592:5 > #13 0x2af27cb1993f in SwDoc::~SwDoc() /sw/source/core/doc/docnew.cxx:385:1 > #14 0x2af282d45bb0 in SwDocShell::RemoveLink() /sw/source/uibase/app/docshini.cxx:472:13 > #15 0x2af282d43596 in SwDocShell::~SwDocShell() /sw/source/uibase/app/docshini.cxx:394:5 > #16 0x2af282d45f46 in SwDocShell::~SwDocShell() /sw/source/uibase/app/docshini.cxx:384:1 > #17 0x2af282d4637f in SwDocShell::~SwDocShell() /sw/source/uibase/app/docshini.cxx:384:1 > #18 0x2af282d464c6 in virtual thunk to SwDocShell::~SwDocShell() /sw/source/uibase/app/docshini.cxx:383:13 > #19 0x2af27420aade in SvRefBase::ReleaseRef() /include/tools/ref.hxx:138:29 > #20 0x2af27420195a in tools::SvRef<SwDocShell>::~SvRef() /include/tools/ref.hxx:49:30 > #21 0x2af2741f6663 in SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) /sw/qa/core/filters-test.cxx:130:1 > #22 0x2af2741f368e in SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) /sw/qa/core/filters-test.cxx:69:12 > #23 0x2af29a05d1fb in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) /unotest/source/cpp/filters-test.cxx:129:20 > #24 0x2af29a060741 in test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) /unotest/source/cpp/filters-test.cxx:154:5 > #25 0x2af2741fa8fa in SwFiltersTest::testCVEs() /sw/qa/core/filters-test.cxx:174:5 > #26 0x2af27421631d in CppUnit::TestCaller<SwFiltersTest>::runTest() /workdir/UnpackedTarball/cppunit/include/cppunit/TestCaller.h:166:6 > #27 0x2af23644866d in CppUnit::TestCaseMethodFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5 > #28 0x2af24e66d0d6 in (anonymous namespace)::Protector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /test/source/vclbootstrapprotector.cxx:57:14 > #29 0x2af236403bb7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12 > #30 0x2af2458a1926 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx:88:12 > #31 0x2af236403bb7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12 > #32 0x2af241b89d58 in (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx:63:16 > #33 0x2af236403bb7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12 > #34 0x2af23638b90c in CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12 > #35 0x2af236403bb7 in CppUnit::ProtectorChain::ProtectFunctor::operator()() const /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:12 > #36 0x2af2363ffb61 in CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) /workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:77:18 > #37 0x2af2364c91c5 in CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::string const&) /workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:181:10 > #38 0x2af2364451c6 in CppUnit::TestCase::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:5 > #39 0x2af23644bc03 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:5 > #40 0x2af23644ab6d in CppUnit::TestComposite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3 > #41 0x2af23644bc03 in CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:5 > #42 0x2af23644ab6d in CppUnit::TestComposite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3 > #43 0x2af2365078c6 in CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:5 > #44 0x2af2364c7049 in CppUnit::TestResult::runTest(CppUnit::Test*) /workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:148:3 > #45 0x2af236508e86 in CppUnit::TestRunner::run(CppUnit::TestResult&, std::string const&) /workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:3 > #46 0x501b3c in (anonymous namespace)::ProtectedFixtureFunctor::run() const /sal/cppunittester/cppunittester.cxx:281:13 > #47 0x4fc866 in sal_main() /sal/cppunittester/cppunittester.cxx:431:14 > #48 0x4fa822 in main /sal/cppunittester/cppunittester.cxx:338:1 > #49 0x2af2380d2af4 in __libc_start_main (/lib64/libc.so.6+0x21af4) > #50 0x4323c4 in _start (/workdir/LinkTarget/Executable/cppunittester+0x4323c4) Change-Id: Ic1ff73d3184ad2cd97555b7a45fb205e9ec84ac6
2015-12-22loplugin:simplifyboolStephan Bergmann1-1/+1
Change-Id: I0d15e52100e154bb3681e0092ee663ceeef61f9d
2015-12-22tdf#93009 SwViewShell: fix printing of comments on the marginMiklos Vajna1-2/+2
Clipping was set not only in case of VCL-level double buffering, but also during printing, which means comments were excluded from the output. Change-Id: Iffb7d91ca78c09e2b43133f5049d52bd7dc4e730
2015-12-21crashtesting: post NPAPI removal crash fixingCaolán McNamara2-4/+7
Change-Id: I99d79735c375f3d632382a8efa0202517a293b1f
2015-12-21loplugin:unusedfields in swNoel Grandin47-117/+42
Change-Id: I4d987718bf27766c8cd7f3654db6645e5a7f554a
2015-12-21tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4Juergen Funk1-419/+576
Refactory the methode "MergeMailFiles" Change-Id: I65441ade522c06335b0da23cb2fed9afc5bcb72e Reviewed-on: https://gerrit.libreoffice.org/20714 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2015-12-21loplugin:unusedmethodsNoel Grandin1-3/+0
Change-Id: Ifafdaf6da0225f244853a0042a6458643b570623
2015-12-20loplugin:staticcallStephan Bergmann1-1/+1
Change-Id: I23cdf631d7a5854aa41fb24a1bc793019174baf9
2015-12-20loplugin:cstylecastStephan Bergmann1-1/+1
Change-Id: I986a11f56fa8900bc8ee654ed4a614bb01c353c3
2015-12-20sw: remove that silly lcl_CopyStreamMichael Stahl2-29/+14
Change-Id: I0a357d5c4a2ff46e5203ba045b9550285e33943e
2015-12-20factor out oox::GetOLEObjectStream() without sw dependenciesMichael Stahl1-211/+5
Change-Id: I32fa4b6b6d755b613b46b32d3b5961976335c76e
2015-12-20sw: stop using SfxObjectShell in DocxExport::WriteOLEObjectMichael Stahl1-10/+28
Change-Id: I3ffa29c57bcb6d12208ef24cb6972364c2f50315
2015-12-19tdf#83755 correct non-printing character positionMark Hung1-0/+22
Bullet of non-monospace font that is used as non-printing character to indicate space might be wider than the space. Drawing the bullet over the space make the bullet too close to next character. Shift the bullet accordingly so that bullet is centered with original space. Change-Id: I0d8d721041e8a475546fe25fb01bee374fc3e499 Reviewed-on: https://gerrit.libreoffice.org/20112 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
2015-12-18tdf#33477: added support of property VertOrient to cell rangeOliver Specht2-0/+32
Change-Id: Id8f0c138fb665a19b92f2779aa59ae1778efddc5 Reviewed-on: https://gerrit.libreoffice.org/20789 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
2015-12-18related tdf#96398 pull out more NPAPI-related codeThorsten Behrens1-1/+0
Fixup windows PCH plus pulling out more code now unused due to NPAPI removal. Follow-up to 4c18af27bf95b332ee2006cfc0bbf469fb1a84d4. Change-Id: I8ad42a28139ceeab0cae1f608d55beb28c159db3 Reviewed-on: https://gerrit.libreoffice.org/20783 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-12-17nConfigId is always 0Maxim Monastirsky1-1/+1
Change-Id: Ic314bc04a22ebf23fa7b06dca06e4d2afae096f9
2015-12-17[API CHANGE] Remove NPAPI-related UNO APIThorsten Behrens1-40/+0
Follow-up to 4c18af27bf95b332ee2006cfc0bbf469fb1a84d4, related to tdf#96398, removing more client code. The following published interfaces are removed: com::sun::star::mozilla::XPluginInstance com::sun::star::mozilla::XPluginInstanceNotifySink com::sun::star::mozilla::XPluginInstancePeer com::sun::star::mozilla::XPluginInstanceSyncPeer com::sun::star::mozilla::XPluginWindowPeer com::sun::star::plugin::PluginDescription com::sun::star::plugin::PluginException com::sun::star::plugin::PluginManager com::sun::star::plugin::PluginMode com::sun::star::plugin::PluginVariable com::sun::star::plugin::XPlugin com::sun::star::plugin::XPluginContext com::sun::star::plugin::XPluginManager Change-Id: I3818a23e0f46fd01bfe9be11b57f6a551c013441 Reviewed-on: https://gerrit.libreoffice.org/20780 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-12-17Remove unused ToolPanel (aka TaskPane)Samuel Mehrbrodt1-2/+0
Superseded by the Sidebar Change-Id: I54970d71cd9d42de4f47b223e50dd9474b40632a Reviewed-on: https://gerrit.libreoffice.org/20724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-12-17sw, sd, sc: clean up no longer necessary isTiledRendering() member functionsMiklos Vajna1-6/+0
Change-Id: I508a29fd261865771d780b1c241841d9abfeb6ed
2015-12-17Manage m_pSttNdIdx via unique_ptrStephan Bergmann2-5/+7
...so it gets deleted upon an exception Change-Id: I239f916019806eef1b761248fd167f5febf25001
2015-12-16assert that no ODF import happens without a BaseURLMichael Stahl1-0/+2
Change-Id: I4520a9d0350349cb083ed627a19264a3a97e090f
2015-12-16tdf#96536 sw Hide Whitespace: shrink oversized page frames on para deleteMiklos Vajna2-1/+17
The body frame did get a request to shrink, but because it had fixed size, nothing happened. Trigger a recalc that does the right thing wrt. hidden whitespace. Change-Id: I446978da8b33372c2ab30200b45b1bcec1dea7a0
2015-12-16sw layout xml dump: show if the frame has fix sizeMiklos Vajna1-0/+1
Change-Id: Ie9f9c5cc94b87914bcd7d5392f6fd1ee447e94ec
2015-12-16tdf#96515 sw Hide Whitespace: avoid creating unneeded page framesMiklos Vajna1-1/+28
Change-Id: I9b273543ccf2eaa87116c6e1475860e9e872c445
2015-12-15sw: DOCX export: eliminate chart numbering non-determinismMichael Stahl2-3/+5
... that was causing test failures on some but not all platforms. Change-Id: I0d04cd6e540ea2693a3ec8511d615a9b0fecf456
2015-12-15sw: fix MSVC build, stupid thing can't initialize const membersMichael Stahl1-5/+5
Change-Id: I546b96a5628d2ad186b5b626cce28f67841db157
2015-12-15sw: set a BaseURL when copying embedded objectsMichael Stahl1-2/+2
Turns out that SfxObjectShell::CreateShellID() will produce the SfxMedium's base URL if it exists, so EmbeddedObjectContainer::CopyAndGetEmbeddedObject() already has parameters, sw just needs to set them. Change-Id: I36cedfde4e7c2e25c43c66a30d8ca572f099ad69
2015-12-15filter: add BaseURL parameter to SvxMSDffManager::ImportOLE()Michael Stahl3-3/+4
... mainly for the (unlikely) case of ODF embedded objects in MSO binary files, which can be created by toggling the Tools->Options->Load/Save->Microsoft Office export settings. Change-Id: I270f1516b70b20ec0b60cfbd17c2c327c3d9efd0
2015-12-15sw: extend various OOXML export test to check embedded objectsMichael Stahl1-0/+1
Change-Id: I272afd26addfde5065939db4a04c2f0f01aa28c8
2015-12-15sw: DOCX export: convert ODF embedded objects to OOXMLMichael Stahl2-7/+119
If the user edits an embedded object it is converted to ODF, so we really need to be able to store such objects. Ensure that the proper MediaType is set in [Content_Types].xml, the package relationship type in document.xml.rels and the proper ProgID attribute in document.xml. Change-Id: I3c78c5ab5b4d534213af5e773fe0c6c2c92d9104