summaryrefslogtreecommitdiff
path: root/include/svx/gallery.hxx
AgeCommit message (Collapse)Author
2022-04-29use more string_view in INetURLObjectNoel Grandin
Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-11-24loplugin:stringviewparam extend to comparison operatorsNoel
which means that some call sites have to change to use unicode string literals i.e. u"foo" instead of "foo" Change-Id: Ie51c3adf56d343dd1d1710777f9d2a43ee66221c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106125 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-02tdf#128302: Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLICStephan Bergmann
Using SVX_DLLPUBLIC for both Library_svxcore and Library_svx had started to cause failures with clang-cl on Windows now, presumably due to devirtualization: > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::DataChanged(class DataChangedEvent const &)" (?DataChanged@SvxMetricField@@MEAAXAEBVDataChangedEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::PreNotify(class NotifyEvent &)" (?PreNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::EventNotify(class NotifyEvent &)" (?EventNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::Modify(void)" (?Modify@SvxMetricField@@MEAAXXZ) > linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::PreNotify(class NotifyEvent &)" (?PreNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::EventNotify(class NotifyEvent &)" (?EventNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z) > C:\lo-clang\core\instdir\program\svxcorelo.dll : fatal error LNK1120: 6 unresolved externals Replacing certain uses of SVX_DLLPUBLIC with the newly introduced SVXCORE_DLLPUBLIC (include/svx/svxdllapi.h) has been done on Linux as follows: > git grep -w --line-number -e SVX_DLLPUBLIC --and --not -e '#define SVX_DLLPUBLIC' >LINES to produce a file LINES containing all 640 uses. (Conveniently, all uses happen to be on different lines.) Manually create a file TOKENS with 640 corresponding lines, each containing the (class or function) name that is made SVX_DLLPUBLIC by in the corresponding line in LINES. Then > nm -D --def instdir/program/libsvxcorelo.so | grep -ivw '[vw]' | c++filt >SVXCORESYMS > nm -D --def instdir/program/libsvxlo.so | grep -ivw '[vw]' | c++filt >SVXSYMS > n=$(cat TOKENS | wc -l) > for ((i=1;i<="$n";++i)); do > tok=$(head -n "$i" TOKENS | tail -1) > printf @ > grep -Fw "$tok" SVXCORESYMS >/dev/null && printf svxcore > printf @ > grep -Fw "$tok" SVXSYMS >/dev/null && printf svx > printf '@ ' > head -n "$i" LINES | tail -1 > done to generate 640 output lines detailing for each SVX_DLLPUBLIC name occurrene whether it is mentioned in exports from neither (@@@), only from svx (@@svx@), only from svxcore (@svxcore@@), or from both libraries (@svxcore@svx@). The numbers that gives is 10 @@@ 180 @@svx@ 424 @svxcore@@ 26 @svxcore@svx@ The 10 @@@ ask for follow-up clean up, but most of them are just left as SVX_DLLPUBLIC for now. The exceptions are sxv::ITextProvider (include/svx/itextprovider.hxx) and SdrCustomShapeGeometryItem::PropertyPairHash (include/svx/sdasitm.hxx, where PropertyPairHash is a member struct of SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem). Keeping them as SVX_DLLPUBLIC would cause "unresolved externals" errors when linking Library_svxcore on Windows. The 180 @@svx@ are fine to keep as-is, and the 424 @svxcore@@ need rewriting. The 26 @svxcore@svx@ needed manual inspection to decide (in some cases, the chosen name in TOKENS was a too generic function name like Fill, in other cases it was the name of a class exported from one library but also mentioned in the arguments of a function exported from the other). And for sdr::table::SdrTableObj the class itself is defined in svxcore while the static member functions ExportAsRTF and ImportAsRTF are defined in svx. But MSVC does not allow to mark the class as SVXCORE_DLLPUBLIC and the two static member functions as SVX_DLLPLUBIC, so move the two functions out of the class. (There appears to be no real necessity that they were static member functions in the first place; they don't even need to be friends of the class. Nevertheless, this mixture of functionality from svxcore and svx in include/svx/svdotable.hxx may ask for follow-up clean up, one way or another.) All the output lines that need rewriting (all the @svxcore@@ ones, and the manually picked subset of @@@ and @svxcore@svx@ ones) are copied into a new file CHANGE (containing 451 lines). Then > sed -E -e 's|^@.*@.*@ ([^:]+):([0-9]+):.*$|sed -i -e "\2 s/SVX_DLLPUBLIC/SVXCORE_DLLPUBLIC/" \1|' <CHANGE >COMMANDS > . COMMANDS to do the changes. Change-Id: If9b6dd1c9e9ba2eb883dbdac4385d28c6fc8a203 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87794 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-05-16tdf#42949 Fix IWYU warnings in include/svx/[e-g]*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I861d3f0fa15ee3b7e0e830c4fac2e5794ea4071b Reviewed-on: https://gerrit.libreoffice.org/72213 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-03-08loplugin:constantparam in svtools..unotoolsNoel Grandin
Change-Id: I6e72fbe44dcb65ee5162448e9a72e6437d56b044 Reviewed-on: https://gerrit.libreoffice.org/50948 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-01-23Fixed wordingMatthias Seidel
(cherry picked from commit 106d959da4cccda4c0342715cc06854f152c99d1) Change-Id: I51c86dfef0e0eff59ce2892d8ea07dd066fd9667
2017-11-28loplugin:countusersofdefaultparams in svxNoel Grandin
Change-Id: I2c9ea6c38b75dcafeb36931b6c2e94489819144f Reviewed-on: https://gerrit.libreoffice.org/45336 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-10-30loplugin:constantparam in svxNoel Grandin
Change-Id: Ifaad1083b1561b2bd908e798e06fbff8bbabbe60 Reviewed-on: https://gerrit.libreoffice.org/44048 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-07-21migrate to boost::gettextCaolán McNamara
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
2017-05-15tdf#107845 string resource ids effectively ended up in the gallery formatCaolán McNamara
which is a problem since... commit 34f7e618ddd3399d9e7f3998e25545256255d02d Date: Sun Apr 30 17:01:32 2017 +0100 untranslated strings are just strings and recover GALLERY_THEME_HTMLBUTTONS and GALLERY_THEME_DUMMY5 from commit 2d3a9c51055a285a2ac8d45e3ef31d248362589b Date: Mon Jul 2 21:02:19 2012 +0200 hrc cleanup: Remove unused defines Change-Id: I3fa45e4550295b94a6ab0acf9bcd0b25db73e689 Change-Id: Idae2c00f43e2062544f3de22e586bb163864bc03
2017-02-03Typo: progess->progressJulien Nabet
Change-Id: Ic13529f4bc9ac49059a59067c50d5f2c0f569822 Reviewed-on: https://gerrit.libreoffice.org/33902 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2016-09-02loplugin:countusersofdefaultparamsNoel Grandin
Change-Id: I2ed581e58523ac8b52aa520f7a02f69f408665fe Reviewed-on: https://gerrit.libreoffice.org/28587 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-07-11tdf#75280 Cleaning up of sal_uIntPtr usage #3tymyjan
Change-Id: I465d126652f4dd21c19ee6730466719445d835b3 Reviewed-on: https://gerrit.libreoffice.org/27074 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann
Change-Id: I71682f28c6a54d33da6b0c971f34d0a705ff04f5
2015-01-08brute-force find-and-remove of unused #define constants.Noel Grandin
Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb
2014-03-11svx: sal_Bool->boolNoel Grandin
Change-Id: I061f1e15c816f8077c0fbb0abbc1474eb286796b
2014-01-30fdo#63154 Removed unused solar.h ref. in svxAlexandre Vicenzi
Change-Id: I1671746d6c433fa3b770eb58bc418e4eddbe8dd4 Reviewed-on: https://gerrit.libreoffice.org/7737 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-09fdo#65108 inter-module includes <> include/svxNorbert Thiebaud
Change-Id: I5335182ea16695c77c2855b34c98220aea2befa1
2013-10-23fixincludeguards.sh: include/svxThomas Arnhold
Change-Id: I2c280be12f36c1538e922286745aabc62482423d
2013-10-21remove unnecessary tools/string.hxx includesCaolán McNamara
Change-Id: I8ed341aeef90584dfc545a794f999e3adc08dd72
2013-10-01convert remnants of String in SVX to StringNoel Grandin
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
2013-09-05convert include/svx/gallery.hxx from String to OUStringNoel Grandin
Change-Id: I0334a9544d25d35492764d0f5832f85604470cff
2013-07-01Resolves: fdo#66027 #i122116# Remove GalleryExplorer member functionsAriel Constenla-Haile
(cherry picked from commit e94681fb47e3c5bdba486cd8feca92705d44840d) Conflicts: sc/source/ui/app/typemap.cxx sc/source/ui/view/galwrap.cxx sc/source/ui/view/makefile.mk sc/source/ui/view/tabvwsh9.cxx sd/source/ui/view/drviews9.cxx svx/Package_inc.mk svx/inc/GalleryControl.hxx svx/inc/galbrws2.hxx svx/inc/svx/galbrws.hxx svx/inc/svx/gallery.hxx svx/source/gallery2/GalleryControl.cxx svx/source/gallery2/galbrws.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx sw/source/ui/shells/basesh.cxx Change-Id: I49c2b99ca551f058b852c0e5e28cc2fe8c205031
2013-05-10Resolves: #i121445# Added transparency support to the galleryArmin Le Grand
(cherry picked from commit cf417aec41decab94b5f1e82f6409e97a6c02fb5) Conflicts: extras/source/gallery/gallery_system/sg2.sdg extras/source/gallery/gallery_system/sg2.thm svx/inc/galtheme.hrc svx/inc/svx/fontworkgallery.hxx svx/inc/svx/gallery.hxx svx/inc/svx/galtheme.hxx svx/source/gallery2/galctrl.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/galobj.cxx svx/source/tbxctrls/fontworkgallery.cxx vcl/inc/vcl/outdev.hxx vcl/source/gdi/outdev6.cxx Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599 (cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)
2013-04-23execute move of global headersBjoern Michaelsen
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a