[Libreoffice-commits] core.git: sw/source
sw/source/ui/config/optcomp.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit a4522ef5ce6a625054d83ec907aee07c156e94ed
Author: Julien Nabet
AuthorDate: Sat Sep 16 21:13:59 2023 +0200
Commit: Julien Nabet
CommitDate: Sat Sep 16 22:06:40 2023 +0200
tdf#157266: fix crash related to tdf#157006
Relevant part of bt:
0 0x7f417347028d in SwCompatibilityOptPage::GetAllStrings()
(this=0x558e50180c80) at
/home/julien/lo/libreoffice/sw/source/ui/config/optcomp.cxx:344
1 0x7f424dfc35e7 in
OfaTreeOptionsDialog::initializeCurrentDialog(OptionsPageInfo*&,
std::unique_ptr >&)
(this=0x558e4d958ff0, pPageInfo=@0x7fff217470b8: 0x558e4d41f380,
xEntry=std::unique_ptr = {...}) at
/home/julien/lo/libreoffice/cui/source/options/treeopt.cxx:1253
2 0x7f424dfc22a7 in
OfaTreeOptionsDialog::initializeFirstNDialog(short) (this=0x558e4d958ff0,
nNumberOfNode=-1) at
/home/julien/lo/libreoffice/cui/source/options/treeopt.cxx:877
3 0x7f424dfc1ca8 in OfaTreeOptionsDialog::ImplUpdateDataHdl(Timer*)
(this=0x558e4d958ff0) at
/home/julien/lo/libreoffice/cui/source/options/treeopt.cxx:805
4 0x7f424dfbbc1d in
OfaTreeOptionsDialog::LinkStubImplUpdateDataHdl(void*, Timer*)
(instance=0x558e4d958ff0, data=0x558e4d959060) at
/home/julien/lo/libreoffice/cui/source/options/treeopt.cxx:792
Full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=189631
"label2" had been removed with
https://git.libreoffice.org/core/+/1d4cd39262fb71f72311e33ac2bdb7d925be5d98%5E%21
"Related tdf#157006 - Remove global compatibility options
Clean-up the UI in favor of the advanced options
"
Change-Id: I8e3532fb79afedf05fe42d0745c823fa2f1c362c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156977
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 8620ac451919..f28ae6af6b43 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -337,11 +337,7 @@ std::unique_ptr
SwCompatibilityOptPage::Create(weld::Container* pPag
OUString SwCompatibilityOptPage::GetAllStrings()
{
-OUString sAllStrings;
-OUString labels[] = { "label2", "label11" };
-
-for (const auto& label : labels)
-sAllStrings += m_xBuilder->weld_label(label)->get_label() + " ";
+OUString sAllStrings = m_xBuilder->weld_label(u"label11")->get_label() + "
";
sAllStrings += m_xDefaultPB->get_label() + " ";
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd46feef5a65b3ea152da839b19131b1787c8257 Author: Martin Srebotnjak AuthorDate: Sat Sep 16 19:52:08 2023 +0200 Commit: Gerrit Code Review CommitDate: Sat Sep 16 19:52:08 2023 +0200 Update git submodules * Update translations from branch 'master' to bdb4063cfd1b431b7281c8f3ad6e804bc43190e0 - Updated Slovenian translation Change-Id: I6a612b5c9329db26d9368dda230a0db21f18ff6b diff --git a/translations b/translations index 04a7d6325b3a..bdb4063cfd1b 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 04a7d6325b3a472b36e4509f41c381ab36e83d05 +Subproject commit bdb4063cfd1b431b7281c8f3ad6e804bc43190e0
[Libreoffice-commits] translations.git: source/sl
source/sl/cui/messages.po | 79 source/sl/desktop/messages.po |8 source/sl/extensions/messages.po | 20 source/sl/filter/messages.po |6 source/sl/framework/messages.po |6 source/sl/helpcontent2/source/text/sbasic/guide.po|8 source/sl/helpcontent2/source/text/sbasic/shared.po | 58 source/sl/helpcontent2/source/text/sbasic/shared/02.po|6 source/sl/helpcontent2/source/text/sbasic/shared/03.po| 20 source/sl/helpcontent2/source/text/scalc.po |6 source/sl/helpcontent2/source/text/scalc/00.po| 10 source/sl/helpcontent2/source/text/scalc/01.po| 20 source/sl/helpcontent2/source/text/scalc/02.po|6 source/sl/helpcontent2/source/text/scalc/04.po|6 source/sl/helpcontent2/source/text/scalc/05.po|4 source/sl/helpcontent2/source/text/scalc/guide.po | 28 source/sl/helpcontent2/source/text/scalc/menu.po | 82 source/sl/helpcontent2/source/text/schart.po | 10 source/sl/helpcontent2/source/text/schart/01.po | 14 source/sl/helpcontent2/source/text/sdatabase.po | 72 source/sl/helpcontent2/source/text/sdraw.po | 24 source/sl/helpcontent2/source/text/sdraw/00.po|8 source/sl/helpcontent2/source/text/sdraw/01.po|6 source/sl/helpcontent2/source/text/sdraw/04.po|6 source/sl/helpcontent2/source/text/sdraw/guide.po | 14 source/sl/helpcontent2/source/text/shared.po | 36 source/sl/helpcontent2/source/text/shared/00.po | 1016 ++- source/sl/helpcontent2/source/text/shared/01.po | 928 ++- source/sl/helpcontent2/source/text/shared/02.po | 220 source/sl/helpcontent2/source/text/shared/04.po |6 source/sl/helpcontent2/source/text/shared/05.po |6 source/sl/helpcontent2/source/text/shared/guide.po| 336 - source/sl/helpcontent2/source/text/shared/menu.po | 238 source/sl/helpcontent2/source/text/shared/optionen.po | 20 source/sl/helpcontent2/source/text/simpress.po| 26 source/sl/helpcontent2/source/text/simpress/00.po | 10 source/sl/helpcontent2/source/text/simpress/01.po | 24 source/sl/helpcontent2/source/text/simpress/02.po | 12 source/sl/helpcontent2/source/text/simpress/04.po | 16 source/sl/helpcontent2/source/text/simpress/guide.po | 46 source/sl/helpcontent2/source/text/smath.po |6 source/sl/helpcontent2/source/text/swriter.po | 138 source/sl/helpcontent2/source/text/swriter/00.po | 384 + source/sl/helpcontent2/source/text/swriter/01.po | 780 +- source/sl/helpcontent2/source/text/swriter/02.po | 44 source/sl/helpcontent2/source/text/swriter/04.po |6 source/sl/helpcontent2/source/text/swriter/guide.po | 126 source/sl/helpcontent2/source/text/swriter/menu.po| 60 source/sl/officecfg/registry/data/org/openoffice/Office.po| 10 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 35 source/sl/readlicense_oo/docs.po | 10 source/sl/sc/messages.po | 12 source/sl/scaddins/messages.po|6 source/sl/scp2/source/calc.po | 14 source/sl/sd/messages.po | 16 source/sl/sfx2/messages.po|8 source/sl/svtools/messages.po | 10 source/sl/svx/messages.po | 3023 -- source/sl/sw/messages.po | 1759 +++-- source/sl/vcl/messages.po | 106 60 files changed, 5929 insertions(+), 4091 deletions(-) New commits: commit bdb4063cfd1b431b7281c8f3ad6e804bc43190e0 Author: Martin Srebotnjak AuthorDate: Sat Jul 1 18:18:40 2023 +0200 Commit: Andras Timar CommitDate: Sat Sep 16 19:52:03 2023 +0200 Updated Slovenian translation Change-Id: I6a612b5c9329db26d9368dda230a0db21f18ff6b diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index 011e594dd09..b2fd3975e89 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 7.6\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIR
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f078a18a9aa354f108789286df9654b41cc2b8d4 Author: Martin Srebotnjak AuthorDate: Sat Sep 16 18:47:45 2023 +0200 Commit: Gerrit Code Review CommitDate: Sat Sep 16 18:47:45 2023 +0200 Update git submodules * Update translations from branch 'libreoffice-7-6' to 004e780cb193bce41dc2bd1c827f54804f4951b7 - Updated Slovenian translation Change-Id: Ide174c2593927fe870ef57bef1921e3a31b37784 diff --git a/translations b/translations index 0c739b8463c0..004e780cb193 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 0c739b8463c037284dad0daab54b1863ec69ba26 +Subproject commit 004e780cb193bce41dc2bd1c827f54804f4951b7
[Libreoffice-commits] translations.git: Branch 'libreoffice-7-6' - source/sl
source/sl/cui/messages.po | 56 +-- source/sl/desktop/messages.po |8 source/sl/extensions/messages.po | 14 source/sl/filter/messages.po |6 source/sl/framework/messages.po |6 source/sl/helpcontent2/source/text/sbasic/guide.po|8 source/sl/helpcontent2/source/text/sbasic/shared.po | 20 - source/sl/helpcontent2/source/text/sbasic/shared/02.po|6 source/sl/helpcontent2/source/text/sbasic/shared/03.po| 20 - source/sl/helpcontent2/source/text/scalc.po |6 source/sl/helpcontent2/source/text/scalc/01.po| 20 - source/sl/helpcontent2/source/text/scalc/02.po|6 source/sl/helpcontent2/source/text/scalc/04.po|6 source/sl/helpcontent2/source/text/scalc/05.po|4 source/sl/helpcontent2/source/text/scalc/guide.po | 28 - source/sl/helpcontent2/source/text/scalc/menu.po |6 source/sl/helpcontent2/source/text/schart.po | 10 source/sl/helpcontent2/source/text/schart/01.po | 14 source/sl/helpcontent2/source/text/sdatabase.po |8 source/sl/helpcontent2/source/text/sdraw.po |6 source/sl/helpcontent2/source/text/sdraw/00.po|8 source/sl/helpcontent2/source/text/sdraw/01.po|6 source/sl/helpcontent2/source/text/sdraw/04.po|6 source/sl/helpcontent2/source/text/sdraw/guide.po | 14 source/sl/helpcontent2/source/text/shared.po |8 source/sl/helpcontent2/source/text/shared/00.po | 50 +-- source/sl/helpcontent2/source/text/shared/01.po | 86 ++--- source/sl/helpcontent2/source/text/shared/02.po | 46 +- source/sl/helpcontent2/source/text/shared/04.po |6 source/sl/helpcontent2/source/text/shared/05.po |6 source/sl/helpcontent2/source/text/shared/guide.po| 158 +- source/sl/helpcontent2/source/text/shared/menu.po |4 source/sl/helpcontent2/source/text/shared/optionen.po | 20 - source/sl/helpcontent2/source/text/simpress.po|8 source/sl/helpcontent2/source/text/simpress/00.po |8 source/sl/helpcontent2/source/text/simpress/01.po | 24 - source/sl/helpcontent2/source/text/simpress/02.po | 12 source/sl/helpcontent2/source/text/simpress/04.po | 16 - source/sl/helpcontent2/source/text/simpress/guide.po | 46 +- source/sl/helpcontent2/source/text/smath.po |6 source/sl/helpcontent2/source/text/swriter/00.po | 18 - source/sl/helpcontent2/source/text/swriter/01.po | 92 ++--- source/sl/helpcontent2/source/text/swriter/02.po | 14 source/sl/helpcontent2/source/text/swriter/guide.po | 108 +++--- source/sl/officecfg/registry/data/org/openoffice/Office.po| 10 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/sl/readlicense_oo/docs.po | 10 source/sl/sc/messages.po |6 source/sl/scaddins/messages.po|6 source/sl/sd/messages.po | 16 - source/sl/sfx2/messages.po|4 source/sl/svtools/messages.po |6 source/sl/svx/messages.po | 16 - source/sl/sw/messages.po | 50 +-- 54 files changed, 578 insertions(+), 578 deletions(-) New commits: commit 004e780cb193bce41dc2bd1c827f54804f4951b7 Author: Martin Srebotnjak AuthorDate: Sat Sep 16 18:47:15 2023 +0200 Commit: Andras Timar CommitDate: Sat Sep 16 18:47:15 2023 +0200 Updated Slovenian translation Change-Id: Ide174c2593927fe870ef57bef1921e3a31b37784 diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index 46b4bbdd9f8..b2fd3975e89 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: LibreOffice 7.6\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; "POT-Creation-Date: 2023-07-08 15:29+0200\n" -"PO-Revision-Date: 2023-07-08 20:01+0200\n" +"PO-Revision-Date: 2023-07-31 15:37+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -739,12 +739,12 @@ msgstr "Premik miške ob pritisnjeni tipki" #: cui/inc/strings.hrc:155 msgctxt "RID_SVXSTR_EVENT_MOUSEENTERED" msgid "Mouse inside" -msg
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/fillproperties.cxx | 150
1 file changed, 59 insertions(+), 91 deletions(-)
New commits:
commit 5fd0d769a2a0106b6b12faed28dc81d90153c16c
Author: Tomaž Vajngerl
AuthorDate: Sat Sep 16 12:59:17 2023 +0200
Commit: Tomaž Vajngerl
CommitDate: Sat Sep 16 18:41:12 2023 +0200
oox: use frozen unordered_map for mapping the name string to token
Change-Id: Ib1f7d28509a1bc2680ad66b2cb1bf0ed35315f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156975
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index ff78f3183831..dec9ab9672cc 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -49,6 +49,11 @@
#include
#include
+#include
+#include
+#include
+
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::graphic;
@@ -992,101 +997,64 @@ OUString ArtisticEffectProperties::getEffectString(
sal_Int32 nToken )
return OUString();
}
-sal_Int32 ArtisticEffectProperties::getEffectToken( const OUString& sName )
+constexpr auto constEffectTokenForEffectNameMap =
frozen::make_unordered_map(
{
// effects
-if( sName == "artisticBlur" )
-return XML_artisticBlur;
-else if( sName == "artisticCement" )
-return XML_artisticCement;
-else if( sName == "artisticChalkSketch" )
-return XML_artisticChalkSketch;
-else if( sName == "artisticCrisscrossEtching" )
-return XML_artisticCrisscrossEtching;
-else if( sName == "artisticCutout" )
-return XML_artisticCutout;
-else if( sName == "artisticFilmGrain" )
-return XML_artisticFilmGrain;
-else if( sName == "artisticGlass" )
-return XML_artisticGlass;
-else if( sName == "artisticGlowDiffused" )
-return XML_artisticGlowDiffused;
-else if( sName == "artisticGlowEdges" )
-return XML_artisticGlowEdges;
-else if( sName == "artisticLightScreen" )
-return XML_artisticLightScreen;
-else if( sName == "artisticLineDrawing" )
-return XML_artisticLineDrawing;
-else if( sName == "artisticMarker" )
-return XML_artisticMarker;
-else if( sName == "artisticMosiaicBubbles" )
-return XML_artisticMosiaicBubbles;
-else if( sName == "artisticPaintStrokes" )
-return XML_artisticPaintStrokes;
-else if( sName == "artisticPaintBrush" )
-return XML_artisticPaintBrush;
-else if( sName == "artisticPastelsSmooth" )
-return XML_artisticPastelsSmooth;
-else if( sName == "artisticPencilGrayscale" )
-return XML_artisticPencilGrayscale;
-else if( sName == "artisticPencilSketch" )
-return XML_artisticPencilSketch;
-else if( sName == "artisticPhotocopy" )
-return XML_artisticPhotocopy;
-else if( sName == "artisticPlasticWrap" )
-return XML_artisticPlasticWrap;
-else if( sName == "artisticTexturizer" )
-return XML_artisticTexturizer;
-else if( sName == "artisticWatercolorSponge" )
-return XML_artisticWatercolorSponge;
-else if( sName == "brightnessContrast" )
-return XML_brightnessContrast;
-else if( sName == "colorTemperature" )
-return XML_colorTemperature;
-else if( sName == "saturation" )
-return XML_saturation;
-else if( sName == "sharpenSoften" )
-return XML_sharpenSoften;
+{ u"artisticBlur", XML_artisticBlur },
+{ u"artisticCement", XML_artisticCement },
+{ u"artisticChalkSketch", XML_artisticChalkSketch },
+{ u"artisticCrisscrossEtching", XML_artisticCrisscrossEtching },
+{ u"artisticCutout", XML_artisticCutout },
+{ u"artisticFilmGrain", XML_artisticFilmGrain },
+{ u"artisticGlass", XML_artisticGlass },
+{ u"artisticGlowDiffused", XML_artisticGlowDiffused },
+{ u"artisticGlowEdges", XML_artisticGlowEdges },
+{ u"artisticLightScreen", XML_artisticLightScreen },
+{ u"artisticLineDrawing", XML_artisticLineDrawing },
+{ u"artisticMarker", XML_artisticMarker },
+{ u"artisticMosiaicBubbles", XML_artisticMosiaicBubbles },
+{ u"artisticPaintStrokes", XML_artisticPaintStrokes },
+{ u"artisticPaintBrush", XML_artisticPaintBrush },
+{ u"artisticPastelsSmooth", XML_artisticPastelsSmooth },
+{ u"artisticPencilGrayscale", XML_artisticPencilGrayscale },
+{ u"artisticPencilSketch", XML_artisticPencilSketch },
+{ u"artisticPhotocopy", XML_artisticPhotocopy },
+{ u"artisticPlasticWrap", XML_artisticPlasticWrap },
+{ u"artisticTexturizer", XML_artisticTexturizer },
+{ u"artisticWatercolorSponge", XML_artisticWatercolorSponge },
+{ u"brightnessContrast", XML_brightnessContrast },
+{ u"colorTemperature", XML_colorTemperature },
+{ u"saturation", XML_saturation },
+{ u"sharpenSoften", XML_sharpenSoften },
// attr
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.39-1'
Tag 'co-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + co-21.06.39-1 Changes since co-21.06.38-1-1: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.39-1'
Tag 'cp-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + cp-21.06.39-1 Changes since co-21.06.38-1-1: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.39-1'
Tag 'cp-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + cp-21.06.39-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-21.06.39-1'
Tag 'co-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + co-21.06.39-1 Changes since cp-21.06.13-1-1: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.39-1'
Tag 'cp-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + cp-21.06.39-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-21.06.39-1'
Tag 'co-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + co-21.06.39-1 Changes since co-2021-branch-point-10: --- 0 files changed ---
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-21.06.39-1'
Tag 'cp-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + cp-21.06.39-1 Changes since co-2021-branch-point-10: --- 0 files changed ---
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.39-1'
Tag 'co-21.06.39-1' created by Andras Timar at 2023-09-16 16:16 + co-21.06.39-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a9bfddbd63bd260b0cab4e05a3f2eea70475ff62 Author: Andras Timar AuthorDate: Sat Sep 16 18:15:30 2023 +0200 Commit: Andras Timar CommitDate: Sat Sep 16 18:15:30 2023 +0200 Bump version to 21.06.39.1 Change-Id: I3f6b06a4696ac402989e1a949c9a9790d00d4489 diff --git a/configure.ac b/configure.ac index b8bfc9e594bf..0792e181547c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[21.06.38.1],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[21.06.39.1],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.4.7.2.M2'
Tag 'mimo-7.4.7.2.M2' created by Andras Timar at 2023-09-16 16:11 + mimo-7.4.7.2.M2 Changes since libreoffice-7.4.7.2-22: --- 0 files changed ---
[Libreoffice-commits] core.git: odk/examples
odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.bas | 41 +
odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact.bas | 17
odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.bas | 223
++
3 files changed, 281 insertions(+)
New commits:
commit 930f0aa232611d751209c5cb089b9f282f26bde8
Author: Hossein
AuthorDate: Sat Sep 16 14:05:03 2023 +0200
Commit: Hossein
CommitDate: Sat Sep 16 15:08:31 2023 +0200
tdf#157273 Port DevelopersGuide/FirstSteps examples to BASIC
These 3 examples from the chapter 1 of the DevGuide are ported to BASIC:
1) FirstUnoContact
2) FirstLoadComponent
3) HelloTextTableShape
More details can be found in the LibreOffice DevGuide:
LibreOffice Developer's Guide: Chapter 1 - First Steps
https://wiki.documentfoundation.org/Documentation/DevGuide/First_Steps
Change-Id: I577ad81d76cec06102f00b2646b004caa5f7b401
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156976
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.bas
b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.bas
new file mode 100644
index ..e11b91b23596
--- /dev/null
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.bas
@@ -0,0 +1,41 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Sub Main
+desktop = createUnoService("com.sun.star.frame.Desktop")
+Dim args()
+spreadsheet_component =
desktop.loadComponentFromURL("private:factory/scalc", "_blank", 0, args())
+
+spreadsheets = spreadsheet_component.getSheets()
+spreadsheets.insertNewByName("MySheet", 0)
+elem_type = spreadsheets.getElementType()
+Msgbox(elem_type.Name)
+sheet = spreadsheets.getByName("MySheet")
+cell = sheet.getCellByPosition(0, 0)
+cell.setValue(21)
+cell = sheet.getCellByPosition(0, 1)
+cell.setValue(21)
+cell = sheet.getCellByPosition(0, 2)
+cell.setFormula("=sum(A1:A2)")
+
+cell.setPropertyValue("CellStyle", "Result")
+
+spreadsheet_controller = spreadsheet_component.getCurrentController()
+spreadsheet_controller.setActiveSheet(sheet)
+cell.setPropertyValue("VertJustify",
"com.sun.star.table.CellVertJustify.TOP")
+formula_cells =
sheet.queryContentCells(com.sun.star.sheet.CellFlags.FORMULA)
+formulas = formula_cells.getCells()
+formula_enum = formulas.createEnumeration()
+
+Do while formula_enum.hasMoreElements()
+formula_cell = formula_enum.nextElement()
+Msgbox("Formula cell in column " +
formula_cell.getCellAddress().Column + _
+ ", row " + formula_cell.getCellAddress().Row + _
+ " contains " + cell.getFormula())
+Loop
+End Sub
diff --git a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact.bas
b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact.bas
new file mode 100644
index ..ba8f542d834e
--- /dev/null
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact.bas
@@ -0,0 +1,17 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Sub Main
+Set oContext = GetDefaultContext()
+MsgBox "Connected to a running office..."
+Set oServiceManager=oContext.GetServiceManager()
+If IsNull(oServiceManager) Then
+bAvailable = "not "
+End If
+MsgBox "ServiceManager is " + bAvailable + "available"
+End Sub
\ No newline at end of file
diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.bas
b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.bas
new file mode 100644
index ..96d75a445fac
--- /dev/null
+++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.bas
@@ -0,0 +1,223 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Function new_doc_component(doc_type As String)
+load_url = "private:factory/" & doc_type
+desktop = createUnoService("com.sun.star.frame.Desktop")
+Set new_doc_component = desktop.loadComponentFromURL(load_url, "_blank",
0, Array())
+End Function
+
+Sub use_documents
+use_writer()
+use_calc()
+use_draw()
+End Sub
+
+Sub use_writer
+Set doc = new_doc_component("swriter")
+Set xtext = doc.Text
+manipulateText(xtext)
+
+' insert TextTable and get cell text, then manipulate text in cell
+Set tabl
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cec2cc2398040260fcf00f453613d5ba5e9ee418 Author: Andras Timar AuthorDate: Sat Sep 16 14:46:22 2023 +0200 Commit: Andras Timar CommitDate: Sat Sep 16 14:46:22 2023 +0200 Bump version to 7.4.7.2.M2 Change-Id: Ie2a6e31318ce7f93012c53fbfb2638b0fe40068e diff --git a/configure.ac b/configure.ac index 1be46b742c82..0ac03452d8cb 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.4.7.2.M1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.4.7.2.M2],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
Re: #tdf51510: Change the DPI to get better resolution, but failed the unit test
Hi,
On Tue, Sep 12, 2023 at 6:23 AM Lodev wrote:
>
> Hi,
>
> Following sos' suggestion, we tried to get Image Preferred DPI from file
> properties. We thought to use this value directly to draw bitmap. After
> asking the last question we found a sample in sfx2/source/dialog/dinfdlg.cxx
> to get this property value. So we added the following code to get the DPI:
>
>
>/* get Image Preferred DPI from File/Properties. User can specify
> DPI they wanted
> * to exported. */
>SfxObjectShell* pDocSh = SfxObjectShell::Current();
>sal_Int32 nImagePreferredDPI = 0;
>if (pDocSh)
>{
>try
>{
>uno::Reference< lang::XMultiServiceFactory > xFac(
> pDocSh->GetModel(), uno::
> UNO_QUERY_THROW );
>uno::Reference< beans::XPropertySet > xProps(
> xFac->createInstance("com.sun.
> star.document.Settings"), uno::UNO_QUERY_THROW );
>xProps->getPropertyValue("ImagePreferredDPI") >>=
> nImagePreferredDPI;
>}
>catch( uno::Exception& )
>{
>}
>}
>
> then sent the nImagePreferredDPI to generate the bitmap. It worked! At
> least we can use designated DPI to get a better bitmap quality.
>
> Then when we tried to patch it to latest libreoffice.core and compile it, it
> failed to link:
>
> /usr/bin/ld:
> /home/lodev/git/libreoffice.core/workdir/CxxObject/vcl/source/gdi/vectorgraphicdata.o:
> in function
> `convertPrimitive2DSequenceToBitmapEx(std::deque,
>
> std::allocator
> > > const&, basegfx::B2DRange const&, unsigned int, o3tl::Length,
> std::optional const&)':
> vectorgraphicdata.cxx:(.text+0x226d): undefined reference to
> `SfxObjectShell::Current()'
> /usr/bin/ld: vectorgraphicdata.cxx:(.text+0x228f): undefined reference to
> `SfxObjectShell::GetModel() const'
> collect2: error: ld returned 1 exit status
> make[1]: ***
> [/home/lodev/git/libreoffice.core/vcl/Library_vcl.mk:20：/home/lodev/git/libreoffice.core/instdir/program/libvcllo.so]
> 錯誤 1
>
> We thought that the time we succeeded should be because the related objects
> (sfx2) had been there when we tried, so it could compiled and linked
> successfully. This time we did it from starting so it failed because the
> object files were no longer there, and we have no idea how to make sfx
> objects compile first.
>
> So again we're stuck. We did prove the idea, using Image Preferred DPI to
> generate better bitmap, works. User can specify a bigger DPI there to get
> better bitmap resolutions after exporting to OOXML. Just that maybe we
> shouldn't use sfx object to get the property. But we have no idea how to get
> the property value since we're not very familiar with the reference things.
>
> Would anyone please give a little help and hints here?
You're looking at the wrong place. Forget "ImagePreferredDPI" for now
- this will get relevant once you already have a working solution. The
place that is relevant for this is in oox module - more specifically
in the drawingml export [1]. The GraphicExport::writeToStorage is very
relevant as this is where the call to convert the graphic is made. So
this needs changing and you need to find where the document dimensions
for the image are and transport that all the way to
GraphicExport::writeToStorage. For writer also
DocxAttributeOutput::FlyFrameGraphic is relevant (in sw module) and
maybe some other cases also, for Impress and Calc something else might
be relevant too.
[1] oox/source/export/drawingml.cxx
> Thanks, Dev
Tomaž
