Age | Commit message (Collapse) | Author | Files | Lines |
|
triggered by commit 0143805a565418d2a114c16b7eeba3b784176d9e
from Implementation::Update the mpViewShellManagerLock.reset is triggering
reentry to the same method, this time in the other branch and calling
mpViewShellManagerLock.release and delete pLock
it's all a bit appalling really
==15411== Invalid read of size 8
==15411== at 0x214B62F4: boost::detail::shared_count::~shared_count() (shared_count.hpp:371)
==15411== by 0x216C3EE3: boost::shared_ptr<sd::ViewShellManager>::~shared_ptr() (shared_ptr.hpp:328)
==15411== by 0x21883EE8: sd::ViewShellManager::UpdateLock::~UpdateLock() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsdlo.so)
==15411== by 0x21972275: std::auto_ptr<sd::ViewShellManager::UpdateLock>::reset(sd::ViewShellManager::UpdateLock*) (auto_ptr.h:244)
==15411== by 0x21969F20: sd::ToolBarManager::Implementation::Update(std::auto_ptr<(anonymous namespace)::LayouterLock>) (ToolBarManager.cxx:957)
==15411== by 0x21969C46: sd::ToolBarManager::Implementation::UnlockUpdate() (ToolBarManager.cxx:884)
==15411== by 0x21968053: sd::ToolBarManager::UnlockUpdate() (ToolBarManager.cxx:540)
==15411== by 0x216E03A4: sd::ToolBarManager::UpdateLock::~UpdateLock() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsdlo.so)
==15411== by 0x216E051C: void boost::checked_delete<sd::ToolBarManager::UpdateLock>(sd::ToolBarManager::UpdateLock*) (checked_delete.hpp:34)
==15411== by 0x216E0484: boost::scoped_ptr<sd::ToolBarManager::UpdateLock>::~scoped_ptr() (scoped_ptr.hpp:82)
==15411== by 0x216E04FC: boost::scoped_ptr<sd::ToolBarManager::UpdateLock>::reset(sd::ToolBarManager::UpdateLock*) (scoped_ptr.hpp:88)
==15411== by 0x216E01D6: sd::framework::ToolBarModule::HandleUpdateEnd() (ToolBarModule.cxx:203)
==15411== by 0x216DFEA5: sd::framework::ToolBarModule::notifyConfigurationChange(com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ToolBarModule.cxx:125)
==15411== by 0x2169D2F6: sd::framework::ConfigurationControllerBroadcaster::NotifyListeners(std::__debug::vector<sd::framework::ConfigurationControllerBroadcaster::ListenerDescriptor, std::allocator<sd::framework::ConfigurationControllerBroadcaster::ListenerDescriptor> > const&, com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ConfigurationControllerBroadcaster.cxx:104)
==15411== by 0x2169D62C: sd::framework::ConfigurationControllerBroadcaster::NotifyListeners(com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ConfigurationControllerBroadcaster.cxx:132)
==15411== by 0x216A9A49: sd::framework::ConfigurationUpdater::UpdateConfiguration() (ConfigurationUpdater.cxx:202)
==15411== by 0x216A9692: sd::framework::ConfigurationUpdater::RequestUpdate(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&) (ConfigurationUpdater.cxx:124)
==15411== by 0x2168D0AE: sd::framework::ChangeRequestQueueProcessor::ProcessOneEvent() (ChangeRequestQueueProcessor.cxx:186)
==15411== by 0x2168CE39: sd::framework::ChangeRequestQueueProcessor::ProcessEvent(void*) (ChangeRequestQueueProcessor.cxx:139)
==15411== by 0x2168CDFA: sd::framework::ChangeRequestQueueProcessor::LinkStubProcessEvent(void*, void*) (ChangeRequestQueueProcessor.cxx:131)
==15411== by 0x90D9283: Link::Call(void*) const (link.hxx:123)
==15411== by 0x96A2CC3: ImplHandleUserEvent(ImplSVEvent*) (winproc.cxx:1986)
==15411== by 0x96A422A: ImplWindowFrameProc(Window*, SalFrame*, unsigned short, void const*) (winproc.cxx:2601)
==15411== by 0x96B28CA: SalFrame::CallCallback(unsigned short, void const*) const (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libvcllo.so)
==15411== by 0x96B2355: SalGenericDisplay::DispatchInternalEvent() (gendisp.cxx:91)
==15411== by 0x16DB2069: GtkData::userEventFn(void*) (gtkdata.cxx:935)
==15411== by 0x16DB20C4: call_userEventFn (gtkdata.cxx:945)
==15411== by 0x3795647A54: g_main_context_dispatch (gmain.c:2715)
==15411== by 0x3795647D87: g_main_context_iterate.isra.24 (gmain.c:3290)
==15411== by 0x3795647E43: g_main_context_iteration (gmain.c:3351)
==15411== by 0x16DB0F2D: GtkData::Yield(bool, bool) (gtkdata.cxx:574)
==15411== by 0x16DB4ACD: GtkInstance::Yield(bool, bool) (gtkinst.cxx:404)
==15411== by 0x90F2FEF: ImplYield(bool, bool) (svapp.cxx:422)
==15411== by 0x90EF588: Application::Yield(bool) (svapp.cxx:456)
==15411== by 0x90EF529: Application::Execute() (svapp.cxx:401)
==15411== by 0x4EC7147: desktop::Desktop::Main() (app.cxx:1720)
==15411== by 0x90FBA70: ImplSVMain() (svmain.cxx:162)
==15411== by 0x90FBB59: SVMain() (svmain.cxx:198)
==15411== by 0x4F098B5: soffice_main (sofficemain.cxx:82)
==15411== by 0x400967: sal_main (main.c:48)
==15411== by 0x400948: main (main.c:47)
==15411== Address 0x1f2a66b8 is 8 bytes inside a block of size 16 free'd
==15411== at 0x4A073CC: operator delete(void*) (vg_replace_malloc.c:480)
==15411== by 0x21969E8B: sd::ToolBarManager::Implementation::Update(std::auto_ptr<(anonymous namespace)::LayouterLock>) (ToolBarManager.cxx:936)
==15411== by 0x21969C46: sd::ToolBarManager::Implementation::UnlockUpdate() (ToolBarManager.cxx:884)
==15411== by 0x21968053: sd::ToolBarManager::UnlockUpdate() (ToolBarManager.cxx:540)
==15411== by 0x216E03A4: sd::ToolBarManager::UpdateLock::~UpdateLock() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsdlo.so)
==15411== by 0x21967962: sd::ToolBarManager::ResetToolBars(sd::ToolBarManager::ToolBarGroup) (ToolBarManager.cxx:410)
==15411== by 0x219AC02F: sd::DrawViewShell::ChangeEditMode(EditMode, bool) (drviews1.cxx:363)
==15411== by 0x219CC31E: sd::DrawViewShell::ReadFrameViewData(sd::FrameView*) (drviews5.cxx:295)
==15411== by 0x21A45CBA: sd::ViewShell::Activate(unsigned char) (viewshel.cxx:350)
==15411== by 0x219AB09E: sd::DrawViewShell::Activate(unsigned char) (drviews1.cxx:93)
==15411== by 0x663DA02: SfxShell::DoActivate_Impl(SfxViewFrame*, unsigned char) (shell.cxx:571)
==15411== by 0x69853B7: SfxDispatcher::FlushImpl() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsfxlo.so)
==15411== by 0x652A459: SfxDispatcher::Flush() (dispatch.hxx:237)
==15411== by 0x6974199: SfxViewShell::AddSubShell(SfxShell&) (viewsh.cxx:1409)
==15411== by 0x21986D9B: sd::ViewShellManager::Implementation::UpdateShellStack() (ViewShellManager.cxx:963)
==15411== by 0x21986785: sd::ViewShellManager::Implementation::UnlockUpdate() (ViewShellManager.cxx:881)
==15411== by 0x21983F27: sd::ViewShellManager::UnlockUpdate() (ViewShellManager.cxx:425)
==15411== by 0x21883EDC: sd::ViewShellManager::UpdateLock::~UpdateLock() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsdlo.so)
==15411== by 0x21972275: std::auto_ptr<sd::ViewShellManager::UpdateLock>::reset(sd::ViewShellManager::UpdateLock*) (auto_ptr.h:244)
==15411== by 0x21969F20: sd::ToolBarManager::Implementation::Update(std::auto_ptr<(anonymous namespace)::LayouterLock>) (ToolBarManager.cxx:957)
==15411== by 0x21969C46: sd::ToolBarManager::Implementation::UnlockUpdate() (ToolBarManager.cxx:884)
==15411== by 0x21968053: sd::ToolBarManager::UnlockUpdate() (ToolBarManager.cxx:540)
==15411== by 0x216E03A4: sd::ToolBarManager::UpdateLock::~UpdateLock() (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libsdlo.so)
==15411== by 0x216E051C: void boost::checked_delete<sd::ToolBarManager::UpdateLock>(sd::ToolBarManager::UpdateLock*) (checked_delete.hpp:34)
==15411== by 0x216E0484: boost::scoped_ptr<sd::ToolBarManager::UpdateLock>::~scoped_ptr() (scoped_ptr.hpp:82)
==15411== by 0x216E04FC: boost::scoped_ptr<sd::ToolBarManager::UpdateLock>::reset(sd::ToolBarManager::UpdateLock*) (scoped_ptr.hpp:88)
==15411== by 0x216E01D6: sd::framework::ToolBarModule::HandleUpdateEnd() (ToolBarModule.cxx:203)
==15411== by 0x216DFEA5: sd::framework::ToolBarModule::notifyConfigurationChange(com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ToolBarModule.cxx:125)
==15411== by 0x2169D2F6: sd::framework::ConfigurationControllerBroadcaster::NotifyListeners(std::__debug::vector<sd::framework::ConfigurationControllerBroadcaster::ListenerDescriptor, std::allocator<sd::framework::ConfigurationControllerBroadcaster::ListenerDescriptor> > const&, com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ConfigurationControllerBroadcaster.cxx:104)
==15411== by 0x2169D62C: sd::framework::ConfigurationControllerBroadcaster::NotifyListeners(com::sun::star::drawing::framework::ConfigurationChangeEvent const&) (ConfigurationControllerBroadcaster.cxx:132)
==15411== by 0x216A9A49: sd::framework::ConfigurationUpdater::UpdateConfiguration() (ConfigurationUpdater.cxx:202)
==15411== by 0x216A9692: sd::framework::ConfigurationUpdater::RequestUpdate(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XConfiguration> const&) (ConfigurationUpdater.cxx:124)
==15411== by 0x2168D0AE: sd::framework::ChangeRequestQueueProcessor::ProcessOneEvent() (ChangeRequestQueueProcessor.cxx:186)
==15411== by 0x2168CE39: sd::framework::ChangeRequestQueueProcessor::ProcessEvent(void*) (ChangeRequestQueueProcessor.cxx:139)
==15411== by 0x2168CDFA: sd::framework::ChangeRequestQueueProcessor::LinkStubProcessEvent(void*, void*) (ChangeRequestQueueProcessor.cxx:131)
==15411== by 0x90D9283: Link::Call(void*) const (link.hxx:123)
==15411== by 0x96A2CC3: ImplHandleUserEvent(ImplSVEvent*) (winproc.cxx:1986)
==15411== by 0x96A422A: ImplWindowFrameProc(Window*, SalFrame*, unsigned short, void const*) (winproc.cxx:2601)
==15411== by 0x96B28CA: SalFrame::CallCallback(unsigned short, void const*) const (in /home/caolan/LibreOffice/core/solver/unxlngx6/lib/libvcllo.so)
==15411== by 0x96B2355: SalGenericDisplay::DispatchInternalEvent() (gendisp.cxx:91)
==15411== by 0x16DB2069: GtkData::userEventFn(void*) (gtkdata.cxx:935)
==15411== by 0x16DB20C4: call_userEventFn (gtkdata.cxx:945)
==15411== by 0x3795647A54: g_main_context_dispatch (gmain.c:2715)
==15411== by 0x3795647D87: g_main_context_iterate.isra.24 (gmain.c:3290)
==15411== by 0x3795647E43: g_main_context_iteration (gmain.c:3351)
==15411== by 0x16DB0F2D: GtkData::Yield(bool, bool) (gtkdata.cxx:574)
==15411== by 0x16DB4ACD: GtkInstance::Yield(bool, bool) (gtkinst.cxx:404)
==15411== by 0x90F2FEF: ImplYield(bool, bool) (svapp.cxx:422)
==15411== by 0x90EF588: Application::Yield(bool) (svapp.cxx:456)
==15411== by 0x90EF529: Application::Execute() (svapp.cxx:401)
Change-Id: I0171225067dd0f7f8da1400beb9c97727a0c414f
|
|
Change-Id: I86080d7849b58f39623c22494992b2d84d9ed6de
|
|
to other application window
(cherry picked from commit 604502e2a4b53f35aedbf0205598a9b691c0d532)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/inc/sfx2/shell.hxx
sfx2/source/control/shell.cxx
svx/inc/svx/sidebar/SelectionAnalyzer.hxx
svx/inc/svx/sidebar/SelectionChangeHandler.hxx
Change-Id: Id3c427e02714ef0d6686a78094e2f7f3b390a693
|
|
when editing texts in graphic objects and/or tables
(cherry picked from commit a096725779b210c7a2706e72596fd7c80e049fdd)
Conflicts:
editeng/inc/editeng/editeng.hxx
editeng/inc/editeng/editund2.hxx
editeng/inc/editeng/outliner.hxx
editeng/source/editeng/editundo.cxx
editeng/source/editeng/impedit.hxx
editeng/source/outliner/outliner.cxx
sd/source/core/undo/undomanager.cxx
sd/source/ui/view/drviewse.cxx
svx/Library_svxcore.mk
svx/Package_inc.mk
svx/inc/svx/svdedxv.hxx
svx/source/svdraw/svdedxv.cxx
Change-Id: I40e3ef2dff681f9b6f2f6b5d35507071f8110533
Comment unused variable pNewEditUndoManager to silence the compiler
(cherry picked from commit 568655083af7830e7b9edf56ef862ddf9a99003b)
Change-Id: Ib7179ee6c34ce03a75942978831c3a55968f161f
Removed unused variable
(cherry picked from commit 0bbde4414badfd40234de4a4c9f750194f5d1d5e)
Change-Id: I39e7f25426e8e7d1367102d603b0f6c84d96622f
|
|
Change-Id: I7a5f2881d2aa77f2d5c6c302c8eac1162b194bcf
Reviewed-on: https://gerrit.libreoffice.org/4016
Reviewed-by: Jan Holesovsky <kendy@suse.cz>
Tested-by: Jan Holesovsky <kendy@suse.cz>
|
|
Change-Id: I7a342c809a723f5f9c03271c6145d9c367cea6de
Reviewed-on: https://gerrit.libreoffice.org/4015
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
(cherry picked from commit b38a51d67373daf9a45a4701e7c760c7b3571a66)
Conflicts:
chart2/uiconfig/toolbar/standardbar.xml
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml
sc/uiconfig/scalc/toolbar/standardbar.xml
sd/uiconfig/sdraw/toolbar/standardbar.xml
starmath/uiconfig/smath/toolbar/standardbar.xml
sw/uiconfig/sglobal/toolbar/standardbar.xml
sw/uiconfig/sweb/toolbar/standardbar.xml
sw/uiconfig/swform/toolbar/standardbar.xml
sw/uiconfig/swreport/toolbar/standardbar.xml
sw/uiconfig/swriter/toolbar/standardbar.xml
sw/uiconfig/swxform/toolbar/standardbar.xml
Change-Id: Iac0c7e8e474e8d217ca4daf47232019c64ca888f
|
|
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/source/msfilter/escherex.cxx
Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
|
|
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit 8d04823a6038d32f6ac9821925616da7c5cc44c9)
Conflicts:
filter/inc/filter/msfilter/svdfppt.hxx
sd/source/filter/ppt/pptin.cxx
Change-Id: I222003a9e8d474ebc4dd9bc83cdcceded88a79f4
|
|
This reverts commit 979def88090633bfee0e0445b19999a1dac71ed4,
this time manually confirmed that the import layout does change, but that it
appears to be all desirable changes
Change-Id: Iee5e5ebd16989f65569b02f8b4f6570985157dfc
|
|
This reverts commit 54c679f481647890f18151f4db05cfc3eff5d98b.
pushed that too soon before verifying if it does what it says
it does
|
|
DrawViewShell::GetAttrState() might create a temporary new SvxNumRule
object. Make sure it gets deleted when done.
Change-Id: I33ddd9df983193fe87dd076267043d202cdfc3d5
Reviewed-on: https://gerrit.libreoffice.org/4020
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reported by: Li Feng Wang
Patch by: Jianyuan Li
Review by: Andre Fischer
(cherry picked from commit 57fdcdd79d1682ee7d5e88fbab3803631496afa2)
Conflicts:
filter/inc/filter/msfilter/svdfppt.hxx
filter/source/msfilter/svdfppt.cxx
Change-Id: I6adae6d40ff106caeea2b9310a57228257d79404
Related: #i119874# Missing part of patch.
Patch by: Jianyuan Li
(cherry picked from commit a7dc3e8b82c87b138c973f1434717d634ed8dc67)
Change-Id: Icff3e1167ab780612ad47775aaa39c9baa99c70f
|
|
Change-Id: Ibcc9679b37f22fdfb6a53503b252f55a52834fbb
|
|
Change-Id: I2eefbca1ef986219f04504cba4ca09a22972e8cb
|
|
(cherry picked from commit 4b0aafb8182b1f86b9edf947a4c62ff9948c6676)
Change-Id: Ieae8e44fe147309cc3ff447a6dbc375d1b2f34d0
|
|
(cherry picked from commit 164d3096008c529462adc06099795fe037c0d2a7)
Change-Id: I29956f976e7ac38a9d06d973bb2b3d2d06e1e341
|
|
Text Animation properties to "As one object" and check "Animate attached shape"
option
(cherry picked from commit 897637ec83365f6e78c766fa3354de5d92aedfeb)
Change-Id: Ifbe4f6dbbaebde7afc2d800652dca731ba1c039f
|
|
Reported by: liupingtan
Patch by: Ying Sun
Review by: Jian Yuan Li(cherry picked from commit a19ed1cba504e1531df54de9131960f9dc2c94f9)
Change-Id: Ied47d7f1421d3e27d8c7ad6529234f188af23787
|
|
Change-Id: I988439f8be9822c73d19c292da37e2cb102b1c78
|
|
Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4
|
|
(cherry picked from commit f6bff98d6f13bf71fc4bce53c189598c002343c2)
Change-Id: I8c7ca633043ec224df4e4ab08c20d44f969a8059
Corrected signed/unsigned mix
(cherry picked from commit 20a3aee5359f143a6e4bf0bcb7fdef4675b3dd83)
Change-Id: I6f8ffc6f541c2a06c9e97ef06711f312adc438f2
|
|
caused by slide sorter key event
(cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e)
Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f
|
|
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54)
Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468
|
|
Change-Id: Ief8e7c0fe01809b6059aa85a4cc8d2ba713f902a
|
|
Also create a Clang compiler plugin to detect such cases.
Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752
Reviewed-on: https://gerrit.libreoffice.org/4001
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
|
|
Change-Id: Ib4fe3b2aa234ab636f1f1b222600617bb09ea806
|
|
Change-Id: I4fd8530d461701c736beaf15ca6cf66dfdf58f86
|
|
valgrind doesn't know that struct sockaddr_rc contains some padding that
isn't used. Since we pass bind sizeof (struct sockaddr_rc) valgrind will
check all bytes are initialized. So explicitly clear all bytes before
passing to bind.
https://bugs.kde.org/show_bug.cgi?id=320116 tracks adding explicit
support to valgrind.
Change-Id: I05d2f221a5794228dae3077e8ea1bcda5ba1f8b0
Reviewed-on: https://gerrit.libreoffice.org/3998
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
Change-Id: Ic49c2519b5949661a13f8a24c2c4a084242b1882
Reviewed-on: https://gerrit.libreoffice.org/3976
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
at least as wide as the tree list box to avoid 'bad' layout when the Navigator
is resized.
(cherry picked from commit 1aead9f230e3953f6049e1700d912d6c14c62e7f)
Change-Id: Ie9aae42c42312777847fdb3261aa74ca7beaccbb
|
|
Fixed painting selection in layout panel
(cherry picked from commit b89784c822670593cb253bcc0d260b93c9936e1c)
Change-Id: I73d53bdcdec25753c8adb0f011f05868f82d35a5
|
|
Change-Id: Ie092f3e1a6362089feec90f6aef6c73f23d13935
|
|
The service already existed, it just needed an IDL file
Change-Id: I1404f4f60abafd489ddfb7294affcc7ff33885ce
|
|
Reported by: Jianyuan Li
Patch by: Jianyuan Li
Review by: SunYing
(cherry picked from commit 09c33de80a0e5fa321979e53bf88c4d17271eba8)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/inc/filter/msfilter/msdffimp.hxx
filter/source/msfilter/escherex.cxx
filter/source/msfilter/msdffimp.cxx
Change-Id: I80a60af4862eb99523ea59e4f788b685d6de1fbd
WaE fixes: reorder initialization, handle all cases in switch, ...
(cherry picked from commit 350f294badf378806348e77e6a8ed0b5f1d5b77d)
Conflicts:
filter/source/msfilter/msdffimp.cxx
Change-Id: I4f1bde463921d48d1e014d0521427eaa9294663e
Add default to switch statements to avoid compiler warnings.
Patch by: Jianyuan Li
(cherry picked from commit f1302af0d803ca969022e69bcf7deeb62459f789)
Change-Id: I4e78e3b565d5922d452d2cfd1bf473af1587d29b
|
|
Change-Id: I34414abe0375e003249ba271b24530f13016fa40
|
|
Change-Id: I53cf0596b39b00b634724db701d784dd4ab12281
|
|
Change-Id: Iceb9ecd64da80deccbad33ecdae7b788c1a540b3
|
|
Change-Id: Id86c0e6132f6f11bd6f9cb3d84746f750b8bccf4
|
|
|
|
NB. you need to re-build & install to sync. configuration after this.
|
|
|
|
|
|
|
|
|
|
Change-Id: If14c8784f4ee15f7611d3cbbb04b1a78c9171bf7
|
|
(cherry picked from commit a97c4ca2c235a4654243cbbdf970800454b5aa56)
Change-Id: I66ece2edb436b6e9f6bff110149d6c0c2aa37c7d
|
|
(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8)
Conflicts:
sd/source/ui/view/drviewsa.cxx
Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5
|
|
for inserting shapes into Draw documents
(cherry picked from commit 5e09229d726cbc288719c7466b277a4eb5bb244b)
Conflicts:
sd/source/ui/view/drviewsa.cxx
sfx2/Package_inc.mk
svx/inc/svx/dialogs.hrc
Related: #i122218# Added missing files to sfx2/inc/sfx2/sidebar
(cherry picked from commit 99572ff12af758a256703884811c7915c79f27ec)
Conflicts:
sfx2/inc/sfx2/sidebar/ResourceDefinitions.hrc
Related: #i122218# Added more missing files
(cherry picked from commit cdc8cb702630938c673255638aecbd2dd5c53ed7)
fix up to build
Change-Id: I098976d787e6a91d36aac98a5917f48b50872087
9c6f4d957924e177922e26606173d1b238b8006e
ceb9b720c08fb1db5b418c618e280b9b68eda2cf
01712631eacbd3e58e2cd04d1903bbcb0ecb9301
|
|
regarding the text edit mode for Drawing objects - take two
(cherry picked from commit 3dd1e0f85ba7d0fdcb2de134184407201ca7fae0)
Conflicts:
sc/source/ui/inc/drawview.hxx
sc/source/ui/view/drawview.cxx
Change-Id: Icfe16b76fc4fcc838133d8410736877703e5c23b
|