summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls
AgeCommit message (Collapse)AuthorFilesLines
2014-07-29rhbz#1121254 reload font list from shell on changeDavid Tardon1-0/+6
Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb (cherry picked from commit 0497864bd4f603605997938d504ef9598623e713) Reviewed-on: https://gerrit.libreoffice.org/10546 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-15fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida1-2/+2
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: xmloff/source/chart/SchXMLExport.cxx sd/source/ui/view/sdview3.cxx chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx chart2/source/controller/main/ChartTransferable.cxx chart2/source/controller/main/ChartTransferable.hxx chart2/source/model/main/Axis.cxx chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/tools/AxisHelper.cxx chart2/source/view/main/ChartView.cxx comphelper/source/container/embeddedobjectcontainer.cxx dbaccess/source/ui/browser/dbexchange.cxx dbaccess/source/ui/inc/JoinExchange.hxx dbaccess/source/ui/inc/TableRowExchange.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/querydesign/JoinExchange.cxx dbaccess/source/ui/tabledesign/TableRowExchange.cxx embeddedobj/source/commonembedding/persistence.cxx embeddedobj/source/inc/commonembobj.hxx include/comphelper/embeddedobjectcontainer.hxx include/svtools/embedtransfer.hxx include/svtools/stringtransfer.hxx include/svtools/transfer.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx include/svx/fmview.hxx include/svx/galmisc.hxx include/svx/svdobj.hxx include/svx/svdoole2.hxx include/svx/svdxcgv.hxx include/svx/view3d.hxx include/svx/xmlexchg.hxx include/xmloff/xmlexp.hxx reportdesign/source/ui/dlg/GroupExchange.cxx reportdesign/source/ui/dlg/GroupExchange.hxx reportdesign/source/ui/inc/dlgedclip.hxx reportdesign/source/ui/report/dlgedclip.cxx sc/inc/column.hxx sc/source/ui/app/drwtrans.cxx sc/source/ui/app/lnktrans.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/lnktrans.hxx sc/source/ui/inc/seltrans.hxx sc/source/ui/inc/transobj.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/view/viewfun5.cxx sc/source/ui/view/viewfun7.cxx sd/source/ui/app/sdxfer.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/inc/TabControl.hxx sd/source/ui/inc/View.hxx sd/source/ui/inc/sdtreelb.hxx sd/source/ui/inc/sdxfer.hxx sd/source/ui/view/sdview2.cxx sd/source/ui/view/tabcontr.cxx sfx2/source/doc/objxtor.cxx svtools/source/misc/embedtransfer.cxx svtools/source/misc/stringtransfer.cxx svtools/source/misc/transfer.cxx svtools/source/misc/transfer2.cxx svx/source/engine3d/view3d.cxx svx/source/fmcomp/dbaexchange.cxx svx/source/fmcomp/dbaobjectex.cxx svx/source/fmcomp/xmlexchg.cxx svx/source/form/fmexch.cxx svx/source/form/fmview.cxx svx/source/gallery2/galmisc.cxx svx/source/inc/fmexch.hxx svx/source/svdraw/svdoole2.cxx svx/source/svdraw/svdxcgv.cxx svx/source/tbxctrls/colrctrl.cxx sw/source/core/uibase/dochdl/swdtflvr.cxx sw/source/core/uibase/inc/swdtflvr.hxx sw/source/core/undo/unins.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a (cherry picked from commit 4ee53683df4beda260aff26d2c9e56fe643f45bb) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-12avoid problems with poppler's and vcl's FontInfo during runtimeMarkus Mohrhard2-3/+3
Conflicts: include/vcl/metric.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx Conflicts: include/svtools/ctrltool.hxx include/vcl/metric.hxx include/vcl/outdev.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx sw/source/core/uibase/docvw/srcedtw.cxx vcl/source/gdi/metric.cxx vcl/source/outdev/font.cxx Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8 Reviewed-on: https://gerrit.libreoffice.org/9720 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-02fix bad cast in SvxStyleBox_Impl::StateChanged()Michael Stahl1-2/+5
This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 Reviewed-on: https://gerrit.libreoffice.org/9621 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-04-25fdo#73891 Fix "UI color panel does not show the actual color in Writer"Tomofumi Yagi1-0/+12
1.The Font/Background/Highlight Color panels identify the actual color by a small frame. (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f See also fdo#32376 - Set default color to the current one in toolbar popups) 2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too. Reviewed-on: https://gerrit.libreoffice.org/9103 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed) Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>
2014-03-17cp#1000025: Import casemaps from pptx.Muthu Subramanian1-0/+6
(Ported from: 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec and 9dbcb79782d6a5b80c21a0c093537d18425b826f) Change-Id: I211491e06273aedf5c8ddbd0ca3fc35f3d168aaa Reviewed-on: https://gerrit.libreoffice.org/7848 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-03-12Related: fdo#73051 make font size drop down of optimal widthCaolán McNamara1-5/+17
presumably keithcu felt the font size was too wide, so lets try and implement the desired effect of an optimal width. Change-Id: Idc1741de04b3559fa415ebcf2289f96ba240ca8f Reviewed-on: https://gerrit.libreoffice.org/8520 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12hidpi: Sidebar, fontwork, autoformat and other improvements.Keith Curtis2-1/+16
This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3 Reviewed-on: https://gerrit.libreoffice.org/8519 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-03-12hidpi: Make many places Hi-DPI aware.Jan Holesovsky3-37/+48
This also introduces a getter for the mnDPIScaleFactor variable. Change-Id: I02ba6858fb1842f911d62976f4c54afc3bfa337f Reviewed-on: https://gerrit.libreoffice.org/8517 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-01-21Fix bogus mass-conversion equalsAsciiL -> startsWithStephan Bergmann1-8/+8
3af99e4d59d89c343965a928681a30f36b1007d2 "convert equalsAsciiL calls to startsWith calls" should rather have converted to oprator ==. (cherry picked from commit a3f32769fc4bb23c64168b412dd10ec769a3854d) Conflicts: sc/source/ui/unoobj/nameuno.cxx sc/source/ui/unoobj/styleuno.cxx sfx2/source/appl/sfxhelp.cxx stoc/source/security/permissions.cxx sw/source/core/unocore/unocrsrhelper.cxx (None of those bogus startsWith calls seem problematic enough to warrant backporting also to libreoffice-4-2-0.) Change-Id: Id4a8836c5d6d570e54661c40be7214632e202b21 Reviewed-on: https://gerrit.libreoffice.org/7578 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-02fdo#71748 Fix color pickersMaxim Monastirsky1-27/+4
This commit includes the following changes: 1) Remove boxes from PNG files, and draw them ourselves. This will ensure that the color rec will always fit the box. Also it will make all color pickers look the same, and greatly simplify the code. (a part of the code was not reachable anyway.) 2) Fix color preview for toolbar large icons. (a regression of commit f59c47fc1e79050d3342924e6173b0f4b6ddaf02.) 3) Fix sidebar paragraph color picker initial drawing. reset should be called *after* the icon assignment. Change-Id: I13ae02bc3dd68dd14877ccc949784072c58bf211 Reviewed-on: https://gerrit.libreoffice.org/6882 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e239f372c6abcd8371d0a666c828bf1c31195dd4)
2013-11-20wrong border extraction mechanismCaolán McNamara1-7/+3
Change-Id: I70925b9e8f5eb0e735200e2f57a892ada9fad379
2013-11-20convert equalsAsciiL calls to startsWith callsNoel Grandin1-8/+8
Convert code like: aStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) ) to aStr.startsWith( "ActiveConnection" ) which compiles down to the same machine code. Change-Id: Id4b0c5e0f9afe716a468d3afc70374699848dc33
2013-11-19remove unnecessary use of OUString constructor when assigningNoel Grandin9-26/+26
change code like aStr = OUString("xxxx"); to aStr = "xxxx"; Change-Id: Ib981a5cc735677ec5dba76ef9279a107d22e99d4
2013-11-14SAL_WARN_UNUSED com::sun::star::uno::AnyStephan Bergmann1-1/+0
Change-Id: I9058044d13f696e07667dce706f6c311af6dbea0
2013-11-14rhbz#887420 Implement "block untrusted referer links" featureStephan Bergmann1-3/+3
For now, this checks for a trusted referer (if the BlockUntrustedRefererLinks configuration prop is set) in utl::MediaDescriptor::impl_openStreamWithURL and SvxBrushItem::GetGraphicObject. Checking in additional places will probably be necessary to block /all/ unwanted communication. Also, some places marked /*TODO?*/ currently pass in an empty referer (which is always considered trusted) and will probably need to be adapted. Ideally, Referer URIs would never be empty (and consistently use something like <private:user> for cases where access is explicitly initiated by the user and should never be blocked), but that's a very daunting task, so start small by identifying the places that potentially need blocking and adding appropriate Referer URIs there. Also, Referer information should always be computed as freshly as possible from the context in which an access attempt is made, but, again, always carrying the information from the context all the way to the relevant functions is a very daunting task, so for now store the information upon object instantiation in some cases (SvxBrushItem, SdrGrafObj, ...). The Referer URI (css.document.MediaDescriptor property; SID_REFERER) was already used to track macro execution, and there is one place in SfxApplication::OpenDocExec_Impl where opening of hyperlinks (explicitly clicked by the user) is done that needs the current document's URI as Referer to check execution of macro URIs but needs an empty (or <private:user>, see above) Referer to not block non-macro URIs. Special code has been added there to handle that. Change-Id: Iafbdc07a9fe925d9ee580d4f5778448f18f2ebd9
2013-11-08remove unnecessary use of OUString constructor in SVX moduleNoel Grandin2-26/+26
Change-Id: I1506daaa4a3b736ee6bbb00100fca24df8368298
2013-11-05presumably this was intended as include guardThomas Arnhold1-3/+0
remove it, as it's nonsense Change-Id: Id8171b81d42dfd3d391b7c5e6602d9271b6697c7
2013-11-04fdo 70998: Termchange: Graphics->ImageSamuel Mehrbrodt1-1/+1
Change-Id: If451dfb24567157c86bca9a4a8564eb8de231a38 Reviewed-on: https://gerrit.libreoffice.org/6524 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-30fdo#54938: Convert svx to use cppu::supportsServiceMarcos Paulo de Souza2-54/+9
Change-Id: I3ab178924cb1c4240511f08625f244dac54e3913 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-28fixincludeguards.sh: svxThomas Arnhold2-4/+4
Change-Id: I885bbc431322ee233f8e67ec2bb5701af909046c
2013-10-23convert code to use OUString::endsWithNoel Grandin2-20/+20
Convert places that call aStr[aStr.getLength()-1] == 'x' to use the shorter form aStr.endsWith("x") Change-Id: I1b3a19c0e89b8989cdbeed440f95fc76f9a4b6b6
2013-10-22vcl: mark more Image constructors as "explicit"Michael Stahl2-6/+8
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
2013-10-19CID#1038502 uninitialized memberCaolán McNamara1-3/+4
Change-Id: Ie69689748e6e38e3d269855a4c72e78d7979119b
2013-10-16Resolves: #i122738# corrected update of FillStyle/FillAttribute UI elementsArmin Le Grand1-13/+0
(cherry picked from commit 2fc5d2946561258b012b80443cac025d851afda8) Conflicts: svx/inc/svx/fillctrl.hxx svx/source/tbxctrls/fillctrl.cxx Change-Id: I3be23f7ec199c49beb7c5cecfb835977e2bedcea
2013-10-01convert remnants of String in SVX to StringNoel Grandin2-2/+2
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
2013-09-30Sidebar: Show default line-color in 'Draw'Prashant Pandey1-1/+5
Currently, the default color shown in Sidebar>Line>Color is yellow and is not updated until and unless one hovers a mouse on top of it. This is wrong and the default color of the line-color should be updated and shown by default. Change-Id: I213cba84a0fc726220acfe547955a96d6bb4446b Reviewed-on: https://gerrit.libreoffice.org/5932 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-20String to OUString in itemwin.cxxLaurent Balland-Poirier1-7/+5
Change-Id: If82112acaecbdbb05d2499b2c0eaf2066b707571
2013-09-18[Sidebar]: Fix the vague behaviour of color fill toolbox in DrawPrashant Pandey1-2/+11
Currently, in 'Draw' when we make any object, say a rectangle and fill color inside it, then in the sidebar 'Fill and Controls', the color of the rectangle made is shown over the entire button. This is vague and the color is to be shown such that it is only filled inside the color- button appropriately. Change-Id: I31502a2931364d83569ff04f9ee8429bfe2225ad Reviewed-on: https://gerrit.libreoffice.org/5930 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-17fdo#64455 Handle unknown color in color lineLaurent Balland-Poirier1-1/+37
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
2013-09-16fdo#39468 Translate German comments in itemwin.cxxLaurent BP1-3/+3
Change-Id: Iee5b21c728071769335b7315d93b13fd8239f922
2013-09-14fdo#68874: Highlighter icon doesn't change color if no text is selectedIvan Timofeev1-1/+1
the problem is that bChoiceFromPalette becomes false too early when StateChanged is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it in the switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND (which we actually want to handle) is no-op. Change-Id: I024f6a443535411648bda44576e838c3d863e7de
2013-09-05convert svx/source/tbxctrls/*.cxx from String to OUStringNoel Grandin9-90/+79
Change-Id: I2f59ac54fda1e11353d81e8d5bd9fe5993c9ffdb
2013-09-05convert svx/inc/*.hxx from String to OUStringNoel Grandin1-1/+1
Change-Id: I446812579d1f30fdeef94ca9d77e6cd961226100
2013-09-05convert svx/source/tbxctrls/colorwindow.hxx from String to OUStringNoel Grandin2-3/+3
Change-Id: I307f0560782124002453934167664b91fd98e7de
2013-09-05convert include/svx/linectrl.hxx from String to OUStringNoel Grandin1-2/+2
Change-Id: I6c2136f8ea121286f80afa45655a9fba42ac0197
2013-09-05convert include/svx/tbcontrl.hxx from String to OUStringNoel Grandin1-5/+3
Change-Id: I7e5785c5edba06457f904d36373158fb9c08536b
2013-08-29fdo#39468 Translate German commentsLaurent Balland-Poirier1-37/+27
patch for svx/source/tbxctrls/fillctrl.cxx Change-Id: Ie3fcfa21d19037b001775886fbb187c2773556be
2013-08-29fix indentationIvan Timofeev1-11/+11
Change-Id: Ifc093acc67c8ee15a68dac8bb6a73c5dd21580d1
2013-08-29fdo#39468 translate German commentsLaurent Balland-Poirier1-27/+27
patch for svx/source/tbxctrls/linectrl.cxx Change-Id: If09d98114d7d742731eb2755cfa690b7745f3cd4
2013-08-21WaE: enumeral and non-enumeral type in conditional expressionCaolán McNamara1-1/+1
Change-Id: I0b35ce3559acae739e810780832f6e275b493382
2013-08-15Reduce scopeJulien Nabet1-1/+1
Change-Id: If9941ea3cc7133397b9867b01d576529cc1e8f0b
2013-08-08vcl, sw: fix the inheritance of SwComboBox from ComboBox a bitMichael Stahl1-1/+1
Remove the silly overloading, and introduce virtual methods. Change-Id: If54a6a3fb7464283f80d3387ae23db234690f8a3
2013-07-28reduce use of UniString from ResID ctorCaolán McNamara3-33/+33
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
2013-07-27Revert "SfxStyleSheetBasePool: remove internal iterator"Michael Stahl1-13/+14
This reverts commit 3a46d91f8de420f38dd763028e91229c846dff52. This breaks the Stylist, not sure why (does it depend on something setting the search flags before?) so revert for now. Change-Id: Ia50feeebae8bf852c827e4f270e81e9f08d2b1ac
2013-07-27SfxStyleSheetBasePool: remove internal iteratorMichael Stahl1-14/+13
The clients always start with First() anyway so they might as well use external iterators, which makes calling First() in certain situations just so the internal iterator is invalidated unnecessary. Change-Id: I0948576c20410136448e8b85311c21a257469bc7
2013-07-17Move hasBigImages() from ToolboxController to SfxToolBoxController.Jan Holesovsky1-13/+6
We want to decide whether the images are big or not based on the real (underlying) ToolBox, not on the global setting, because we can have both toolbars with large as well as small icons visible at the same time (small in sidebar, large in toolbars). Change-Id: I046a12a495f2038df9a571f5779794a639bae6dc
2013-07-15sidebar: Get AreaPropertyPanel basically to work.Jan Holesovsky1-0/+10
Change-Id: Ib5f05346ab5b38b4f3ec30f95b2435c9231d13ab
2013-07-14String::SearchAndReplaceAllAscii -> OUString::replaceAllCaolán McNamara1-6/+5
Change-Id: I5091835c9f71c712f15996e5c6263fc5f21f6f96
2013-06-29remove OUString wrap for string literalsThomas Arnhold2-8/+8
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>