/m4/mac/

h=cp-5.3-62' type='application/atom+xml'/>
summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/PaletteManager.cxx
AgeCommit message (Collapse)Author
2017-03-01prevent crash in PaletteManagerMarkus Mohrhard
Found by the crashreporter: http://crashreport.libreoffice.org/stats/signature/PaletteManager::ReloadColorSet(SvxColorValueSet%20&) Change-Id: I82c5e3f7588615700ec3b5540ac94e331df783bb Reviewed-on: https://gerrit.libreoffice.org/34627 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit ece3c97ca6c9aaffbf9dd51785ae2f1d4d3e2c9b) Reviewed-on: https://gerrit.libreoffice.org/34634 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5b76c743488b1e206cfe40a5ed087b3a0ceaa1d8)
2016-11-23Revert "tdf#104052: Add LibreColor palette"Tor Lillqvist
Väärin sammutettu. This reverts commit aa522981e6a0953e157fa13ec5193147653d317b. This reverts commit 75fb3f79c3ba5e94740cea947527477bba50b358. This reverts commit 250680f57b74f55071d2431e5941dacffa018be4.
2016-11-23Clear the color set before setting it upTor Lillqvist
Change-Id: I4c4e30be172e8fcb2b6d966f06540b9b1b62b9ad
2016-11-23Avoid OUString construction at library load timeTor Lillqvist
Change-Id: Ie56cea732ade971aa276411e7552d4eefe47621a
2016-11-22tdf#104052: Add LibreColor paletteTor Lillqvist
Based on artwork by Christoph Schaefer, dtp studio oldenburg. Instead of the suggested change which added an incompatibly licensed palette file, add a built-in palette (defined in source code) with the same named colours. Change-Id: I3b97e803c0c7430d2ecde422bb5e6b665731f16a
2016-11-22The Palette subclasses don't need to be publicTor Lillqvist
Change-Id: I40f942c202ab3ba1ca13d1b24d0cd72a4c561868
2016-11-07Revert "Reverts a commit series that cripple windows ci."Caolán McNamara
with addition of... - svxlo-SvxColorListBox + svxcorelo-SvxColorListBox This reverts commit db380aab1063e8a5e40111c40ee9f7921aa82601. Change-Id: I3af7aa0abb1a430bce64188244404fcbd480b128 Reviewed-on: https://gerrit.libreoffice.org/30598 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-11-05Reverts a commit series that cripple windows ci.Norbert Thiebaud
Revert "SvxShadowTabPage::Construct was removed" f9a2c1c12ecad833c63b894c89d6008907477eb5. Revert "replace OColorPopup with SvxColorWindow" f300754bb1c6a347c92bb9548be7a65237176542. Revert "drop AutoColorInvalid/SID_ATTR_AUTO_COLOR_INVALID" 347c2c334589b18cc62af292674bb3df1dd54b71. Revert "replace last ColorLB use with a listbox of colors" 604b35bf55351751a396e34dcca3f85e75860fd5. Revert "simplify, its just a vector of colors" 351a97ce6bda3075677b59fa1387ba3d1ab17d7a. Revert "replace user draw with an Image of the color" df738e0f8ceedb4bad756960be14d9c41adc165d. Revert "strip down to the used pieces" commit 08d6cd788f2584ce10ab8fa10665245e953c59d9. Revert "move now combined ColorLB to location of last user" a19b18ad7c9eb0197c10e6d7e451ec4542e4bc9e. Revert "fold ColorListBox and ColorLB together" a989a0b1f2b425f05b58d0e44ce2de31c842ed65. Revert "move ColorListBox beside sole thing that uses it" 760a198e697f3070a5e0e029e4eff7be220eb9cd. Revert "extensions leaks out details of Color Selector, patch it up" 8bea644d6117a49405e6426dc97214220fc869d1. Revert "inherit FillAttrLB from ListBox not ColorListBox" d2ce812f1d3a7a2aad89ca0bd11948b63d2db7b0. Revert "unify color selectors" 43bc3031483d172eccd72c3804e2d4fc2ef37de4.
2016-11-04unify color selectorsCaolán McNamara
Note: this removes the use of auto-color from writer's asian text grid, because its always invisible as far as I can see in practice. Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
2016-10-13SvxColorToolBoxControl: Some cleanupMaxim Monastirsky
Change-Id: Iaf908b0c2456a239e343d0fcb89a2ba163b74010
2016-09-01GetPaletteName() may change pColorListStephan Bergmann
...since 571866eaba914742a48938abb6c8495e97868bf1 "[GSoC] Rework of color tab" Change-Id: Ia4ad8bf675abe6b279527eaed0b0e5ebc5b2f180
2016-08-31loplugin:stringconstantStephan Bergmann
Change-Id: Id7ccf94640fa67c5143ebc14bc210ff764efca75
2016-08-31build fixCaolán McNamara
Change-Id: Ia752f08a483dbff355609502c10fcde12d56015a
2016-08-31Resolves: tdf#98097 no tooltip for colors in "Recent" colors areaCaolán McNamara
cause the tip is the color name and that's not stored, so store the name when we have one, generate a #rrggbb if there isn't one and on loading the names, "repair" the names if the names didnt't exist because this option didn't exist when the colors were last saved Change-Id: I33d373081e8a5a46ac585bc55fe449dba0519f99
2016-08-19pShell can be null hereStephan Bergmann
...e.g., when opening "Tools - Options... - LibreOffice - Colors" from the Start Center. Change-Id: Id83591996e03794dc7dc53ccda58df7d7624ff8d
2016-08-17convert XPropertyListType to scoped enumNoel Grandin
Change-Id: I071c0d17c7c5982af47bccd92580bbac62bdf7b3
2016-08-03[GSoC] Rework of color tabRishabh Kumar
New Features - 1. Multiple Palettes in color tab. 2. Remember the selected palette. 3. Recent colors. 4. Custom colors. Change-Id: I36a438a0c282059ddcbda35f934fcd90337fd451 Reviewed-on: https://gerrit.libreoffice.org/26868 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2016-07-30Change data type of loop variant to size_typeRishabh Kumar
Change-Id: I7ec187defb51362caddef3439a1a09257ef9f4dc Reviewed-on: https://gerrit.libreoffice.org/27729 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Rishabh Kumar <kris.kr296@yahoo.in>
2016-07-30Use static_cast for type casting and fix loop variant sizeRishabh Kumar
Change-Id: Icc41693730ec8a68e3f3d68adff57fee02b7a689 Reviewed-on: https://gerrit.libreoffice.org/27714 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Rishabh Kumar <kris.kr296@yahoo.in>
2016-07-29[GSoC] Fix recent colors in color popup widgetRishabh Kumar
Save recent colors in user configuration. Change-Id: I1637e9fe3150bd1892f72ff9df06dc2a7c3e1e9e Reviewed-on: https://gerrit.libreoffice.org/27688 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Jenkins <ci@libreoffice.org>
2016-07-25[GSoC] Fix palette selection in sidebar/toolbar color widgetRishabh Kumar
Remember palette selection after the popup is destroyed Change-Id: Iecd7fd4aa89cf9d2d6842c5b544d037df6818aaf Reviewed-on: https://gerrit.libreoffice.org/27474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-06-04Resolves: tdf#100201 crash on apply custom colorCaolán McNamara
regression from... commit 789055bc2acb4c71483fd60ea258d158bd5aec10 Date: Tue Apr 12 16:39:03 2016 +0200 clang-tidy performance-unnecessary-copy-initialization probably not much performance benefit, but it sure is good at identifying leftover intermediate variables from previous refactorings. This case has a comment explaining the problem that appeared post change. Change-Id: Ib0c0883c57f103656cda00e3a94399a515d7fe41
2016-04-18clang-tidy performance-unnecessary-copy-initializationNoel Grandin
probably not much performance benefit, but it sure is good at identifying leftover intermediate variables from previous refactorings. Change-Id: I3ce16fe496ac2733c1cb0a35f74c0fc9193cc657 Reviewed-on: https://gerrit.libreoffice.org/24026 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-11clang-tidy performance-unnecessary-value-param in svxNoel Grandin
Change-Id: I3e8cd7cedb3e7b7ef05760d21b10994ce615324b
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
2015-09-03Restored missing includes from source files.Ashod Nakashian
These source files relied on pch to include these missing headers (at least on Windows). Also included the script used to find the missing includes. The script is self-contained and includes unittests. It detects superfluous includes and required includes (which was used to restore the includes in this patch). Change-Id: I7ee09e5c712f42d5f6c3524898bc62dda78f5cc0 Reviewed-on: https://gerrit.libreoffice.org/18208 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-20handle new color picker correctly in chart sidebarMarkus Mohrhard
This implements the basics for that and implements it in the AreaPanel. Change-Id: I6d9e5012bbcc2c953d478a09a839f35f2ef64c5b
2015-07-24svx: replace boost::ptr_vector with std::vector<std::unique_ptr>Michael Stahl
Change-Id: I512ed27ef812498e021e320259b1e0862969a10e
2015-06-07Resolves: tdf#89905 don't copy palettes from shared to userCaolán McNamara
make this a multi-path element with a shared read-only location and a user read/write location and don't copy the presets, instead just keep them in the shared location Now an admin can copy extra palettes into the shared location and they magically appear in the user deployments Change-Id: I7585789c0c59941094f6128368df94b834d3c2a2
2015-03-09V801: Decreased performanceCaolán McNamara
Change-Id: Iba139ede7bd72e23c0b7a28a8a4ff38ea816725a
2015-03-01tdf#84002 Add support for .ase color palettesChris Laplante
CMYK, RGB, and gray color models are supported. LAB colors are replaced by just black since the conversion to RGB is very complicated. Change-Id: I689e6ce972cd7b7f03725f99be4761dea4a81743 Reviewed-on: https://gerrit.libreoffice.org/14661 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2015-02-14related tdf#89004 move to std:set instead of std::vectorUrsache Vladimir
Conflicts: sc/source/core/data/document10.cxx sw/source/core/doc/docfmt.cxx Change-Id: I1312f476607ea3a78b162a7e59323b0a142f6629
2015-01-14fdo#39440 svx: reduce scope of local variablesMichael Weghorn
This addresses some cppcheck warnings. Change-Id: I8c63a767c62b3a666ad445a0a3095d1bb1224f5e Reviewed-on: https://gerrit.libreoffice.org/13908 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-22fdo#86517 make predefined palette names localizableAndras Timar
Change-Id: I3930757c02f9f976fb52cd75c9edab7cf75078c6
2014-10-28colorwindow: Use exactly one row of recent colorsMaxim Monastirsky
Right now one row of SvxColorValueSet is 12 colors. Change-Id: I9be6e8487d5325866e17f578b7abb08f7c338fb1
2014-10-28Rename loadColorVector to addEntriesForColorVectorMaxim Monastirsky
So it will be similar to addEntriesForXColorList Change-Id: Ie352e0cf05fa6875ed76e69478131a57293b39a1
2014-10-20fdo#85185 Copy OUString argument to avoid a use after freeMatthew J. Francis
The original OUString is destroyed along with its containing object part way through the call to PaletteManager::PopupColorPicker(), so a copy must be taken Change-Id: I8417ff23a17003e80a4f65e0cf1ad2a8dda5386c Reviewed-on: https://gerrit.libreoffice.org/12031 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-10-20loplugin: cstylecastNoel Grandin
Change-Id: I2cb764db97469654f977de63e273874d43745bf8
2014-09-25coverity#1241102 Uninitialized pointer fieldCaolán McNamara
Change-Id: I10580e92da47b97d8d496366833e79a89cbd9260
2014-09-18callcatcher: update unused codeCaolán McNamara
Change-Id: I3010bdd736c15a086f3ce61cacbb34159f0b2abf
2014-09-17WaE: passing class rtl::OUString by value, rather pass by referenceTor Lillqvist
Change-Id: Ie42cc9cbf13467d6c1644dc35e361250bd3a9533
2014-09-17Add recent colorsKrisztian Pinter
Change-Id: Id6b2239149bf7d0b3c9242efb7a72091e32c3384
2014-09-17Change vector<Palette*> to ptr_vector<Palette>Krisztian Pinter
Change-Id: I1f2832235e8d2ea3517efdce809970ed5f1c6769
2014-09-17Make color picker apply color immediatelyKrisztian Pinter
Change-Id: I38695a43ced63bd5207b631a072231d81aa7e0f9
2014-09-17Add loading .soc palettesKrisztian Pinter
Change-Id: Ie0d084a70d9b135658840bb7529f2099a702d280
2014-09-17Change SvxColorWindow_Impl to use ComboBox for palette selectionKrisztian Pinter
Change-Id: I0fb9b46298f45bbdf9ae9198c145b9ea5e403bbf
2014-09-17Add color picker to color paletteKrisztian Pinter
Change-Id: I651f485598ee57af815780e234031f101b63fa24
2014-09-17Add PaletteManager, refactor palette codeKrisztian Pinter
Change-Id: I7e30fc895834318514b51bc648d32aa6d297bfae