summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2013-08-19don't unconditionally enable buttons on switching to accept/reject pageCaolán McNamara1-0/+6
we want to disable all of them when switch to the options page and *restore* the original enable/disable state when switching back i.e. don't enable them if they were disabled due to change tracking password protection regression since 8655095a4910ca795dfd182e6796d9375727a694 Change-Id: I2dd6c83fd9613adf42571684a08bff81b86c9ee1 (cherry picked from commit 30ba8fa46aafb0868ada3b0092cd33524c145989) Reviewed-on: https://gerrit.libreoffice.org/5502 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit c373d4a7807581459a474ffc0a277d0d6c00447a) Reviewed-on: https://gerrit.libreoffice.org/5508 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Eike Rathke <erack@redhat.com>
2013-08-19fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENTMiklos Vajna1-0/+2
Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae (cherry picked from commit f694f14ab64f48e40365fd877e201a0382297368) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 823cab696bdaa059e5d1243a636e7d975b2110cc) Reviewed-on: https://gerrit.libreoffice.org/5464 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-08-04fdo#67235 adapt form control code to time nanosecond API changeLionel Elie Mamane6-54/+78
squash of steps 1, 2 and 3 in master Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-31Resolves: fdo#67378 merge the label into the disclosure buttonCaolán McNamara2-0/+20
(cherry picked from commit 479bba2cdcda8dbd86861ea62c8c25bfef633148) (cherry picked from commit 06ac689a8d3887519d98a616f9a1727fcc7d0bf6) (cherry picked from commit 5718ffbf0e3e68e43f87541ce0368a15de8ec90e) Change-Id: I11c9a35e3d50a827127e4542a40f6f29580d4e8b 8b65b4986bf316e352131e737ebf736d91173d16 43df94c16a178c90da9c006565390a81c2fda29b Related: fdo#67378 rows missing HIG 6pixel spacing Change-Id: I6d4767c3159c1e9ebef19978a94ad994aab6ff4b (cherry picked from commit c2ce9bf0c2bfd2b38262de8571257c8f02b076b4) Reviewed-on: https://gerrit.libreoffice.org/5202 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-30Related: fdo#67395 adjust height of font name tabpage, etc.Caolán McNamara1-1/+1
+ put the language label beside the language listbox which reduces height by a line + use standard spacing between frames in position tabpage + use standard spacing horizonally between elements (cherry picked from commit 1d33fc35f787061c9440ba44dfd53de405bd430a) Related: fdo#67395 drop 'Preview' frame title it's clear that it's a preview, move that string into its Accessible name for those that can't see the preview (cherry picked from commit 1193dc782f4479a81f3d283c99df2f5c7e022682) Related: fdo#67395 drop 'Font' frame title + promote the family, style, size to frame titles and drop the surrounding 'Font' one + bottom align the previews again + drop empty spacing labels in favour of 6pixel spacing (cherry picked from commit 63ced8e54f1786e5814f082c9fb87c89e5c850a9) Related: fdo#67395 add border to preview to cut up whitespace (cherry picked from commit 167416c3ed3ed52249559ff3548c0fc06d0d0eef) Change-Id: I1191db7aaf0922978bf6dd8da17ec4f133944b94 684f451542f5300cc206c9ade7f3b130b1c3c876 2c0b78163894c5283162c37bd71fa1bbc3c341c7 c66bf59294f7c9fb4059574765734749a40b043f Reviewed-on: https://gerrit.libreoffice.org/5200 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-30fdo#54264: Fix multi-argument ApplicationEvent::TYPE_OPEN/PRINTStephan Bergmann2-9/+32
...that had been broken when 5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5> "Cleaned up CommandLineArgs" changed the representation of those multi-arguments from a single string with \n delimiters to vector<string> in desktop/soruce/app/cmdlineargs.hxx, but missed updating other producers of such ApplicationEvents. (cherry picked from commit 787940e0ac285aa1101ca8964d252faaab3ea8c1, plus 04f4d4bfb708ef477618fa47d5f17779f4e4cf3c "Add TODO comment expressing doubts about existing code") Conflicts: sfx2/source/appl/appdde.cxx Change-Id: I527d620c60a87f3a01d970927c521163fb6df192 Reviewed-on: https://gerrit.libreoffice.org/5192 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-30fdo#67361 Prevent out-of-range values coming from ListBox GetSelectEntryPos.Javier Fernandez1-0/+1
Applied to master (LibreOffice 4.2.0.alpha) as: Change-Id: Ia787c412408ef53db3c8458f54c7843c669c81ad Reviewed-on: https://gerrit.libreoffice.org/4174 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> (without the fdo#67361 reference) Squash with subsequent fixups: 1) -Werror=sign-compare (ListBox::GetSelectEntryPos returns sal_uInt16) Change-Id: Ia6e4bf4354523f5112ee3ade1d3da6db0f9ab2c4 2) Fix previous fix Change-Id: I2d7ea38b743d78327fd19886019c1106bc1316d6 Also fix discrepancy between log-areas.dox and SAL_WARN argument. Change-Id: I03fc1014da0be8335689954725ac605e32fbbee8 Reviewed-on: https://gerrit.libreoffice.org/5176 Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz> Tested-by: Tomáš Chvátal <tchvatal@suse.cz> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-07-29Make AddToRecentDocumentList aware of the DocumentServiceFridrich Štrba1-1/+1
This information helps to map a document with an application ID needed for Windows 7 shell integration. (cherry picked from commit a9ae9aefe8384a81dd79827cb76daa9ed8b58dbc) Conflicts: helpcontent2 Change-Id: I1224f566037ab7597a29b16f310f93d9f5441cce WaE: unused rDocumentService in one ifdef branch Change-Id: I542cf23c8077d9f867a2d890dc326465fce8c3a3 (cherry picked from commit 0354b4335b5c4fcf65d954e03116c44aabe7fa1d) Reviewed-on: https://gerrit.libreoffice.org/5161 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-07-28fdo#67303: sw: speed up setting IsHidden property on stylesMichael Stahl1-2/+2
Importing an ODF document with 4089 styles is ridiculously slow, spending most of the time in SwStyleSheetIterator::First() to reset an existing iterator. Since the SwStyleSheetIterator can handle the case when First() has not been called anyway, just add a new method that resets the bFirstCalled flag, which takes next to no time. (regression from a0dcf961879ab644a52f801f65466756cb144b72) (cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb) Conflicts: include/svl/style.hxx Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3 Reviewed-on: https://gerrit.libreoffice.org/5136 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-26targetted clean of redundant header piece from 62badf3828Michael Meeks10-30/+0
Change-Id: Ic1240114d667fb7797afae4847427cc889f3cb48 (cherry picked from commit 03993b47c522dcc71f7cd73ee21df3de9650080d)
2013-07-26Resolves: fdo#61544 improve handling of grid's not enough layout spaceCaolán McNamara1-0/+1
(cherry picked from commit b64adf65afb1cfe1bd48fed0d71ac333ad962776) Conflicts: vcl/source/window/layout.cxx Change-Id: I9a73e90f639bb853b67daa98d5daac155dab5900 Reviewed-on: https://gerrit.libreoffice.org/5119 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-07-22Resolves: #i122418# Added workaround to not use GetBitmap on windowsNorbert Thiebaud2-29/+32
(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f) Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1 Reviewed-on: https://gerrit.libreoffice.org/5011 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-15API change: oslDateTime signed yearLionel Elie Mamane1-1/+1
to match the rest of our date-related data structures, which were recently switched to signed year. Change-Id: Ic4f1e424b130fd2ccca379adbe0a66836b6cac41 Reviewed-on: https://gerrit.libreoffice.org/4735 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-07-13fdo#66745: drawinglayer: properly restore anti-aliasing modeMichael Stahl1-0/+5
VclPixelProcessor2D: the constructor changes the anti-aliasing mode of the given output device, and the destructor restores a hard-coded mode instead of what was there before. Due to this commit 5913506b2193e93ca2767ab7365ab2e76ed7848f turned off anti-aliasing for FontWork objects simply by creating a temporary VclPixelProcessor2D. Change-Id: I7f7fcbf86b0dd425f599cd8e62fce3c69a2744bb (cherry picked from commit 420aa16af0bbab4bdef80ceeb8d44cabe65840e0) Reviewed-on: https://gerrit.libreoffice.org/4872 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-12ORDER BY columns are prioritarily *SELECT* columnsLionel Elie Mamane1-0/+8
as opposed to *table* columns, and notwithstanding HSQLDB 1.8 (our embedded database) bugs. Actually, supporting ORDER BY on non-select (but table) columns is OPTIONAL for DBMSs (but quite common) Conflicts: connectivity/source/parse/sqliterator.cxx Change-Id: I6725dfda36b09429a78262bff6f3d3e3dd9032b6 Reviewed-on: https://gerrit.libreoffice.org/4836 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-07-10fix reading fonts from .odp using style::font-name (fdo#65338)Luboš Luňák2-12/+5
b40bcde076f9fabf24810d2520e878d604d99637 made writing .odp use style:font-name and office:font-face-decls, instead of using fo:font-family . But the reading back was broken, as xFontDecls is not set in XMLTextImportPropertyMapper::handleSpecialItem(), so the font data was ignored. And xFontDecls was not set because it's set while reading office:font-face-decls, which is at the top of the xml document, but even before the xml is parsed, the call to SdXMLImport::setTargetDocument() calls GetShapeImport(), which creates XMLShapeImportHelper instance, which calls XMLTextImportHelper::CreateParaExtPropMapper(), and XMLTextImportPropertyMapper is created with rImport.GetFontDecls() still being NULL at that point. And it actually doesn't seem to make any sense to just pass around all the pointers to XMLFontStylesContext, as eventually it's always just the one from SvXMLImport. So simply dump all that and make the one single place that actually uses it (i.e. XMLTextImportPropertyMapper::handleSpecialItem()) refer directly to SvXMLImport::GetFontDecls(). Change-Id: Ib1b3e4b1bcaf87ca3e4703d1cc1563ad6b3f9ce7 Reviewed-on: https://gerrit.libreoffice.org/4816 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-08fdo#66524 - export a means of detecting preferred icon size for toolbars.Michael Meeks1-0/+1
Also fix human / tango / and other icon theme item sizing. Change-Id: I7039f8f671834237a7ec9b2e4b5227e9c47e7143 Reviewed-on: https://gerrit.libreoffice.org/4744 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-08API change: osl/time.h take const pointers where appropriateLionel Elie Mamane1-4/+4
Should be backwards-compatible... Change-Id: I6b04bec2c032ff8c57a1b5192b2d3962dcc96c84 Reviewed-on: https://gerrit.libreoffice.org/4736 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-03SvStream: remove the error prone operator<</>>(sal_Int64)Michael Stahl1-2/+4
As the recent regression after merging AOO patch adding code serializing "long" variables has shown, this overload (which was added in 7b2a0e541567be9750dfc7d98374555967da3470) is a bad idea. In a unxlngx build, nm finds uses of the symbols _ZN8SvStreamrsERl and _ZN8SvStreamlsEl in these files: - sbxvalue.cxx: this appears to be a legitimate use with sal_Int64 - dateitem.cxx: this was accidentally changed by commit 9830fd36dbdb72c79703b0c61efc027fba793c5a - atrfrm.cxx: this was added for Table Autoformat enhancement in 7e8c0bd73ee59ff3041e55268c77203373962e51, which is after the sal_Int64 operators were added, so the file format is now platform dependent Change-Id: I78352b5429b53612c4831cdb81b587b5de5180a9 (cherry picked from commit 3835dee3c777bf10693903cb0866d22fab3794ea) Reviewed-on: https://gerrit.libreoffice.org/4685 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-02fdo#46361 oox: fixes for the VML import of groupshape textboxesMiklos Vajna3-2/+15
(cherry picked from commits b1f78c44c1acc246f06a963383232c9bf649a06b, f24e4c74d7d6a7d95090c6fa6a584fed7787706c, 6bf79576aeca243db553ed3b5eade492dc35337b, 5a737fca37cd5a5f90aa03a30688d447677d3b8a, ef53d4aec2a3d690de2c7cdaf73ca95bbe29a433 and 2a2105b002c482e6536d5c3046c9e7783c0cdca3) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ie7ce4fb5c32ff4b3c1f3d7ee92d8358ae67fc6c1 Reviewed-on: https://gerrit.libreoffice.org/4675 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-07-02resolved fdo#35411 redefined MAXCODE 512 to FORMULA_MAXTOKENS 8192Eike Rathke1-2/+2
Also renamed MAXJUMPCOUNT to FORMULA_MAXJUMPCOUNT but without changing the value as the runtime array size of ocChose depends on it, should be changed before. Eliminated the duplicated and error causing redefinition of both in sc/inc/compiler.hxx Change-Id: I0e87d1439c9564a4f475fcb2870ab51c3b586942 (cherry picked from commit 9c1ca6dca3b553c302a635357e33591605343b99) Reviewed-on: https://gerrit.libreoffice.org/4667 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-07-01Resolves: fdo#66263 calc's protect records doesn't do anything, sid collisionCaolán McNamara1-0/+1
Change-Id: I50c9f0bd28f17e5d56c6d6948871042ba64650ef (cherry picked from commit 257ba103fb9ffae87189eb5d435969961fe4e98c) Reviewed-on: https://gerrit.libreoffice.org/4651 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-06-28fix hair & fine cell border export ( followon fix fdo#56960 )Noel Power1-0/+1
1) align excel binary and oox import filter border thickness values 2) use new fine-dash border style 3) detect & determine hair vrs fine borderline on export also squashed relevant part of commit ee51444ed1f7003dafc93c8181b5f8c1b0fd165b ( fix borders unit test ( test values have changed ) ) Change-Id: Ieb024bc6f4bfc87c525082c7b9a1f3c444f5c5ca (cherry picked from commit 1680a8cd4f4393ec15c4f85cb63b6654117d56d1) Reviewed-on: https://gerrit.libreoffice.org/4493 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-26colliding SID_SVX_START based idsCaolán McNamara3-5/+17
Change-Id: I6eba0b0c2291a71ebe683b23a0af400010d5b5d8 (cherry picked from commit 669ad519902e21e0cb3537fb7e203987f75a4077) Reviewed-on: https://gerrit.libreoffice.org/4547 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-25fdo#58029: replace quadratic child window loop with linearMichael Stahl1-0/+6
... which should speed things up without introducing problems. (Window::GetChild(n) is inefficient because the children are a linked list) Change-Id: I343d51a6866c5014cbca4c256b0c15f938958c39 (cherry picked from commit 38dcfadda85058a0ee87292c8943aec82e34b81e) Reviewed-on: https://gerrit.libreoffice.org/4488 Tested-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
2013-06-24Resolves: fdo#66105 set max growth width for labels/edits which take pathsCaolán McNamara1-0/+3
Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1 (cherry picked from commit 9495e912797f67897a4a658d20137bb94f39e9ab) Reviewed-on: https://gerrit.libreoffice.org/4481 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-24Related: fdo#66105 clip message box dialogs to some reasonable widthsCaolán McNamara1-0/+2
(cherry picked from commit 19a2685ec04bd6ce882d4dd08d24c7248cf99a84) Change-Id: I7fc179865306ba5b593b090b1fdb8971ba6bd508 Reviewed-on: https://gerrit.libreoffice.org/4480 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-06-24convert the right number of elementsDavid Tardon1-1/+1
(cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5) Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c Signed-off-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/4476 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-23l10n of additional gradients in standard paletteAndras Timar1-61/+83
Change-Id: I66a1d963e8b8616d372af28963edea4acbcc7858 Reviewed-on: https://gerrit.libreoffice.org/4445 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#43641 oox: fix position/size of LineShapes inside lockedCanvasMiklos Vajna1-0/+3
Change-Id: Idf14d40f174ca87543a829ccfe22ed5cbb8e3cbc (cherry picked from commit 6ada1ddecd98a616114cb36651c0f0f48c6dd3c3) Reviewed-on: https://gerrit.libreoffice.org/4423 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-21Resolves: fdo#65635 don't include border gap in height for borderless editsCaolán McNamara1-1/+1
Change-Id: If778fdeb5bdbd5a5cac33f57ef8d598ddc1408f2 (cherry picked from commit 0a5c151b62a7abc3fc4abaadb0b50c3047eb5f26) Reviewed-on: https://gerrit.libreoffice.org/4428 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-06-17fdo#55315 Added simple Trie lookup tree for autocomplete words storageTomaž Vajngerl1-0/+59
Added simple Trie lookup tree which is more tailored to what is needed in autocomplete implementation, but still has the speed of the LatinLookupTree that has been used till now. As the implementation is much simpler it should be more managable and easier fixable. For now two actions: insert (word) and findSuggestions are supported. Acttion findSuggestion returns all words in a list for a searched sub-word, it also fixes fdo#62945. Change-Id: I63b69c30d28b4e1c465c2122ebc537f7f75a033a Reviewed-on: https://gerrit.libreoffice.org/4237 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-16l10n of additional colors in standard paletteAndras Timar1-0/+10
Change-Id: I9200ce7f0e18491f2a1b8b60a43883df6dcb6cf2
2013-06-15use proper offset for additional locale data formats, fdo#64947 relatedEike Rathke1-1/+3
Old number formats had predefined formats from 0..49, locale data could define additional formats from index 50 on. Internal (fractional) formats were added to the number formatter, shifting the number of predefined entries NF_INDEX_TABLE_ENTRIES by two that was also used as an offset to determine whether a format needed to be added additionally. As a consequece, formats defined with index values 50 and 51 in locale data were ignored and not available in the dialog. Introduced a new enum constant NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS to use as the old offset value for not having to change all locale data definitions everytime an internally generated format is added. Change-Id: I94bdaabf360f7b9c253b1e3f5b73087f0c45fb44 (cherry picked from commit e7d73b42bd71aaab862c3e519348507a84f74754)
2013-06-12Cairo canvas fixesMichael Meeks1-0/+11
+ Move BitmapEx construction from an XBitmapCanvas into BitmapEx where (arguably) it will be easier to re-factor later, treat a mask fetch failure as if we have no mask + Teach the cairo canvas to return a non-pre-multiplied RGB + separate Alpha BitmapEx when it can to avoid unpleasantness with the underlying X resources. + Add tentative code-path to convert 32bit color Bitmaps into 24bit color, to avoid confusing X Change-Id: Iaf6998c796aea6d73c57bed2bc03152d9636d5f5 Conflicts: vcl/source/gdi/gdimtf.cxx
2013-06-12Fix bnc#795857 Use correct sizes for EMF+ bitmap renderingRadek Doulik1-1/+1
Fix pdf export wrong size issues for embedded EMF+ images. Change-Id: I998c9535bde32fc9f452d61d7cb7609c95f5528d (cherry picked from commit 4c676625d4016d428e9becd5512b7cfc8b0c4b24) Conflicts: vcl/inc/vcl/gdimtf.hxx vcl/source/gdi/gdimtf.cxx Conflicts: vcl/source/gdi/gdimtf.cxx
2013-06-12Revert "pass argb32 pixmaps from vcl to canvas, avoiding costly x11 ...Michael Meeks1-3/+0
This reverts commit 22f63477a3300d474c3d6832232b888f75c7290c. Conflicts: canvas/source/cairo/cairo_canvasbitmap.cxx Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316
2013-06-10fix file and lineno info for DBG_UNHANDLED_EXCEPTIONNoel Grandin1-2/+2
which I broke in commit 863d38fbfa4fb4861e476828c46410602100919e "move DBG_UNHANDLED_EXCEPTION out of line" Change-Id: Ic30e985cc356d81013ced1ce74ec6c78469d9882 (cherry picked from commit 2cb247a12d682d7cda0483570b38b4469c360a94)
2013-06-09Remove remnants of help agentCaolán McNamara6-18/+0
it was removed with 66714f1888eaccef4eb5341971278ae7dfafa16b but gobs of code (and UI) still existed to collect the help id and give it to the missing help agent with various UI visible options and buttons to control the help agent which isn't there Change-Id: I625da27b3046d481e43f4d35d32cc7063a1c6291
2013-06-07share spPaperSizeTable ( and associated access code ) in msfilterNoel Power1-0/+15
PageSetup.PaperSize implementation more or less copy&pasted the papersize conversion code from oox, this is a followup to remove the duplication. ( Probably the binary filter could be converted to use this also saving yet another nearly similar implementation ) Change-Id: I479f0322163161f7819c5d650a9511910ac2e781 (cherry picked from commit c76974576aa5eec6b86af39eaaadc8e382f214bd)
2013-06-07sw: fix AutoCorrect bold/underline regressionMichael Stahl1-1/+4
The horrible SvxAutoCorrect::AutoCorrect() inserts the character into the document half-way through, and then _expects_ this inserted character to show up in its rTxt parameter. This broke in Writer when SwTxtNode::m_Text was converted to OUString, because now a temporary String copy is created. Work around this disaster area for now. (regression from 0295c8a34e39326414c1b98cf4da905802f061b0) Change-Id: I1cb11a20cb0c2577036176e605426105631f3311 (cherry picked from commit e2b9946022c2a286ebac625ccb45f5ddddd5a5d6)
2013-06-06Revert overflow checks in O[U]String::toInt{32,64} againStephan Bergmann2-8/+4
...originally introduced with bd60d41176da540b01d7583cfe00637431967f39 "Handle oveflow in O(U)String::toInt() functions." As pointed out by Noel Power, there is existing code using toInt32(16) to read an effectively unsigned hex string into a sal_Int32, which used to work fine with the wrap-around overflow but now fails when toInt32 explicitly returns 0 for large values. See, e.g., use of oox::AttributeList::getIntegerHex (indirectly calling OUString::toInt32) in ColorScaleRule::importColor (sc/source/filter/oox/condformatbuffer.cxx). To prevent any regressions in LO 4.1, remove the explicit checks from toInt{32,64} again for now. (They were "merely" added as a general safety measure, not to address some specific problem, IIRC.) On master, the approach will rather be to introduce toUInt32 and adapt client code as necessary. Change-Id: Id332cff18a99b8bd2dcccd7988b7aad3a9e98c4c
2013-06-06Fix issue #i120723#: Table style is lost when import PPTX by AOOZhe Wang1-1/+1
* subversion/main/oox/inc/oox/drawingml/table/tableproperties.hxx * subversion/main/oox/source/drawingml/table/tableproperties.cxx []if the imported table in pptx just have tableStyleId, should fill the tablestyle's content. Patch by: Ma Bingbing <jiazema@gmail.com> Suggested by: Wang Zhe <kingwisemmx@gmail.com> Found by:Ma Bingbing <jiazema@gmail.com> Review by: Wang Zhe <kingwisemmx@gmail.com>(cherry picked from commit 74b1435a4d39eac71e36fb1c387b24af4b353fa0) Conflicts: oox/inc/oox/drawingml/table/tableproperties.hxx oox/source/drawingml/table/tableproperties.cxx Change-Id: I554169522a95343662781c3f169c6485c38a6800 (cherry picked from commit f39f7ba614749d99362a2059919521eee6bdb6fc)
2013-06-05sidebar: Restrict the minimal width of the sidebar.Jan Holesovsky1-0/+2
Change-Id: I99051830c4393b420125332e787c3abdc5a6aa61 (cherry picked from commit e66be44b69ee2a1b99bda32af93ea453c669b319)
2013-06-05sidebar: Allow creation of SidebarToolBoxes via .ui.Jan Holesovsky2-1/+7
Change-Id: If8789fd423a609a18514e5a798df5b5992dac34f (cherry picked from commit 74221eb249f8c4aaf15c2e1f23651f3fde954767)
2013-06-05sidebar: Allow creation of toolboxes using Widget layout / .ui.Jan Holesovsky3-3/+23
Change-Id: Idc07614005a00401a51007b1a0aef00e17507daa (cherry picked from commit 6fe1ff54c667a4f669feee6954dd9b859fd442b2)
2013-06-05sidebar: Introduce PanelLayout class.Jan Holesovsky1-0/+31
This allows sidebars to be defined using Widget layout / .ui files. Change-Id: I7d5daf2579d6359ba48d4df4be344bb75ce16273 (cherry picked from commit 4f14ed6d346a488976262e69fdbc2fd21881b659)
2013-06-04vcl: add a console-only mode to avoid problems on Mac for gengal.Michael Meeks1-1/+5
Change-Id: Ie5332330e6f398c3cd7e58df9b12fac121f5426f
2013-06-04Resolves: #i122433# The sidebar ControllerItem can now...Andre Fischer1-0/+5
give access to the extended help text for commands (cherry picked from commit 3f483a9219b9135f9f854d62b4ad0512d3752660) Conflicts: sfx2/inc/sfx2/sidebar/ControllerItem.hxx Change-Id: I22668e6f9c1c7aed174a43d7d3e04829dc6733ae Related: #i122433# fix build breaker invalid use of incomplete type 'struct Help' (cherry picked from commit 797e399967ffb1c28b8c32d328f5f57d79a8caf3) Change-Id: Ifde6fede9b91eb828c665a5a720b93171108e17b (cherry picked from commit 3b55196fb07c9101f0f0f51895a8083cbf5e78fc)
2013-06-04fdo#60120 Modify DialControl to store 100th degree angle.Tomaž Vajngerl1-2/+8
DialControl internally stores the angle to a 100th of a degree percision, but when SetRotation is called, the value was always rounded to a 1 degree percision. This has now been modified to round only on DialControl mouse interaction. Additionally add add a parameter to SetLinkedField which states the number of decimal places the NumericField is set to. This change makes possible to set the NumericField to 100th of a Degree as the internal angle is represented in. Default value is 0, so no change is needed to existing DialControls. Change-Id: I1f0c20092cdfccbd0878d7eb620bfdad7825b0fb
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 21:30:37 +0000