summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)AuthorFilesLines
2013-06-04Resolves: #i122437# Fixed context notification for Draw documentsAndre Fischer1-0/+1
(cherry picked from commit 88914c616747693083819ec44ea81c9d96fa5136) Change-Id: I6d5c7365cfe51ba7c6ce57f589264aac8b066742 (cherry picked from commit b269b4ee7c44ec33e63838412bdf4d2a0e1b4887)
2013-05-31drop stray SAL_DEBUGCaolán McNamara1-1/+0
Change-Id: I7e67c7dc06388d95d8143f5419116bae4deb5e4b (cherry picked from commit 651d5fd5806b72117b73cf601a26ccc7dd468012)
2013-05-30Resolves: #i122096# apply default bullet numbering rule on toggle on...Oliver-Rainer Wittmann6-273/+179
if the current numbering rule is not a bullet numbering rule. - improve application default bullet numbering rule by add corresponding spacing to the first list level - refactoring of code introduced for paragraph property panel to handle toggle and set of bullets and numbering (cherry picked from commit 8c142809c7e16853d5634487cc9ed4e53caa3f91) Conflicts: editeng/inc/editeng/outliner.hxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlvw.cxx sd/source/ui/func/fuolbull.cxx Change-Id: If2807b2b81f8ade1e5b3282aa636cc2c0d8ea76a (cherry picked from commit 0ff751efaa49a5b3d22d324a43527bfd21e5a17c)
2013-05-30make impress start again without crashingCaolán McNamara1-1/+5
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 (cherry picked from commit 66a10f2817ea28c36c1709c84d58b0befad207ca)
2013-05-30typo: %1label -> %1Andras Timar1-1/+1
Change-Id: Ibf721e5f5509d7d840bb9013da2d10b9695e16b4
2013-05-28Resolves: #i122332# Don't change sidebar context when switching...Andre Fischer6-37/+38
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 (cherry picked from commit 0143805a565418d2a114c16b7eeba3b784176d9e)
2013-05-27Resolves: #i119753# fix audio video object lost when save .ppt fileSun Ying2-1/+16
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 (cherry picked from commit c05c16635b15a47591faa737947c2dce3dcb863e)
2013-05-24Fix memory leak in DrawViewShell::GetAttrState().Mark Wielaard1-1/+2
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> (cherry picked from commit a602bd1a69db5c6b4e0fa818324cdf4e0088778c)
2013-05-24fdo#63035 Add "Match Case" to Find bar.Andrzej J.R. Hunt2-0/+2
Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-05-23Resolves: #i122247# Improved focus traveling in sidebarAndre Fischer2-0/+10
(cherry picked from commit 4b0aafb8182b1f86b9edf947a4c62ff9948c6676) Change-Id: Ieae8e44fe147309cc3ff447a6dbc375d1b2f34d0 (cherry picked from commit ab0360c309adcd131a9e6c1f02abc82486d09a46)
2013-05-23bnc#820786: Unit test for patterns / hatches.Jan Holesovsky3-0/+3317
Change-Id: I988439f8be9822c73d19c292da37e2cb102b1c78
2013-05-22Secured SlideSorterModel::DeleteSlide for negative page indicesArmin Le Grand1-6/+29
(cherry picked from commit f6bff98d6f13bf71fc4bce53c189598c002343c2) Change-Id: I8c7ca633043ec224df4e4ab08c20d44f969a8059 Corrected signed/unsigned mix (cherry picked from commit 20a3aee5359f143a6e4bf0bcb7fdef4675b3dd83) Change-Id: I6f8ffc6f541c2a06c9e97ef06711f312adc438f2 (cherry picked from commit 5481d32d285178dbf1a974389da1ee7c8ae19939)
2013-05-22Resolves: #i122354# Fix notification of slide change when...Andre Fischer1-0/+1
caused by slide sorter key event (cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e) Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f (cherry picked from commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3)
2013-05-22Resolves: #ii122335# Disabling the old task paneAndre Fischer2-2/+0
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54) Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468 (cherry picked from commit 94b868141e5ad43f8e2affb77563ec0f999a2d60)
2013-05-22Resolves: #i122260# Calc Navigator - assure that tool box is...Oliver-Rainer Wittmann1-3/+14
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 (cherry picked from commit 9ffcc8516ceb5c3b9e522bae6542a9d0e606663e)
2013-05-22Resolves: #i122291# Showing the right set of layouts for handout modeAndre Fischer3-0/+6
Fixed painting selection in layout panel (cherry picked from commit b89784c822670593cb253bcc0d260b93c9936e1c) Change-Id: I73d53bdcdec25753c8adb0f011f05868f82d35a5 (cherry picked from commit b8520e02d2b1b18ece5dbc6dbac12b9481643fdd)
2013-05-22Fix warning: statement aligned ... [loplugin]Tor Lillqvist1-1/+1
Change-Id: Ie092f3e1a6362089feec90f6aef6c73f23d13935 (cherry picked from commit ce575889b9c46e98544c9f6f30372ac7e05e20c5)
2013-05-20Resolves: #i120554# Shape Gradient MS2003 import/export EnhancementJianyuan Li1-12/+12
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
2013-05-20WaE: unreachable codeTor Lillqvist1-7/+0
Change-Id: I34414abe0375e003249ba271b24530f13016fa40
2013-05-20remove redundant mmeeks comments around the place for misc. code pointers.Michael Meeks3-4/+6
Change-Id: I53cf0596b39b00b634724db701d784dd4ab12281
2013-05-20WaE: quiet unused warning.Michael Meeks1-0/+1
Change-Id: Iceb9ecd64da80deccbad33ecdae7b788c1a540b3
2013-05-20Seperator -> Separator to fix build.Jan Holesovsky1-4/+4
Change-Id: Id86c0e6132f6f11bd6f9cb3d84746f750b8bccf4
2013-05-20Only register and use the Sidebar if it is globally enabled.Michael Meeks1-1/+1
2013-05-20finally get the taskpane rendering againMichael Meeks2-2/+3
NB. you need to re-build & install to sync. configuration after this.
2013-05-20update to the right service name for new URLs.Michael Meeks3-2/+6
2013-05-20tentatively restore more UNO / task-pane goo ...Michael Meeks6-2/+59
2013-05-20more reverts, first cut at making sidebar optional.Michael Meeks8-4/+61
2013-05-20add experimental option for sidebar to 'Advanced' pane.Michael Meeks3-6/+35
2013-05-20Restore FrameworkHelper taskpane URLs.Michael Meeks3-6/+21
Change-Id: If14c8784f4ee15f7611d3cbbb04b1a78c9171bf7
2013-05-20Resolves: #i121981# Don't change sidebar context while in Impress tableAndre Fischer1-6/+2
(cherry picked from commit a97c4ca2c235a4654243cbbdf970800454b5aa56) Change-Id: I66ece2edb436b6e9f6bff110149d6c0c2aa37c7d
2013-05-20Resolves: #i122275# Don't show the layout panel for master pagesAndre Fischer2-1/+9
(cherry picked from commit 7fe1777ad29d92d16fbc11b7279375d37d11cef8) Conflicts: sd/source/ui/view/drviewsa.cxx Change-Id: I37bb08e08bd8537e692cf60f415ed40f9cf5abc5
2013-05-20Resolves: #i122218# Add new sidebar panel...Andre Fischer1-0/+2
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
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann1-0/+11
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
2013-05-20Related: #i122156# #i122087# correct context notification...Oliver-Rainer Wittmann1-8/+0
regarding the text edit mode for Drawing objects (cherry picked from commit a0e76afb572510e2c2c75fc6c558f271c0d74d0b) Change-Id: I8b4e5cbd865455ef3d7046f9d65c5dd68a53d8ce
2013-05-20Related: #i122121# moved automatic StartEnd adaption to svxArmin Le Grand1-128/+0
(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d) Conflicts: sd/source/ui/view/drviews2.cxx Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2
2013-05-20Resolves: #i122093# Don't show Impress layouts panel for master pagesAndre Fischer5-80/+57
(cherry picked from commit 573490c7240fc02dcf82bf0ba262863612e53187) Conflicts: sd/source/ui/sidebar/LayoutMenu.cxx Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d Related: #i122093# WaE in DrawController::BroadcastContextChenge() (cherry picked from commit 26e4fcdbb8594696b45d0600e1b7a5e5946cd2aa) Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429
2013-05-20Resolves: #i122085# Fixed over-painting of fixed textAndre Fischer1-9/+12
(cherry picked from commit 0ba322a27a8d0651f410741d79bbb7125a8ec2b7) Change-Id: I208297d67bdb9e0277b39c0dc78b777f5eb2a7fa
2013-05-20Resolves: #i122025# UNO commands introduced with sidebarOliver-Rainer Wittmann2-10/+0
apply labels and disable their UI customization (cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu svx/inc/svx/svxids.hrc svx/sdi/svx.sdi sw/sdi/swriter.sdi Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb Related: #i122025# followup - remove usage of removed Slot (cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac) Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
2013-05-20Resolves: #i122041# Unified and centralized control for Color ValueSetsArmin Le Grand5-4/+5
(cherry picked from commit 68e707bbc6fe23881b822e6efab8a2933343dc1a) Conflicts: cui/source/inc/backgrnd.hxx cui/source/inc/cuitabarea.hxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/tpcolor.cxx sd/source/ui/view/drviews6.cxx svx/Package_inc.mk svx/inc/svx/colrctrl.hxx svx/source/sidebar/tools/ColorControl.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/colrctrl.cxx svx/source/tbxctrls/tbcontrl.cxx Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193 Related: #i122041# Add a11y values for defining behaviour of ColorValueSets (cherry picked from commit 401e8f2db607081e62eaaa1f08a8cd8971a3f637) Conflicts: cui/source/tabpages/backgrnd.cxx officecfg/registry/schema/org/openoffice/Office/Common.xcs sc/source/ui/miscdlgs/tabbgcolordlg.cxx svtools/inc/svtools/accessibilityoptions.hxx svtools/source/inc/configitems/accessibilityoptions_const.hxx vcl/inc/vcl/bitmap.hxx vcl/source/gdi/bitmap4.cxx Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240
2013-05-20Related: #i121791# Corrected names for LineDashes, cleaned up resourcesArmin Le Grand1-21/+21
(cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d) Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9
2013-05-20Resolves: #i121420# merge sidebar featureOliver-Rainer Wittmann124-362/+12645
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5) Conflicts: chart2/source/controller/dialogs/dlg_View3D.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx chart2/source/controller/drawinglayer/ViewElementListProvider.cxx chart2/source/controller/inc/ViewElementListProvider.hxx chart2/source/controller/inc/dlg_View3D.hxx chart2/source/controller/main/ShapeController.cxx chart2/source/inc/chartview/DrawModelWrapper.hxx chart2/source/view/main/DrawModelWrapper.cxx cui/source/inc/border.hxx cui/source/inc/cuitabarea.hxx cui/source/inc/cuitabline.hxx cui/source/inc/sdrcelldlg.hxx cui/source/inc/treeopt.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx cui/source/options/optcolor.cxx cui/source/options/treeopt.cxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/border.cxx cui/source/tabpages/chardlg.cxx cui/source/tabpages/numpages.cxx cui/source/tabpages/tpcolor.cxx cui/source/tabpages/tplneend.cxx editeng/inc/editeng/outliner.hxx extensions/source/propctrlr/standardcontrol.cxx framework/source/register/registerservices.cxx offapi/com/sun/star/ui/makefile.mk officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/makefile.mk officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk postprocess/packregistry/makefile.mk reportdesign/source/ui/dlg/Condition.cxx reportdesign/source/ui/misc/UITools.cxx sc/inc/document.hxx sc/inc/helpids.h sc/inc/sc.hrc sc/prj/build.lst sc/sdi/scalc.sdi sc/source/core/data/documen9.cxx sc/source/core/data/drwlayer.cxx sc/source/ui/app/scdll.cxx sc/source/ui/app/typemap.cxx sc/source/ui/dbgui/scendlg.cxx sc/source/ui/docshell/docsh2.cxx sc/source/ui/docshell/docsh4.cxx sc/source/ui/drawfunc/chartsh.cxx sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh4.cxx sc/source/ui/drawfunc/drformsh.cxx sc/source/ui/drawfunc/drtxtob.cxx sc/source/ui/drawfunc/drtxtob1.cxx sc/source/ui/drawfunc/drtxtob2.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/oleobjsh.cxx sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/formatsh.hxx sc/source/ui/miscdlgs/tabbgcolordlg.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpview.cxx sc/source/ui/sidebar/makefile.mk sc/source/ui/view/auditsh.cxx sc/source/ui/view/cellsh.cxx sc/source/ui/view/editsh.cxx sc/source/ui/view/formatsh.cxx sc/source/ui/view/pivotsh.cxx sc/source/ui/view/tabvwsh.cxx sc/util/makefile.mk sd/inc/sdabstdlg.hxx sd/prj/build.lst sd/sdi/ToolPanelViewShell.sdi sd/sdi/makefile.mk sd/source/ui/accessibility/makefile.mk sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/dlg/PaneChildWindows.cxx sd/source/ui/dlg/PaneShells.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/navigatr.cxx sd/source/ui/dlg/sddlgfact.cxx sd/source/ui/dlg/sddlgfact.hxx sd/source/ui/docshell/docshel3.cxx sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/factories/TaskPanelFactory.hxx sd/source/ui/framework/factories/ViewShellWrapper.cxx sd/source/ui/framework/factories/makefile.mk sd/source/ui/framework/module/ImpressModule.cxx sd/source/ui/framework/module/ToolPanelModule.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx sd/source/ui/func/fuolbull.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/PaneChildWindows.hxx sd/source/ui/inc/celltempl.hxx sd/source/ui/inc/copydlg.hxx sd/source/ui/inc/dlgpage.hxx sd/source/ui/inc/framework/FrameworkHelper.hxx sd/source/ui/inc/prltempl.hxx sd/source/ui/inc/tabtempl.hxx sd/source/ui/inc/taskpane/ILayoutableWindow.hxx sd/source/ui/inc/taskpane/PanelId.hxx sd/source/ui/inc/tpaction.hxx sd/source/ui/sidebar/AllMasterPagesSelector.cxx sd/source/ui/sidebar/AllMasterPagesSelector.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/DocumentHelper.cxx sd/source/ui/sidebar/DocumentHelper.hxx sd/source/ui/sidebar/LayoutMenu.cxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPageContainer.cxx sd/source/ui/sidebar/MasterPageContainer.hxx sd/source/ui/sidebar/MasterPageContainerFiller.cxx sd/source/ui/sidebar/MasterPageContainerFiller.hxx sd/source/ui/sidebar/MasterPageContainerProviders.cxx sd/source/ui/sidebar/MasterPageContainerProviders.hxx sd/source/ui/sidebar/MasterPageContainerQueue.cxx sd/source/ui/sidebar/MasterPageContainerQueue.hxx sd/source/ui/sidebar/MasterPageDescriptor.cxx sd/source/ui/sidebar/MasterPageDescriptor.hxx sd/source/ui/sidebar/MasterPageObserver.cxx sd/source/ui/sidebar/MasterPagesSelector.cxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/PreviewValueSet.cxx sd/source/ui/sidebar/PreviewValueSet.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx sd/source/ui/sidebar/SidebarShellManager.cxx sd/source/ui/sidebar/SlideTransitionPanel.hxx sd/source/ui/sidebar/makefile.mk sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/table/TableDesignPane.hxx sd/source/ui/toolpanel/ControlContainer.cxx sd/source/ui/toolpanel/ControlContainerDescriptor.hxx sd/source/ui/toolpanel/MethodGuard.hxx sd/source/ui/toolpanel/ScrollPanel.cxx sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx sd/source/ui/toolpanel/SubToolPanel.cxx sd/source/ui/toolpanel/TaskPaneFocusManager.cxx sd/source/ui/toolpanel/TaskPaneTreeNode.cxx sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/ToolPanel.cxx sd/source/ui/toolpanel/ToolPanel.hxx sd/source/ui/toolpanel/ToolPanelFactory.cxx sd/source/ui/toolpanel/ToolPanelUIElement.cxx sd/source/ui/toolpanel/ToolPanelUIElement.hxx sd/source/ui/toolpanel/ToolPanelViewShell.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx sd/source/ui/toolpanel/controls/TableDesignPanel.cxx sd/source/ui/toolpanel/controls/TableDesignPanel.hxx sd/source/ui/unoidl/UnoDocumentSettings.cxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drtxtob.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsa.cxx sd/source/ui/view/drviewsf.cxx sd/source/ui/view/outlnvsh.cxx sd/source/ui/view/sdview.cxx sd/source/ui/view/viewshel.cxx sd/uiconfig/sdraw/menubar/menubar.xml sd/util/makefile.mk sfx2/Package_inc.mk sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxsids.hrc sfx2/source/control/bindings.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/inc/templdgi.hxx svx/AllLangResTarget_svx.mk svx/Package_inc.mk svx/inc/svx/XPropertyTable.hxx svx/inc/svx/bmpmask.hxx svx/inc/svx/colrctrl.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/dlgctrl.hxx svx/inc/svx/dlgutil.hxx svx/inc/svx/drawitem.hxx svx/inc/svx/fontwork.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/sdr/table/tablecontroller.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdstr.hrc svx/inc/svx/svxids.hrc svx/inc/svx/svxitems.hrc svx/inc/svx/xattr.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xit.hxx svx/inc/svx/xlineit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xtable.hxx svx/sdi/svx.sdi svx/source/dialog/_bmpmask.cxx svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/dlgutil.cxx svx/source/dialog/fontwork.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/gallery1.cxx svx/source/items/drawitem.cxx svx/source/items/svxitems.src svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sidebar/ColorPanel.hxx svx/source/sidebar/EmptyPanel.hrc svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/gallery/GalleryPanel.hxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdstr.src svx/source/tbxctrls/tbcontrl.cxx svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/unoctabl.cxx svx/source/xoutdev/XPropertyEntry.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xtabbtmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/source/xoutdev/xtabdash.cxx svx/source/xoutdev/xtabgrdt.cxx svx/source/xoutdev/xtabhtch.cxx svx/source/xoutdev/xtable.cxx svx/source/xoutdev/xtablend.cxx svx/util/svx.component sw/inc/cmdid.h sw/inc/docsh.hxx sw/inc/editsh.hxx sw/inc/helpid.h sw/inc/rcid.hrc sw/inc/swabstdlg.hxx sw/inc/swcommands.h sw/sdi/swriter.sdi sw/source/core/doc/docdesc.cxx sw/source/core/draw/drawdoc.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshdrw.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/config/optpage.cxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/fmtui/tmpdlg.cxx sw/source/ui/inc/tmpdlg.hxx sw/source/ui/misc/pggrid.cxx sw/source/ui/shells/annotsh.cxx sw/source/ui/shells/basesh.cxx sw/source/ui/shells/beziersh.cxx sw/source/ui/shells/drawdlg.cxx sw/source/ui/shells/drawsh.cxx sw/source/ui/shells/drformsh.cxx sw/source/ui/shells/drwbassh.cxx sw/source/ui/shells/drwtxtex.cxx sw/source/ui/shells/drwtxtsh.cxx sw/source/ui/shells/frmsh.cxx sw/source/ui/shells/grfsh.cxx sw/source/ui/shells/olesh.cxx sw/source/ui/shells/tabsh.cxx sw/source/ui/shells/textsh.cxx sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/txtnum.cxx sw/source/ui/uiview/viewtab.cxx sw/source/ui/uno/unofreg.cxx sw/source/ui/utlui/navipi.cxx sw/util/sw.component vcl/inc/vcl/split.hxx vcl/inc/vcl/window.hxx vcl/inc/window.h vcl/source/window/split.cxx vcl/source/window/window.cxx vcl/source/window/window4.cxx Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e Resolves: #i122194# Adapted license text in propertypanel.hrc then renamed it to ResourceDefinitions.hrc (cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b) Conflicts: sfx2/Package_inc.mk sfx2/source/sidebar/SidebarChildWindow.cxx svx/source/sidebar/graphic/GraphicPropertyPanel.cxx svx/source/sidebar/line/LinePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx sw/source/ui/sidebar/PagePropertyPanel.src sw/source/ui/sidebar/WrapPropertyPanel.src Change-Id: Ie009056a78ab108556717a501399c83b477b3548 Resolves: #i122194# finally I got the correct file name Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a More merge changes for optional sidebar: revert toolpanel removal, restore and re-enable task pane remove apparently un-used SidebarFactory module add extra visibility annotation to ItemReceiverUpdate
2013-05-19Resolves: #i120642# expand target to maximum edge not to diagonalRegina Henschel3-12/+12
(cherry picked from commit 2e1700bf4f7cf913c23d35f325a50d3aa25426cc) Change-Id: Ic27fb3b18f42667419765a6adca41e1df27561c2
2013-05-18Resolves: #i116244# need to reset rotation...Armin Le Grand1-115/+115
This reverts commit f47ed987388e4df58ba74b9aca574a7d1fba396a. update layout tests Change-Id: I8a9daaa78acc98bf497241ebce856d5798b187f5
2013-05-18Resolves: #i118267# Add undo actions for adapted arrowhead sizes...Armin Le Grand1-6/+24
when linewidth is changed (cherry picked from commit 8e63413dbf514303095790630a2d77d854c3da95) Change-Id: I538805726ca29e3cdb05dc32577b91b7157d0e0f
2013-05-18Add unit test for xml:id loading.Thorsten Behrens2-0/+52
Guard against xml:id load breakage, that cause fdo#64512 and fdo#60075. Both connector shape and animation references need it to work. Change-Id: I7883d1d27eae02f605c83217a2e1b83934b31483
2013-05-16bnc#819614: Test for the runaway lines fix.Jan Holesovsky3-1/+6884
Change-Id: I60c072720392822eb5866310f3607271d72815b7
2013-05-16XShapeDumper: Dump more values, to be able to test n#819614.Jan Holesovsky6-281/+7529
Change-Id: I19cbae855996bffb18206b9003e22a2bcc0c75d9
2013-05-15Resolves: #i119551# Avoid grouping shapes on import from PPT...Andre Fischer1-15/+42
under certain conditions. Reported by: Li Feng Wang Patch and review by: Ma Bingbing and Armin Le Grand (cherry picked from commit f425d556504e055216d9402241ff598a97204509) Conflicts: sd/source/filter/eppt/epptso.cxx (cherry picked from commit 8c23e31acc61406103c1565960e4c5b391902754) Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
2013-05-15Revert "Resolves: #i119551# Avoid grouping shapes on import from PPT..."Caolán McNamara1-42/+15
This reverts commit 8c23e31acc61406103c1565960e4c5b391902754. wrong one
2013-05-15Resolves: #i119551# Avoid grouping shapes on import from PPT...Andre Fischer1-15/+42
under certain conditions. Reported by: Li Feng Wang Patch and review by: Ma Bingbing and Armin Le Grand (cherry picked from commit f425d556504e055216d9402241ff598a97204509) Conflicts: sd/source/filter/eppt/epptso.cxx Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 21:25:01 +0000