[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgtoken.cxx | 264 ++--
svgio/source/svguno/svguno.cxx |2
2 files changed, 133 insertions(+), 133 deletions(-)
New commits:
commit 5b2f04d2f864ea0ef5d0c28d2891d87f1545b9d5
Author: Stephan Bergmann
AuthorDate: Thu Jul 2 07:14:20 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 08:49:29 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: svgio
Change-Id: I7373cec6d8d03e5fc0ac30b54e5b5077232c2f83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97694
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svgio/source/svgreader/svgtoken.cxx
b/svgio/source/svgreader/svgtoken.cxx
index 78c35888ac3e..3bb517d42021 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -22,146 +22,146 @@
namespace svgio::svgreader
{
-static const char aSVGStrWidth[] = "width";
-static const char aSVGStrHeight[] = "height";
-static const char aSVGStrViewBox[] = "viewBox";
-static const char aSVGStrTransform[] = "transform";
-static const char aSVGStrStyle[] = "style";
-static const char aSVGStrDisplay[] = "display"; // #i121656#
-static const char aSVGStrD[] = "d";
-static const char aSVGStrX[] = "x";
-static const char aSVGStrY[] = "y";
-static const char aSVGStrXmlns[] = "xmlns";
-static const char aSVGStrVersion[] = "version";
-static const char aSVGStrId[] = "id";
-static const char aSVGStrRx[] = "rx";
-static const char aSVGStrRy[] = "ry";
-static const char aSVGStrPoints[] = "points";
-static const char aSVGStrDx[] = "dx";
-static const char aSVGStrDy[] = "dy";
-static const char aSVGStrRotate[] = "rotate";
-static const char aSVGStrTextLength[] = "textLength";
-static const char aSVGStrLengthAdjust[] = "lengthAdjust";
-static const char aSVGStrFont[] = "font";
-static const char aSVGStrFontFamily[] = "font-family";
-static const char aSVGStrFontSize[] = "font-size";
-static const char aSVGStrFontSizeAdjust[] = "font-size-adjust";
-static const char aSVGStrFontStretch[] = "font-stretch";
-static const char aSVGStrFontStyle[] = "font-style";
-static const char aSVGStrFontVariant[] = "font-variant";
-static const char aSVGStrFontWeight[] = "font-weight";
-static const char aSVGStrDirection[] = "direction";
-static const char aSVGStrLetterSpacing[] = "letter-spacing";
-static const char aSVGStrTextDecoration[] = "text-decoration";
-static const char aSVGStrUnicodeBidi[] = "unicode-bidi";
-static const char aSVGStrWordSpacing[] = "word-spacing";
-static const char aSVGStrTspan[] = "tspan";
-static const char aSVGStrTref[] = "tref";
-static const char aSVGStrTextPath[] = "textPath";
-static const char aSVGStrStartOffset[] = "startOffset";
-static const char aSVGStrMethod[] = "method";
-static const char aSVGStrSpacing[] = "spacing";
-static const char aSVGStrTextAlign[] = "text-align";
-static const char aSVGStrPathLength[] = "pathLength";
-static const char aSVGStrType[] = "type";
-static const char aSVGStrClass[] = "class";
-static const char aSVGStrTextAnchor[] = "text-anchor";
-static const char aSVGStrXmlSpace[] = "xml:space";
-static const char aSVGStrColor[] = "color";
-static const char aSVGStrClipPathNode[] = "clipPath";
-static const char aSVGStrClipPathProperty[] = "clip-path";
-static const char aSVGStrMask[] = "mask";
-static const char aSVGStrClipPathUnits[] = "clipPathUnits";
-static const char aSVGStrMaskUnits[] = "maskUnits";
-static const char aSVGStrMaskContentUnits[] = "maskContentUnits";
-static const char aSVGStrClipRule[] = "clip-rule";
-static const char aSVGStrMarker[] = "marker";
-static const char aSVGStrMarkerStart[] = "marker-start";
-static const char aSVGStrMarkerMid[] = "marker-mid";
-static const char aSVGStrMarkerEnd[] = "marker-end";
-static const char aSVGStrRefX[] = "refX";
-static const char aSVGStrRefY[] = "refY";
-static const char aSVGStrMarkerUnits[] = "markerUnits";
-static const char aSVGStrMarkerWidth[] = "markerWidth";
-static const char aSVGStrMarkerHeight[] = "markerHeight";
-static const char aSVGStrOrient[] = "orient";
-static const char aSVGStrPattern[] = "pattern";
-static const char aSVGStrPatternUnits[] = "patternUnits";
-static const char aSVGStrPatternContentUnits[] = "patternContentUnits";
-static const char aSVGStrPatternTransform[] = "patternTransform";
-static const char aSVGStrOpacity[] = "opacity";
-static const char aSVGStrVisibility[] =
[Libreoffice-commits] core.git: svtools/source
svtools/source/config/colorcfg.cxx |2 +-
svtools/source/config/printoptions.cxx |2 +-
svtools/source/control/ctrltool.cxx|2 +-
svtools/source/control/ruler.cxx |2 +-
svtools/source/java/javainteractionhandler.cxx |2 +-
svtools/source/misc/imagemgr.cxx |4 ++--
svtools/source/svhtml/htmlkywd.cxx |4 ++--
svtools/source/svhtml/htmlsupp.cxx |2 +-
svtools/source/svhtml/parhtml.cxx |8
svtools/source/uno/miscservices.cxx|2 +-
svtools/source/uno/unoevent.cxx| 14 +++---
11 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 770ca016b9301cc02beab345f02c085e27f52e71
Author: Stephan Bergmann
AuthorDate: Thu Jul 2 07:16:17 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 08:46:13 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: svtools
Change-Id: I947b8def12bf27093dc9ad95077c0718dec959a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97696
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index d2973a1d96a1..abd6952e4783 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -42,7 +42,7 @@
using namespace utl;
using namespace com::sun::star;
-static const char g_sIsVisible[] = "/IsVisible";
+const char g_sIsVisible[] = "/IsVisible";
namespace svtools
diff --git a/svtools/source/config/printoptions.cxx
b/svtools/source/config/printoptions.cxx
index bb08bb3198f3..d0e7db9e04b0 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -34,7 +34,7 @@
#include
#include
-static const sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
+const sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
#define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
diff --git a/svtools/source/control/ctrltool.cxx
b/svtools/source/control/ctrltool.cxx
index cdd1aed8a6db..03599d2114a2 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -792,7 +792,7 @@ struct ImplFSNameItem
const char* mszUtf8Name;
};
-static const ImplFSNameItem aImplSimplifiedChinese[] =
+const ImplFSNameItem aImplSimplifiedChinese[] =
{
{ 50, "\xe5\x85\xab\xe5\x8f\xb7" },
{ 55, "\xe4\xb8\x83\xe5\x8f\xb7" },
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 8608adc3b7fc..ce62c133ff3c 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -143,7 +143,7 @@ ImplRulerData::ImplRulerData() :
{
}
-static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
+const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
{
{ MapUnit::Map100thMM,100,25.0,25.0, 50.0,100.0, "
mm"}, // MM
{ MapUnit::Map100thMM, 1000, 100.0, 500.0, 1000.0, 1000.0, "
cm"}, // CM
diff --git a/svtools/source/java/javainteractionhandler.cxx
b/svtools/source/java/javainteractionhandler.cxx
index 9dff4a57e07a..e484eb56a0ac 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::task;
namespace
{
-static struct JavaEvents {
+struct JavaEvents {
bool bDisabledHandled : 1;
bool bInvalidSettingsHandled : 1;
bool bNotFoundHandled : 1;
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 3f458647564c..665958fa33d7 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -55,7 +55,7 @@ struct SvtExtensionResIdMapping_Impl
}
-static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
+SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
{
{ "awk", true, STR_DESCRIPTION_SOURCEFILE,SvImageId::NONE },
{ "bas", true, STR_DESCRIPTION_SOURCEFILE,SvImageId::NONE },
@@ -182,7 +182,7 @@ struct SvtFactory2ExtensionMapping_Impl
// mapping from "private:factory" url to extension
-static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] =
+SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] =
{
{ "swriter","odt" },
{ "swriter/web","html" },
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 70bc2ebe49c7..5cdbfe242dc8 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -59,7 +59,7 @@ static T search(TokenEntry const (&dataTable)[LEN], const
OUString & key, T n
using HTML_TokenEntry = TokenEntry;
// this array is sorted by the name (even if it doesn't look like it from the
constant names)
-static HTML_TokenEntry const aHTMLTokenTab[] = {
+HTML_TokenEntry const aHTMLTokenTab[] = {
{OUStringLi
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - solenv/sanitizers svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source
solenv/sanitizers/ui/svx.suppr |9
svx/UIConfig_svx.mk |1
svx/source/dialog/srchdlg.cxx |8
svx/uiconfig/ui/findreplacedialog-mobile.ui | 1148
vcl/source/window/builder.cxx |3
5 files changed, 1167 insertions(+), 2 deletions(-)
New commits:
commit b2e6efec050be0965bc15f402ea6e30cf3c3d5fc
Author: Szymon Kłos
AuthorDate: Mon Mar 2 09:32:27 2020 +0100
Commit: Szymon Kłos
CommitDate: Thu Jul 2 08:23:00 2020 +0200
Add mobile version of find replace dialog
Change-Id: If651f84b97a1ed6b08b9f4eb56ce95fe659cddf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97606
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 5b9e46a74810..2f4f39d21078 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -31,6 +31,15 @@
svx/uiconfig/ui/findreplacedialog.ui://GtkComboBoxText[@id='calcsearchin'] no-la
svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdir'] orphan-label
svx/uiconfig/ui/floatingcontour.ui://GtkLabel[@id='statuspos'] orphan-label
svx/uiconfig/ui/floatingcontour.ui://GtkLabel[@id='statussize'] orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='label4']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='searchdesc']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='entirecells']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='label5']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='replacedesc']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='label7']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='searchinlabel']
orphan-label
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkComboBoxText[@id='calcsearchin']
no-labelled-by
+svx/uiconfig/ui/findreplacedialog-mobile.ui://GtkLabel[@id='searchdir']
orphan-label
svx/uiconfig/ui/fontworkgallerydialog.ui://GtkLabel[@id='label1'] orphan-label
svx/uiconfig/ui/headfootformatpage.ui://GtkLabel[@id='labelHeaderFormat']
orphan-label
svx/uiconfig/ui/headfootformatpage.ui://GtkLabel[@id='labelFooterFormat']
orphan-label
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index c2a7428ee582..ab701884332a 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/filtermenu \
svx/uiconfig/ui/findreplacedialog \
+ svx/uiconfig/ui/findreplacedialog-mobile \
svx/uiconfig/ui/floatingareastyle \
svx/uiconfig/ui/floatingcontour \
svx/uiconfig/ui/floatinglineproperty \
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6d98fd4ad8df..bdd213b804a8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -70,6 +70,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -83,6 +85,9 @@ using namespace com::sun::star::accessibility;
using namespace com::sun::star;
using namespace comphelper;
+
+#define IS_MOBILE (comphelper::LibreOfficeKit::isActive() &&
SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone())
+
enum class ModifyFlags {
NONE = 0x00,
Search = 0x01,
@@ -255,7 +260,8 @@ void SearchAttrItemList::Remove(size_t nPos)
SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, SfxChildWindow*
pChildWin, SfxBindings& rBind)
: SfxModelessDialogController(&rBind, pChildWin, pParent,
- "svx/ui/findreplacedialog.ui",
"FindReplaceDialog")
+ IS_MOBILE ?
OUString("svx/ui/findreplacedialog-mobile.ui") :
OUString("svx/ui/findreplacedialog.ui"),
+ "FindReplaceDialog")
, rBindings(rBind)
, bWriter(false)
, bSearch(true)
diff --git a/svx/uiconfig/ui/findreplacedialog-mobile.ui
b/svx/uiconfig/ui/findreplacedialog-mobile.ui
new file mode 100644
index ..a7284b125179
--- /dev/null
+++ b/svx/uiconfig/ui/findreplacedialog-mobile.ui
@@ -0,0 +1,1148 @@
+
+
+
+
+
+False
+6
+Find & Replace
+False
+0
+0
+dialog
+
+
+
+
+
+False
+vertical
+6
+
+
+False
+end
+
+
+gtk-help
+False
+True
+True
+True
+
+
+False
+True
+1
+True
+
+
+
+
+gtk-close
+False
+True
+True
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/source vcl/source
sw/source/uibase/dialog/watermarkdialog.cxx | 12
vcl/source/window/builder.cxx |3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 2db1de7dd1b460ace3fe39bd8de8017bd48b00ff
Author: Szymon Kłos
AuthorDate: Tue Mar 10 16:23:51 2020 +0100
Commit: Szymon Kłos
CommitDate: Thu Jul 2 08:23:30 2020 +0200
jsdialog: enable watermark dialog
Change-Id: I4badd0d2f6c9c0d2828152685aa14c2e1d358fea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97623
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx
b/sw/source/uibase/dialog/watermarkdialog.cxx
index 09ac8ed94c70..19ee4ad78009 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -20,6 +20,10 @@
#include
#include
#include
+#include
+#include
+
+#define IS_MOBILE (comphelper::LibreOfficeKit::isActive() &&
SfxViewShell::Current() && SfxViewShell::Current()->isLOKMobilePhone())
SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent, SfxBindings&
rBindings)
: SfxDialogController(pParent, "modules/swriter/ui/watermarkdialog.ui",
"WatermarkDialog")
@@ -32,6 +36,14 @@ SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent,
SfxBindings& rBindin
, m_xColor(new ColorListBox(m_xBuilder->weld_menu_button("Color"),
m_xDialog.get()))
{
InitFields();
+
+if (IS_MOBILE)
+{
+m_xBuilder->weld_label("ColorLabel")->hide();
+m_xColor->hide();
+m_xBuilder->weld_button("cancel")->hide();
+m_xBuilder->weld_button("help")->hide();
+}
}
SwWatermarkDialog::~SwWatermarkDialog()
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a840305bc4fe..6cc2c91d137c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -156,7 +156,8 @@ weld::Builder* Application::CreateBuilder(weld::Widget*
pParent, const OUString
if (bMobile)
{
if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui" ||
-rUIFile == "svx/ui/findreplacedialog-mobile.ui")
+rUIFile == "svx/ui/findreplacedialog-mobile.ui" ||
+rUIFile == "modules/swriter/ui/watermarkdialog.ui")
bUseJSBuilder = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/source
include/vcl/combobox.hxx|3 +++
vcl/source/control/combobox.cxx | 29 +
2 files changed, 32 insertions(+)
New commits:
commit 22c336d2f2b92a0ce00c292fe76bb4b494c31cc3
Author: Szymon Kłos
AuthorDate: Tue Feb 25 13:01:20 2020 +0100
Commit: Szymon Kłos
CommitDate: Thu Jul 2 08:22:08 2020 +0200
jsdialog: export combobox entries
Change-Id: Ic0a3c93020c7c915fd908fe994ec0a3a900358eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97625
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 1cd67d70a10d..83f8beef71e9 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#define COMBOBOX_APPEND (SAL_MAX_INT32)
#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32)
@@ -183,6 +184,8 @@ public:
virtual bool set_property(const OString &rKey, const OUString &rValue)
override;
virtual FactoryFunction GetUITestFactory() const override;
+
+virtual boost::property_tree::ptree DumpAsPropertyTree() override;
};
#endif // _COMBOBOX_HXX
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a7618222b517..45f6e78b5569 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1555,4 +1555,33 @@ FactoryFunction ComboBox::GetUITestFactory() const
return ComboBoxUIObject::create;
}
+boost::property_tree::ptree ComboBox::DumpAsPropertyTree()
+{
+boost::property_tree::ptree aTree(Control::DumpAsPropertyTree());
+boost::property_tree::ptree aEntries;
+
+for (int i = 0; i < GetEntryCount(); ++i)
+{
+boost::property_tree::ptree aEntry;
+aEntry.put("", GetEntry(i));
+aEntries.push_back(std::make_pair("", aEntry));
+}
+
+aTree.add_child("entries", aEntries);
+
+boost::property_tree::ptree aSelected;
+
+for (int i = 0; i < GetSelectedEntryCount(); ++i)
+{
+boost::property_tree::ptree aEntry;
+aEntry.put("", GetSelectedEntryPos(i));
+aSelected.push_back(std::make_pair("", aEntry));
+}
+
+aTree.put("selectedCount", GetSelectedEntryCount());
+aTree.add_child("selectedEntries", aSelected);
+
+return aTree;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source include/vcl
desktop/source/lib/init.cxx | 14 ++
include/vcl/weld.hxx|3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit db9744e527fad959418d3a21f3295acc863b20d9
Author: Szymon Kłos
AuthorDate: Wed Jul 1 14:49:03 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 2 08:21:50 2020 +0200
jsdialog: execute entry set test
Change-Id: I9e7d7da0bc0b6494b59270c683ae4a18d927bf4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97624
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 29439f85912c..93412fbc6473 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3758,6 +3758,20 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument*
/*pThis*/, unsigned long
bContinueWithLOKWindow = true;
}
}
+else if (sControlType == "edit")
+{
+auto pEdit = dynamic_cast(pWidget);
+if (pEdit)
+{
+if (sAction == "change")
+{
+pEdit->set_text(aMap["data"]);
+pEdit->signal_changed();
+}
+else
+bContinueWithLOKWindow = true;
+}
+}
else
{
bContinueWithLOKWindow = true;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7905a286e24c..4dfbeb9317bc 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1265,11 +1265,12 @@ protected:
Link m_aCursorPositionHdl;
Link m_aActivateHdl;
-void signal_changed() { m_aChangeHdl.Call(*this); }
void signal_cursor_position() { m_aCursorPositionHdl.Call(*this); }
void signal_insert_text(OUString& rString);
public:
+void signal_changed() { m_aChangeHdl.Call(*this); }
+
virtual void set_text(const OUString& rText) = 0;
virtual OUString get_text() const = 0;
virtual void set_width_chars(int nChars) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source
sfx2/source/sidebar/PanelLayout.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ee8229381a73210856ef2f54f035b70d9c5c7207
Author: Jan-Marek Glogowski
AuthorDate: Wed Jul 1 23:26:59 2020 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Jul 2 08:22:03 2020 +0200
Fix PanelLayout Task::SetPriority warning
SetStyle will tigger a resize event, which in turn will start the
m_aPanelLayoutIdle, before it's actually prepared, resulting in
the Task::SetPriority SAL_WARN_IF triggering.
Change-Id: Ide48d6004e242cf75bb48dc9f5e8dc3aa5ff809b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97664
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit fc8cf3afa29909a6c37beaf8021c531ae12773da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97671
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/sfx2/source/sidebar/PanelLayout.cxx
b/sfx2/source/sidebar/PanelLayout.cxx
index e4cf889b02ff..6a333819274b 100644
--- a/sfx2/source/sidebar/PanelLayout.cxx
+++ b/sfx2/source/sidebar/PanelLayout.cxx
@@ -21,11 +21,12 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const
OString& rID, const OUStrin
, m_bInClose(false)
, mxFrame(rFrame)
{
-SetStyle(GetStyle() | WB_DIALOGCONTROL);
m_aPanelLayoutIdle.SetPriority(TaskPriority::RESIZE);
m_aPanelLayoutIdle.SetInvokeHandler( LINK( this, PanelLayout,
ImplHandlePanelLayoutTimerHdl ) );
m_aPanelLayoutIdle.SetDebugName("sfx2::PanelLayout m_aPanelLayoutIdle");
+SetStyle(GetStyle() | WB_DIALOGCONTROL);
+
// Builder will trigger resize and start Idle
m_xVclContentArea = VclPtr::Create(this);
m_xVclContentArea->Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/vcl sfx2/source vcl/inc vcl/Library_vcl.mk vcl/source
include/sfx2/notebookbar/SfxNotebookBar.hxx|4 +
include/vcl/WeldedTabbedNotebookbar.hxx| 34 ++
include/vcl/notebookbar.hxx| 10 +++
sfx2/source/notebookbar/SfxNotebookBar.cxx | 30 ++---
vcl/Library_vcl.mk |1
vcl/inc/salvtables.hxx |3
vcl/source/control/WeldedTabbedNotebookbar.cxx | 25 +++
vcl/source/control/notebookbar.cxx | 79 ++---
8 files changed, 154 insertions(+), 32 deletions(-)
New commits:
commit 699a31ec958a8fdc3ccf4a021298dd7c1c6ee714
Author: Szymon Kłos
AuthorDate: Fri Jun 5 06:42:45 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 2 08:21:10 2020 +0200
notebookbar: build using weld::Builder
and provide welded implementation for writer tabbed
Change-Id: Id6c71234cb1f40fd3889555785fcdbe84b801edd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96917
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97517
Tested-by: Jenkins
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 1a3babd53d9e..4fbda295cace 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -19,6 +19,7 @@ namespace com::sun::star::uno { template class
Reference; }
class SfxBindings;
class SfxViewFrame;
class SystemWindow;
+class WeldedTabbedNotebookbar;
namespace sfx2 {
@@ -59,6 +60,9 @@ public:
private:
static bool m_bLock;
static bool m_bHide;
+static std::unique_ptr
m_pNotebookBarWeldedWrapper;
+
+DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const void*, void);
};
} // namespace sfx2
diff --git a/include/vcl/WeldedTabbedNotebookbar.hxx
b/include/vcl/WeldedTabbedNotebookbar.hxx
new file mode 100644
index ..b6d29e846ac1
--- /dev/null
+++ b/include/vcl/WeldedTabbedNotebookbar.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_SFX2_NOTEBOOKBAR_WRITERTABBEDNOTEBOOKBAR_HXX
+#define INCLUDED_SFX2_NOTEBOOKBAR_WRITERTABBEDNOTEBOOKBAR_HXX
+
+#include
+#include
+#include
+#include
+
+/** Tabbed implementation of NotebookBar for Writer
+*/
+class VCL_DLLPUBLIC WeldedTabbedNotebookbar
+{
+std::unique_ptr m_xBuilder;
+
+std::unique_ptr m_xContainer;
+std::unique_ptr m_xNotebook;
+
+public:
+WeldedTabbedNotebookbar(VclPtr& pContainerWindow, const
OUString& rUIFilePath,
+const css::uno::Reference&
rFrame);
+};
+
+#endif // INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index bfa75d68039f..5086b263c6ab 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -47,6 +47,11 @@ public:
void ControlListenerForCurrentController(bool bListen);
void StopListeningAllControllers();
+bool IsWelded() { return m_bIsWelded; }
+VclPtr& GetMainContainer() { return m_xVclContentArea; }
+OUString GetUIFilePath() { return m_sUIXMLDescription; }
+void SetDisposeCallback(const Link rDisposeCallback);
+
private:
VclPtr m_pSystemWindow;
css::uno::Reference m_pEventListener;
@@ -54,6 +59,11 @@ private:
std::vector m_pContextContainers;
css::uno::Reference mxFrame;
+VclPtr m_xVclContentArea;
+bool m_bIsWelded;
+OUString m_sUIXMLDescription;
+Link m_rDisposeLink;
+
AllSettings DefaultSettings;
AllSettings PersonaSettings;
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 3a943c28f6fb..78a8d0edc4bf 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -29,6 +29,8 @@
#include
#include
#include
+#include
+
using namespace sfx2;
using namespace css::uno;
using namespace css::ui;
@@ -41,6 +43,7 @@ const char MERGE_NOTEBOOKBAR_IMAGEID[] = "ImageIdentifier";
bool SfxNotebookBar::m_bLock = false;
bool SfxNotebookBar::m_bHide = false;
+std::unique_ptr
SfxNotebookBar::m_pNotebookBarWeldedWrapper;
static void NotebookbarAddonValues(
std::vector& aImageValues,
@@ -355,18 +358,9 @@ bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
OUString sCurrentFile;
VclPtr pNotebookBar = pSysWindow->GetNotebookBar();
if ( pNotebookBar )
-sCurrentFile = OStringToOUString( pNotebookBar->getUIFile(),
RTL_TEXTENCODING_ASCII_US );
-
-bool bChangedFile = true;
-
[Libreoffice-commits] core.git: starmath/source
starmath/source/dialog.cxx |2 +-
starmath/source/mathmlimport.cxx |2 +-
starmath/source/parse.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 111b05e412f278037b3c1a852b4ab6d9fca461f9
Author: Stephan Bergmann
AuthorDate: Thu Jul 2 07:12:33 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 08:19:41 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: starmath
Change-Id: I755e3bef5be3df25b4f1f5887d9b0d2addf13ccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97692
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 77fc823ba17c..6a2c9e628525 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -545,7 +545,7 @@ struct FieldMinMax
// Data for min and max values of the 4 metric fields
// for each of the 10 categories
-static const FieldMinMax pMinMaxData[10][4] =
+const FieldMinMax pMinMaxData[10][4] =
{
// 0
{{ 0, 200 },{ 0, 200 }, { 0, 100 }, { 0, 0 }},
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 6ae00afbb92e..b7db6414657f 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1977,7 +1977,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
SmXMLFlatDocContext_Imp
}
}
-static const SvXMLTokenMapEntry aColorTokenMap[] =
+const SvXMLTokenMapEntry aColorTokenMap[] =
{
{ XML_NAMESPACE_MATH, XML_BLACK,TBLACK},
{ XML_NAMESPACE_MATH, XML_WHITE,TWHITE},
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 67512e4a44eb..fd9bdfec262e 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -65,7 +65,7 @@ SmToken::SmToken(SmTokenType eTokenType,
}
//Definition of math keywords
-static const SmTokenTableEntry aTokenTable[] =
+const SmTokenTableEntry aTokenTable[] =
{
{ "abs", TABS, '\0', TG::UnOper, 13 },
{ "acute", TACUTE, MS_ACUTE, TG::Attribute, 5 },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: stoc/source
stoc/source/corereflection/crbase.cxx |2 -
stoc/source/implementationregistration/implreg.cxx | 22 ++--
stoc/source/invocation/invocation.cxx |2 -
stoc/source/invocation_adapterfactory/iafactory.cxx |2 -
stoc/source/javaloader/javaloader.cxx |2 -
stoc/source/namingservice/namingservice.cxx |2 -
stoc/source/proxy_factory/proxyfac.cxx |2 -
stoc/source/security/access_controller.cxx |2 -
8 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 45898370bcf0dfb8bd303dc0922ebae604d59224
Author: Stephan Bergmann
AuthorDate: Thu Jul 2 07:13:23 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 08:10:25 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: stoc
Change-Id: I993e4c0aef41b0925678d7744a989ad5539cc80e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/stoc/source/corereflection/crbase.cxx
b/stoc/source/corereflection/crbase.cxx
index c179324050c4..75e802c96045 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -93,7 +93,7 @@ sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >&
xType )
(xType->getTypeClass() == _eTypeClass) && (xType->getName() ==
_aName));
}
-static const bool s_aAssignableFromTab[11][11] =
+const bool s_aAssignableFromTab[11][11] =
{
/* from CH,BO,BY,SH,US,LO,
UL,HY,UH,FL,DO */
/* TypeClass_CHAR */{ true, false, false, false, false, false,
false, false, false, false, false },
diff --git a/stoc/source/implementationregistration/implreg.cxx
b/stoc/source/implementationregistration/implreg.cxx
index dc21f55663c3..0d9cfb80ffda 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -56,27 +56,27 @@ using namespace osl;
namespace {
-static constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
+constexpr OUStringLiteral slash_UNO_slash_REGISTRY_LINKS
= "/UNO/REGISTRY_LINKS";
-static constexpr OUStringLiteral slash_IMPLEMENTATIONS
+constexpr OUStringLiteral slash_IMPLEMENTATIONS
= "/IMPLEMENTATIONS";
-static constexpr OUStringLiteral slash_UNO
+constexpr OUStringLiteral slash_UNO
= "/UNO";
-static constexpr OUStringLiteral slash_UNO_slash_SERVICES
+constexpr OUStringLiteral slash_UNO_slash_SERVICES
= "/UNO/SERVICES";
-static constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
+constexpr OUStringLiteral slash_UNO_slash_SINGLETONS
= "/UNO/SINGLETONS";
-static constexpr OUStringLiteral slash_SERVICES
+constexpr OUStringLiteral slash_SERVICES
= "/SERVICES/";
-static constexpr OUStringLiteral slash_UNO_slash_LOCATION
+constexpr OUStringLiteral slash_UNO_slash_LOCATION
= "/UNO/LOCATION";
-static constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
+constexpr OUStringLiteral slash_UNO_slash_ACTIVATOR
= "/UNO/ACTIVATOR";
-static constexpr OUStringLiteral colon_old
+constexpr OUStringLiteral colon_old
= ":old";
-static constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
+constexpr OUStringLiteral com_sun_star_registry_SimpleRegistry
= "com.sun.star.registry.SimpleRegistry";
-static constexpr OUStringLiteral Registry
+constexpr OUStringLiteral Registry
= "Registry";
// static deleteAllLinkReferences()
diff --git a/stoc/source/invocation/invocation.cxx
b/stoc/source/invocation/invocation.cxx
index 8027442aa9b2..c2fb1d0d280f 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1109,7 +1109,7 @@ static Reference
InvocationService_CreateInstance( const Reference FactoryImpl_create(
}
-static const struct ::cppu::ImplementationEntry g_entries[] =
+const struct ::cppu::ImplementationEntry g_entries[] =
{
{
::stoc_invadp::FactoryImpl_create,
diff --git a/stoc/source/javaloader/javaloader.cxx
b/stoc/source/javaloader/javaloader.cxx
index d6f77cd2be1d..191703b103c0 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -350,7 +350,7 @@ static css::uno::Reference
JavaComponentLoader_CreateInstance(const
using namespace stoc_javaloader;
-static const struct ImplementationEntry g_entries[] =
+const struct ImplementationEntry g_entries[] =
{
{
JavaComponentLoader_CreateInstance, loader_getImplementationName,
diff --git a/stoc/source/namingservice/namingservice.cxx
b/stoc/source/namingservice/namingservice.cxx
index b58212e2c176..cfecc0a7c795 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -134,7 +134,7 @@ void NamingService_Impl::revokeObject( const OUString& Name
)
}
using namespace stoc_namingservice;
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/transitions/transitionfactorytab.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f9766129b660193a886be36b74f4ca438047c778
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 23:47:40 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 07:10:48 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: slideshow
Change-Id: If1edbfd2da7082cb5c03dda8c3c1a7af6de6da53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97666
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx
b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 6ec5a57f56aa..6a22fdd0a4c9 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -33,7 +33,7 @@ namespace slideshow::internal {
namespace {
-static const TransitionInfo lcl_transitionInfo[] =
+const TransitionInfo lcl_transitionInfo[] =
{
{
0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/backends/desktopbe/desktopbackend.cxx |2 +-
shell/source/backends/kf5be/kf5backend.cxx |2 +-
shell/source/backends/localebe/localebecdef.cxx|2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b0a21fb21f7a3ce4aca2db1eaa839e4b6fc5ed6d
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 23:46:41 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 07:10:24 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: shell
Change-Id: Ieb0abded6050cdb8a179ea1558bd17fa14ebb64b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97665
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx
b/shell/source/backends/desktopbe/desktopbackend.cxx
index 5f024f0679e8..92cb062d2496 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -303,7 +303,7 @@ css::uno::Reference< css::uno::XInterface > createInstance(
? backend : static_cast< cppu::OWeakObject * >(new Default);
}
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{ &createInstance, &getDefaultImplementationName,
&getDefaultSupportedServiceNames, &cppu::createSingleComponentFactory,
nullptr,
0 },
diff --git a/shell/source/backends/kf5be/kf5backend.cxx
b/shell/source/backends/kf5be/kf5backend.cxx
index cb3f382b8cdd..44d0134d394f 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -258,7 +258,7 @@
createInstance(css::uno::Reference const&)
return static_cast(new Service);
}
-static cppu::ImplementationEntry const services[]
+cppu::ImplementationEntry const services[]
= { { &createInstance, &getServiceImplementationName,
&getServiceSupportedServiceNames,
&cppu::createSingleComponentFactory, nullptr, 0 },
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 } };
diff --git a/shell/source/backends/localebe/localebecdef.cxx
b/shell/source/backends/localebe/localebecdef.cxx
index fbbd63690d55..ed6e4c98b699 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -33,7 +33,7 @@ static uno::Reference createLocaleBackend(
}
-static const cppu::ImplementationEntry kImplementations_entries[] =
+const cppu::ImplementationEntry kImplementations_entries[] =
{
{
createLocaleBackend,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sot/source
sot/source/sdstor/stgelem.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d72e9cc0d1a91bf6283dcc5d3d96ae16e7014454
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 23:49:54 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 07:11:15 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sot
Change-Id: I3e751a59eb6d5f95a331627d0fcd776b193b05b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97667
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 43f4faf0251d..ff41d8d70f9c 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -28,9 +28,9 @@
#include "stgelem.hxx"
#include "stgio.hxx"
-static const sal_uInt16 nMaxLegalStr = 31;
+const sal_uInt16 nMaxLegalStr = 31;
-static const sal_uInt8 cStgSignature[ 8 ] = {
0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1 };
+const sal_uInt8 cStgSignature[ 8 ] = { 0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A,0xE1
};
// struct ClsId
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/minimizer/pppoptimizertoken.cxx|2 -
sdext/source/minimizer/pppoptimizeruno.cxx |2 -
sdext/source/pdfimport/pdfparse/pdfentries.cxx |2 -
sdext/source/pdfimport/tree/imagecontainer.cxx |2 -
sdext/source/presenter/PresenterButton.cxx |4 +-
sdext/source/presenter/PresenterComponent.cxx |2 -
sdext/source/presenter/PresenterHelpView.cxx|6 ++--
sdext/source/presenter/PresenterNotesView.cxx |6 ++--
sdext/source/presenter/PresenterScrollBar.cxx |2 -
sdext/source/presenter/PresenterSlideSorter.cxx | 36
sdext/source/presenter/PresenterTextView.cxx|2 -
sdext/source/presenter/PresenterToolBar.cxx |2 -
12 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 434391237010c94d54d89ad7f2ecef3638a772a0
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 21:31:12 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 07:09:33 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sdext
Change-Id: I767b6ca4bc2bfc3623aa2ba502f075bde1347df7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97657
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx
b/sdext/source/minimizer/pppoptimizertoken.cxx
index 255654838880..9a5c2eac9a62 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -42,7 +42,7 @@ struct TokenTable
}
-static const TokenTable pTokenTableArray[] =
+const TokenTable pTokenTableArray[] =
{
{ "rdmNavi",TK_rdmNavi },
{ "btnNavBack", TK_btnNavBack },
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx
b/sdext/source/minimizer/pppoptimizeruno.cxx
index d972ab716060..da8745ef2c71 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -24,7 +24,7 @@
namespace
{
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{ &PPPOptimizerDialog_createInstance,
&PPPOptimizerDialog_getImplementationName,
&PPPOptimizerDialog_getSupportedServiceNames,
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index f8e24addeacb..e7fa4d511982 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1093,7 +1093,7 @@ bool PDFFile::decrypt( const sal_uInt8* pInBuffer,
sal_uInt32 nLen, sal_uInt8* p
return aErr == rtl_Cipher_E_None;
}
-static const sal_uInt8 nPadString[32] =
+const sal_uInt8 nPadString[32] =
{
0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56,
0xFF, 0xFA, 0x01, 0x08,
0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE,
0x64, 0x53, 0x69, 0x7A
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx
b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 2be33dcede42..087849d6b5dc 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -36,7 +36,7 @@ namespace pdfi
namespace
{
-static const char aBase64EncodeTable[] =
+const char aBase64EncodeTable[] =
{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
diff --git a/sdext/source/presenter/PresenterButton.cxx
b/sdext/source/presenter/PresenterButton.cxx
index 6c053a40e2ce..2f1a7767a57d 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -34,8 +34,8 @@ using namespace ::com::sun::star::uno;
namespace sdext::presenter {
-const static double gnHorizontalBorder (15);
-const static double gnVerticalBorder (5);
+const double gnHorizontalBorder (15);
+const double gnVerticalBorder (5);
::rtl::Reference PresenterButton::Create (
const css::uno::Reference& rxComponentContext,
diff --git a/sdext/source/presenter/PresenterComponent.cxx
b/sdext/source/presenter/PresenterComponent.cxx
index 943270928d9e..4d882526002d 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -30,7 +30,7 @@ using namespace osl;
namespace sdext::presenter {
-static const struct ImplementationEntry gServiceEntries[] =
+const struct ImplementationEntry gServiceEntries[] =
{
{
PresenterProtocolHandler::Create,
diff --git a/sdext/source/presenter/PresenterHelpView.cxx
b/sdext/source/presenter/PresenterHelpView.cxx
index 3b7cfc4979b6..18fcb3d3c21b 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -41,9 +41,9 @@ using ::std::vector;
namespace sdext::presenter {
namespace {
-const static sal_Int32 gnHorizontalGap (20);
-const sta
[Libreoffice-commits] core.git: sal/osl sal/qa sal/rtl sal/textenc
sal/osl/unx/nlsupport.cxx |2
sal/osl/unx/pipe.cxx|2
sal/osl/unx/process.cxx |4
sal/osl/unx/socket.cxx | 16
sal/osl/unx/tempfile.cxx|4
sal/osl/unx/thread.cxx |2
sal/qa/OStringBuffer/rtl_String_Const.h | 598
sal/rtl/bootstrap.cxx |2
sal/rtl/cipher.cxx |2
sal/rtl/crc.cxx |2
sal/rtl/digest.cxx | 14
sal/rtl/math.cxx|4
sal/rtl/string.cxx |2
sal/rtl/ustring.cxx |2
sal/textenc/convertbig5hkscs.tab|4
sal/textenc/converteuctw.tab|4
sal/textenc/convertgb18030.tab |4
sal/textenc/convertisciidevangari.cxx |2
sal/textenc/convertisciidevangari.tab |2
sal/textenc/convertiso2022cn.tab|4
sal/textenc/convertiso2022jp.tab|4
sal/textenc/convertiso2022kr.tab|4
sal/textenc/convertsimple.cxx |4
sal/textenc/generate/big5hkscs2001.tab | 10
sal/textenc/generate/cns116431992.tab | 12
sal/textenc/generate/gb180302000.tab|8
sal/textenc/tables.cxx |6
sal/textenc/tcvtarb1.tab| 60 +--
sal/textenc/tcvteas1.tab| 24 -
sal/textenc/tcvtest1.tab| 284 +++
sal/textenc/tcvtjp1.tab | 100 ++---
sal/textenc/tcvtjp2.tab | 216 +--
sal/textenc/tcvtjp3.tab | 292 +++
sal/textenc/tcvtjp4.tab | 192 +-
sal/textenc/tcvtjp5.tab | 176 -
sal/textenc/tcvtjp6.tab | 52 +-
sal/textenc/tcvtkr1.tab | 248 ++---
sal/textenc/tcvtkr2.tab | 290 +++
sal/textenc/tcvtkr4.tab | 224 +--
sal/textenc/tcvtkr5.tab | 290 +++
sal/textenc/tcvtkr6.tab | 26 -
sal/textenc/tcvtlat1.tab| 100 ++---
sal/textenc/tcvtscn1.tab| 252 ++---
sal/textenc/tcvtscn2.tab| 264 +++---
sal/textenc/tcvtscn3.tab| 148 +++
sal/textenc/tcvtscn4.tab| 162
sal/textenc/tcvtscn5.tab| 164
sal/textenc/tcvtscn6.tab| 44 +-
sal/textenc/tcvtsym1.tab|2
sal/textenc/tcvttcn1.tab| 178 -
sal/textenc/tcvttcn2.tab| 204 +-
sal/textenc/tcvttcn6.tab| 26 -
sal/textenc/tcvtuni1.tab|2
sal/textenc/tcvtutf7.cxx|6
sal/textenc/textenc.cxx | 28 -
55 files changed, 2389 insertions(+), 2389 deletions(-)
New commits:
commit d563b9a5960e9bfe7077ee5aca44966d0bb3e2f1
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 19:53:00 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 2 07:09:56 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sal
Change-Id: I022f5ed37d25f2c8a8870033bab32ff59d4d8da6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97648
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index a4c7c807c201..3a0b1021e726 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -294,7 +294,7 @@ static const Pair nl_language_list[] = {
#elif defined(LINUX)
-static const Pair nl_language_list[] = {
+const Pair nl_language_list[] = {
{ "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /*
ISO-IR-99 NAPLPS */
{ "ANSI_X3.4-1968", RTL_TEXTENCODING_ISO_8859_1 }, /* fake:
ASCII_US */
{ "ASMO_449", RTL_TEXTENCODING_DONTKNOW },/*
ISO_9036 ARABIC7 */
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index ec9fe4b9d5ca..034979ba0e4e 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -41,7 +41,7 @@
static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions
Options, oslSecurity Security);
-static struct
+struct
{
interrcode;
oslPipeError error;
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 39db4936fa3f..861324963dec 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -92,8 +92,8 @@ struct ProcessData
oslFileHandle*m_pErrorRead;
};
-static oslProcessImpl* ChildList;
-static oslMutexChildListMutex;
+oslProcessImpl* ChildList;
+oslMutexChildListMutex;
} //Anonymous namespace
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 4f67795a60ee..56a8f6cd63ac 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -94,
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 4101d4e9d8cbb5c0df8ee3232bd1e3af06897573
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 05:05:25 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 05:07:52 2020 +0200
ciabot: Fix str vs. int comparison.
Traceback (most recent call last):
[…]
File "/srv/ciabot/prod/libreoffice-bugzilla2.py", line 142, in
find_target_version
if max(beta_list) >= 2:
TypeError: '>=' not supported between instances of 'str' and 'int'
Regression from f2204d126c2334ccbe061cd27d519316426448c1. Solved by
turning to int early for bug numbers and maj/min/etc version numbers.
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8ba84e2..3f61597 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -105,7 +105,7 @@ def find_target_version(repo, branch):
# form libreoffice-x-y-z => will be available in x.y.z
match = re.search("libreoffice-(\d+)-(\d+)-(\d+)", branch)
if match is not None:
-return ".".join(map(str, match.groups()))
+return ".".join(match.groups())
# form libreoffice-x-y
# branch of libreoffice-x-y-z exists => will be available in x.y.z+1
@@ -115,26 +115,26 @@ def find_target_version(repo, branch):
# beta
match = re.search("libreoffice-(\d+)-(\d+)", branch)
if match is not None:
-base = ".".join(map(str, match.groups()))
+base = ".".join(match.groups())
branches = repo.remote().refs
branch_names = [str(branch) for branch in branches]
print(branch_names)
-search_string = "libreoffice-"+"-".join(map(str, match.groups())) +
"-(\d+)"
+search_string = "libreoffice-" + "-".join(match.groups()) + "-(\d+)"
print(search_string)
-micro_list = [m.group(1) for m in [re.search(search_string, branch)
for branch in branch_names] if m is not None]
+micro_list = [int(m.group(1)) for m in [re.search(search_string,
branch) for branch in branch_names] if m is not None]
if len(micro_list) == 0:
# first search if we are at an RC already
search_string = "libreoffice-" + base + ".0." + "(\d+)$"
tags = repo.tags
print(tags)
-rc_list = [m.group(1) for m in [re.search(search_string, str(tag))
for tag in tags] if m is not None]
+rc_list = [int(m.group(1)) for m in [re.search(search_string,
str(tag)) for tag in tags] if m is not None]
print(rc_list)
if len(rc_list) > 0:
-return base + ".0." + str(int(max(rc_list)) + 1)
+return base + ".0." + str(max(rc_list) + 1)
# we have not yet tagged an RC, check which betas have been tagged
search_string = "libreoffice-" + base + ".0.0.beta(\d+)"
-beta_list = [m.group(1) for m in [re.search(search_string,
str(tag)) for tag in tags] if m is not None]
+beta_list = [int(m.group(1)) for m in [re.search(search_string,
str(tag)) for tag in tags] if m is not None]
print(beta_list)
if len(beta_list) == 0:
# no beta yet
@@ -145,10 +145,10 @@ def find_target_version(repo, branch):
return base + ".0.1"
# normal beta
-return base + ".0.0.beta" + str(int(max(beta_list)) + 1)
+return base + ".0.0.beta" + str(max(beta_list) + 1)
print(micro_list)
# the next release from libreoffice-x-y is max existing z-branch + 1
-return base + "." + str(int(max(micro_list)) + 1)
+return base + "." + str(max(micro_list) + 1)
return None
@@ -165,7 +165,7 @@ def find_bugid(repo, commit_id):
print("no bugid found")
sys.exit()
-return m
+return [int(i) for i in m]
def read_repo(repo_name):
config = configparser.ConfigParser()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source
vcl/source/window/toolbox.cxx | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
New commits:
commit b0315eb69c62f2108983e6a4b2177cf28a2663bf
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 16:49:52 2020 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Jul 2 04:43:28 2020 +0200
tdf#130991 Fit the drop-down arrow into its rect
Looking at the original fixed-size arrow painting code replaced
in commit b62c43d1200e524369d9c7c2bd1dad3044efd672 ("Anti-alias
toolbar button drop-downs."), it used some fixed values of 5
and 3 to match the arrow box width of 11.
The new code assumes the width is the expected arrow size, minus
a minimal margin to separate the arrow from the button border,
and there is enough height available. Based on these assumptions,
the code now scales, positions and paints the triangle to fill
the available space.
Change-Id: Ied721e494d105106086ef6252e72ae7395eafe08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97537
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 1cb897a0f65ba066d1e81b62c70c3e46bbdb7ba8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97583
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 02600732c747..935a7e3ae9ec 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2391,27 +2391,28 @@ static void ImplDrawDropdownArrow(vcl::RenderContext&
rRenderContext, const tool
rRenderContext.SetFillColor(COL_BLACK);
}
-float fScaleFactor = rRenderContext.GetDPIScaleFactor();
-
tools::Polygon aPoly(4);
-long width = round(rDropDownRect.getHeight()/5.5) * fScaleFactor; // scale
triangle depending on theme/toolbar height with 7 for gtk, 5 for gen
-long height = round(rDropDownRect.getHeight()/9.5) * fScaleFactor; // 4
for gtk, 3 for gen
-if (width < 4) width = 4;
-if (height < 3) height = 3;
+// the assumption is, that the width always specifies the size of the
expected arrow.
+const long nMargin = round(2 * rRenderContext.GetDPIScaleFactor());
+const long nSize = rDropDownRect.getWidth() - 2 * nMargin;
+const long nHalfSize = (nSize + 1) / 2;
+const long x = rDropDownRect.Left() + nMargin + (bRotate ?
(rDropDownRect.getWidth() - nHalfSize) / 2 : 0);
+const long y = rDropDownRect.Top() + nMargin + (rDropDownRect.getHeight()
- (bRotate ? nSize : nHalfSize)) / 2;
-long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
-long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
-
-long halfwidth = (width+1)>>1;
aPoly.SetPoint(Point(x, y), 0);
-aPoly.SetPoint(Point(x + halfwidth, y + height), 1);
-aPoly.SetPoint(Point(x + halfwidth*2, y), 2);
+if (bRotate) // >
+{
+aPoly.SetPoint(Point(x, y + nSize), 1);
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 2);
+}
+else // v
+{
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 1);
+aPoly.SetPoint(Point(x + nSize, y), 2);
+}
aPoly.SetPoint(Point(x, y), 3);
-if (bRotate) // TESTME: harder ...
-aPoly.Rotate(Point(x,y+height/2),2700);
-
auto aaflags = rRenderContext.GetAntialiasing();
rRenderContext.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
rRenderContext.DrawPolygon( aPoly );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.DocumentNameInput.js |2 +-
loleaflet/src/control/Control.Toolbar.js |7 ---
loleaflet/src/map/Map.js |4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 0b80c4b3270f004278521e06afcf3dec6ff99cd9
Author: Ashod Nakashian
AuthorDate: Thu Jun 25 21:53:26 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Jul 2 02:44:29 2020 +0200
leaflet: set renameFilename before saving
There is a race between the time we set the
renameFilename value and the uno:Save response
arrives. If renameFilename is not set by then
we miss the opportunity to rename and instead
simply end up saving the file.
Change-Id: I8d7acbc95cef264de4385d506bfa34458ba80283
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97189
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index cfc4e5998..3ad053094 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -27,8 +27,8 @@ L.Control.DocumentNameInput = L.Control.extend({
// same extension, just rename
the file
// file name must be without
the extension for rename
value = value.substr(0,
value.lastIndexOf('.'));
+ this.map._renameFilename =
value;
this.map.sendUnoCommand('.uno:Save');
- this.map._RenameFile = value;
}
}
} else {
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 1eccdce82..e8dce9bc3 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -924,9 +924,10 @@ function onCommandResult(e) {
map._everModified = true;
// document is saved for rename
- if (map._RenameFile) {
- map.renameFile(map._RenameFile);
- map._RenameFile = '';
+ if (map._renameFilename) {
+ var renameFilename = map._renameFilename;
+ map._renameFilename = '';
+ map.renameFile(renameFilename);
}
}
var postMessageObj = {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 5f9882a53..285e4954d 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -259,8 +259,8 @@ L.Map = L.Evented.extend({
// This becomes true if document was ever modified by the user
this._everModified = false;
- // This becomes new file name if document is renamed which used
later on uno:Save result
- this._RenameFile = '';
+ // This is the new file name, if the document is renamed, which
is used on uno:Save's result.
+ this._renameFilename = '';
// Document is completely loaded or not
this._docLoaded = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Protocol.cpp common/Protocol.hpp common/Util.hpp
common/Protocol.cpp | 42 -
common/Protocol.hpp | 23 -
common/Util.hpp | 86 +---
3 files changed, 102 insertions(+), 49 deletions(-)
New commits:
commit 65c245eab0b9c43866cfa7069cdd6f3889a0a23e
Author: Ashod Nakashian
AuthorDate: Tue Jun 2 18:19:23 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Jul 2 02:38:35 2020 +0200
wsd: move string-to-integer helper to Util
Improved implementation.
Change-Id: I0b426f8742c8b718f8c939d271f6645a8ed466d4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96374
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index 771b87b49..d02f2d340 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -48,48 +48,6 @@ namespace LOOLProtocol
return std::make_tuple(major, minor, patch);
}
-bool stringToInteger(const std::string& input, int& value)
-{
-try
-{
-value = std::stoi(input);
-}
-catch (std::invalid_argument&)
-{
-return false;
-}
-
-return true;
-}
-
-bool stringToUInt32(const std::string& input, uint32_t& value)
-{
-try
-{
-value = std::stoul(input);
-}
-catch (std::invalid_argument&)
-{
-return false;
-}
-
-return true;
-}
-
-bool stringToUInt64(const std::string& input, uint64_t& value)
-{
-try
-{
-value = std::stoull(input);
-}
-catch (std::invalid_argument&)
-{
-return false;
-}
-
-return true;
-}
-
bool getTokenInteger(const std::string& token, const std::string& name,
int& value)
{
if (token.size() > (name.size() + 1) &&
diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index 5eb90941b..367d9ff27 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -41,9 +41,26 @@ namespace LOOLProtocol
// Negative numbers for error.
std::tuple ParseVersion(const std::string& version);
-bool stringToInteger(const std::string& input, int& value);
-bool stringToUInt32(const std::string& input, uint32_t& value);
-bool stringToUInt64(const std::string& input, uint64_t& value);
+inline bool stringToInteger(const std::string& input, int& value)
+{
+bool res;
+std::tie(value, res) = Util::i32FromString(input);
+return res;
+}
+
+inline bool stringToUInt32(const std::string& input, uint32_t& value)
+{
+bool res;
+std::tie(value, res) = Util::i32FromString(input);
+return res;
+}
+
+inline bool stringToUInt64(const std::string& input, uint64_t& value)
+{
+bool res;
+std::tie(value, res) = Util::u64FromString(input);
+return res;
+}
inline
bool parseNameValuePair(const std::string& token, std::string& name,
std::string& value, const char delim = '=')
diff --git a/common/Util.hpp b/common/Util.hpp
index ba70cba47..6dcfa3d48 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -22,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1129,10 +1131,86 @@ int main(int argc, char**argv)
*/
std::map
stringVectorToMap(std::vector sVector, const char delimiter);
-#if !MOBILEAPP
-// If OS is not mobile, it must be Linux.
-std::string getLinuxVersion();
-#endif
+#if !MOBILEAPP
+// If OS is not mobile, it must be Linux.
+std::string getLinuxVersion();
+#endif
+
+/// Convert a string to 32-bit signed int.
+/// Returs the parsed value and a boolean indiciating success or failure.
+inline std::pair i32FromString(const std::string&
input)
+{
+const char* str = input.data();
+char* endptr = nullptr;
+const auto value = std::strtol(str, &endptr, 10);
+return std::make_pair(value, endptr > str && errno != ERANGE);
+}
+
+/// Convert a string to 32-bit signed int. On failure, returns the default
+/// value, and sets the bool to false (to signify that parsing had failed).
+inline std::pair i32FromString(const std::string&
input,
+ const std::int32_t def)
+{
+const auto pair = i32FromString(input);
+return pair.second ? pair : std::make_pair(def, false);
+}
+
+/// Convert a string to 32-bit unsigned int.
+/// Returs the parsed value and a boolean indiciating success or failure.
+inline std::pair u32FromString(const std::string&
input)
+{
+const char* str = input.data();
+char* endptr = nullptr;
+const auto value = std::strtoul(str, &endptr, 10);
+retu
[Libreoffice-commits] online.git: wsd/Admin.cpp
wsd/Admin.cpp | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 4082a462dad52151907fe71f5780cb82b0d272a7
Author: Ashod Nakashian
AuthorDate: Sat Jun 27 16:56:51 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Jul 2 02:33:25 2020 +0200
wsd: admin: don't poll rapidly when cleanup is disabled
When per_document.cleanup is disabled, the time
between the last cleanup (which never happened)
grows indefinitely, which results in minimal
polling time intervals. This wastes valuable
cpu cycles unnecessarily.
When cleanup is disabled, there is no need to
calculate the next cleanup time. The maximum
is reasonable (although it should really be
infinity).
Change-Id: I71d065441c4c2ff96fe31e6a45a5ecfdd2f85d49
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97471
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 996e7b75c..02be6fcfd 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -415,14 +415,12 @@ Admin::~Admin()
void Admin::pollingThread()
{
-std::chrono::steady_clock::time_point lastCPU, lastMem, lastNet,
lastCleanup;
-
_model.setThreadOwner(std::this_thread::get_id());
-lastCPU = std::chrono::steady_clock::now();
-lastMem = lastCPU;
-lastNet = lastCPU;
-lastCleanup = lastCPU;
+std::chrono::steady_clock::time_point lastCPU =
std::chrono::steady_clock::now();
+std::chrono::steady_clock::time_point lastMem = lastCPU;
+std::chrono::steady_clock::time_point lastNet = lastCPU;
+std::chrono::steady_clock::time_point lastCleanup = lastCPU;
while (!isStop() && !SigUtil::getTerminationFlag() &&
!SigUtil::getShutdownRequestFlag())
{
@@ -484,14 +482,15 @@ void Admin::pollingThread()
lastNet = now;
}
-int cleanupWait = _cleanupIntervalMs -
-std::chrono::duration_cast(now -
lastCleanup).count();
-if (cleanupWait <= MinStatsIntervalMs / 2) // Close enough
+int cleanupWait = _cleanupIntervalMs;
+if (_defDocProcSettings.getCleanupSettings().getEnable())
{
-if (_defDocProcSettings.getCleanupSettings().getEnable())
+cleanupWait
+-= std::chrono::duration_cast(now -
lastCleanup).count();
+if (cleanupWait <= MinStatsIntervalMs / 2) // Close enough
{
cleanupResourceConsumingDocs();
-
+
cleanupWait += _cleanupIntervalMs;
lastCleanup = now;
}
@@ -509,7 +508,8 @@ void Admin::pollingThread()
}
// Handle websockets & other work.
-const int timeout =
capAndRoundInterval(std::min(std::min(std::min(cpuWait, memWait), netWait),
cleanupWait));
+const int timeout = capAndRoundInterval(
+std::min(std::min(std::min(cpuWait, memWait), netWait),
cleanupWait));
LOG_TRC("Admin poll for " << timeout << "ms.");
poll(timeout * 1000); // continue with ms for admin, settings etc.
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Makefile.am test/Makefile.am
Makefile.am | 28 +++-
test/Makefile.am |2 ++
2 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit a062581be6b55d9c498c8f1d4e5cec9c4126e234
Author: Ashod Nakashian
AuthorDate: Wed Jul 1 13:06:46 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Jul 2 02:32:43 2020 +0200
make: improve cleanup dependency graph
Change-Id: I8a7edd3b49a272cb7bd8bff4d91b189a5856c5c8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97647
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/Makefile.am b/Makefile.am
index 0eba81cf5..074f05376 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -329,14 +329,25 @@ SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
RUN_GDB = $(if $(GDB_FRONTEND),$(GDB_FRONTEND),gdb --tui --args)
-$(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
- if test -s ./loolwsd; then ./loolwsd --cleanup; fi
+# Add caps to the binaries that need them.
+caps_bins: loolforkit loolmount
+if ENABLE_SETCAP
+ sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit
+ sudo @SETCAP@ cap_sys_admin=ep loolmount
+else
+ echo "Skipping capability setting"
+endif
+
+# Build loolwsd and loolmount first, so we can cleanup before updating
+# the systemplate directory, which we can't rm if it's mounted.
+$(SYSTEM_STAMP): ${top_srcdir}/loolwsd-systemplate-setup loolwsd caps_bins
+ $(CLEANUP_COMMAND)
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@"
"@LO_PATH@" && touch $@
-@JAILS_PATH@ :
- mkdir -p $@
+@JAILS_PATH@:
$(CLEANUP_COMMAND)
+ mkdir -p $@
clean-local:
$(CLEANUP_COMMAND)
@@ -464,16 +475,7 @@ endif
# installing the RPM or Debian package.
.PHONY: caps_bins
-caps_bins: loolforkit loolmount
-if ENABLE_SETCAP
- sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit
- sudo @SETCAP@ cap_sys_admin=ep loolmount
-else
- echo "Skipping capability setting"
-endif
-
all-local: loolwsd caps_bins @JAILS_PATH@ $(SYSTEM_STAMP)
- $(CLEANUP_COMMAND)
# just run the build without any tests
build-nocheck: all-am
diff --git a/test/Makefile.am b/test/Makefile.am
index c12038b0d..327832f79 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -309,3 +309,5 @@ all-local: unittest
@echo
@fc-cache "@LO_PATH@"/share/fonts/truetype
@UNITTEST=1 ${top_builddir}/test/unittest
+ echo "Done test all-local"
+ $(CLEANUP_COMMAND)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl
ciabot/irker-cia-proxy.py| 12 ++--
ciabot/libreoffice-bugzilla2.py | 19 +--
ciabot/run-libreoffice-ciabot.pl |6 +++---
3 files changed, 14 insertions(+), 23 deletions(-)
New commits:
commit f2204d126c2334ccbe061cd27d519316426448c1
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 01:46:13 2020 +0200
ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.
diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..ed8835f 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
irker-cia-proxy - proxy CIA requests to an irker relay agent
@@ -15,8 +15,8 @@ from the use of this software.
import json, socket, posixpath, re, sys
from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
bind_ip = ''
bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
def get_template(self):
# If there is a template for this branch, use it, otherwise fall back
to the project or the global one.
branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
return projmap[self.project()]['template']
return template
def get_target(self):
@@ -131,7 +131,7 @@ class CIAMessage:
envelope = json.dumps(structure)
try:
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock.sendto(envelope + "\n", (target_server, target_port))
+sock.sendto(envelope.encode() + b"\n", (target_server,
target_port))
finally:
sock.close()
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
# - adds a comment to the report
# - updates the whiteboard field with target information
-from __future__ import print_function
-
import datetime
import os
import re
import sys, getopt
import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
import bugzilla
-from bugzilla import Bugzilla
master_target = "7.1.0"
bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
bz = None
def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
url = config.get('bugzilla', 'url')
user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
print(bugnr)
if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version))
else:
bug = self.bz.getbug(bugnr)
print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback."""
%(new_version)
if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" %
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" %
comment_msg))
else:
bug.addcomment(comment_msg)
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
return m
def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
path = config.get(repo_name, 'location')
repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
my %old = %{$old_ref};
my %new = %{$new_ref};
my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irker-cia-proxy.py -s )";
+my $ciaproxy = "| ( cd $cwd && python3 irker-cia-proxy.py -s )";
foreach my $key ( keys %new ) {
my $branch_name = $
[Libreoffice-commits] dev-tools.git: 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl
ciabot/irker-cia-proxy.py| 10 +-
ciabot/libreoffice-bugzilla2.py | 19 +--
ciabot/run-libreoffice-ciabot.pl |6 +++---
3 files changed, 13 insertions(+), 22 deletions(-)
New commits:
commit 00bd505620f9c5f491c3dd0d15fe38ab383b98a3
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 01:27:25 2020 +0200
ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.
diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..6ea6c83 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
irker-cia-proxy - proxy CIA requests to an irker relay agent
@@ -15,8 +15,8 @@ from the use of this software.
import json, socket, posixpath, re, sys
from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
bind_ip = ''
bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
def get_template(self):
# If there is a template for this branch, use it, otherwise fall back
to the project or the global one.
branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
return projmap[self.project()]['template']
return template
def get_target(self):
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
# - adds a comment to the report
# - updates the whiteboard field with target information
-from __future__ import print_function
-
import datetime
import os
import re
import sys, getopt
import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
import bugzilla
-from bugzilla import Bugzilla
master_target = "7.1.0"
bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
bz = None
def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
url = config.get('bugzilla', 'url')
user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
print(bugnr)
if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version))
else:
bug = self.bz.getbug(bugnr)
print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback."""
%(new_version)
if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" %
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" %
comment_msg))
else:
bug.addcomment(comment_msg)
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
return m
def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
path = config.get(repo_name, 'location')
repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
my %old = %{$old_ref};
my %new = %{$new_ref};
my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irker-cia-proxy.py -s )";
+my $ciaproxy = "| ( cd $cwd && python3 irker-cia-proxy.py -s )";
foreach my $key ( keys %new ) {
my $branch_name = $key;
@@ -127,13 +127,13 @@ sub report($$$) {
my $branch = $branch_name;
$branch = 'master' if ($branch eq '');
print "reporting to bugzilla: $_ and
branch $branch\n";
-qx(python
$cwd/libreoffice-bugzil
[Libreoffice-commits] dev-tools.git: ciabot/irker-cia-proxy.py
ciabot/irker-cia-proxy.py | 152 ++
1 file changed, 152 insertions(+)
New commits:
commit 927bc365976758afa6de1f2edcfb03ad21ebd45e
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 01:21:03 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 01:27:25 2020 +0200
ciabot: Add irker-cia-proxy.py.
diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
new file mode 100644
index 000..c26996c
--- /dev/null
+++ b/ciabot/irker-cia-proxy.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+"""
+irker-cia-proxy - proxy CIA requests to an irker relay agent
+
+Copyright (c) 2012 William Pitcock
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+This software is provided 'as is' and without any warranty, express or
+implied. In no event shall the authors be liable for any damages arising
+from the use of this software.
+"""
+
+import json, socket, posixpath, re, sys
+from xml.dom import minidom
+from SimpleXMLRPCServer import SimpleXMLRPCServer
+from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+
+bind_ip = ''
+bind_port = 8000
+target_server = "localhost"
+target_port = 6659
+template = "%(bold)s%(project)s:%(bold)s %(green)s%(author)s%(reset)s
%(yellow)s%(branch)s%(reset)s * r%(bold)s%(revision)s%(bold)s
%(module)s/%(files)s%(bold)s:%(bold)s %(log)s"
+
+projmap = json.load(open("projmap.json"))
+
+class CIAMessage:
+"Abstract class which represents a CIA message."
+def __init__(self, messagexml):
+self._dom = minidom.parseString(messagexml)
+def _render_files(self):
+prefix, endings = self._consolidate_files()
+endstr = ' '.join(endings)
+if len(endstr) > 60:
+endstr = self._summarize_files(endings)
+if prefix.startswith('/'):
+prefix = prefix[1:]
+if endstr:
+return "%s (%s)" % (prefix, endstr)
+return prefix
+def _consolidate_files(self):
+files = []
+filenode = self.dig('message', 'body', 'commit', 'files')
+if filenode is not None:
+for child in filenode.childNodes:
+if child.nodeName == 'file':
+files.append(self._shallowtext(child))
+# Optimization: if we only have one file, don't waste CPU on any of
the other
+# stuff we do to pretend to be CIA.
+if len(files) == 1:
+return files[0], []
+prefix = re.sub("[^/]*$", "", posixpath.commonprefix(files))
+endings = []
+for file in files:
+ending = file[len(prefix):].strip()
+if ending == '':
+ending = '.'
+endings.append(ending)
+return prefix, endings
+def _summarize_files(self, files):
+dirs = {}
+for file in files:
+dirs[posixpath.split(file)[0]] = True
+if len(dirs) <= 1:
+return "%d files" % len(files)
+return "%d files in %d dirs" % (len(files), len(dirs))
+def _shallowtext_generator(self, node):
+for child in node.childNodes:
+if child.nodeType == child.TEXT_NODE:
+yield child.data
+def _shallowtext(self, node):
+if node is None:
+return None
+return ''.join(self._shallowtext_generator(node))
+def dig(self, *subElements):
+if not self._dom:
+return None
+node = self._dom
+for name in subElements:
+nextNode = None
+for child in node.childNodes:
+if child.nodeType == child.ELEMENT_NODE and child.nodeName ==
name:
+nextNode = child
+break
+if nextNode:
+node = nextNode
+else:
+return None
+return node
+def lookup(self, *subElements):
+text = self._shallowtext(self.dig(*subElements))
+if text is not None:
+return text.strip()
+return None
+def data(self):
+paths = {
+'bold': '\x02',
+'green': '\x033',
+'blue': '\x032',
+'yellow': '\x037',
+'reset': '\x0F'
+}
+paths['project'] = self.lookup('message', 'source', 'project')
+paths['branch'] = self.lookup('message', 'source', 'branch')
+paths['module'] = self.lookup('message', 'source', 'module')
+paths['revision'] = self.lookup('message', 'body', 'commit',
'revision')
+paths['version'] = self.lookup('message', 'body', 'commit', 'version')
+paths['author'] = self.lookup('message', 'body', 'commit', 'author')
+paths['log'] = self.lookup('message', 'body', 'commit', 'log')
+paths['files'] = self._render_files()
+paths['url'] = self.lookup('message', 'body', 'commit', 'url')
+
[Libreoffice-commits] dev-tools.git: 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/sidebar/PanelLayout.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c48e4d795e37f23b71d647247590807ab9e52223
Author: Jan-Marek Glogowski
AuthorDate: Wed Jul 1 23:26:59 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Jul 2 01:39:12 2020 +0200
Fix PanelLayout Task::SetPriority warning
SetStyle will tigger a resize event, which in turn will start the
m_aPanelLayoutIdle, before it's actually prepared, resulting in
the Task::SetPriority SAL_WARN_IF triggering.
Change-Id: Ide48d6004e242cf75bb48dc9f5e8dc3aa5ff809b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97664
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/sfx2/source/sidebar/PanelLayout.cxx
b/sfx2/source/sidebar/PanelLayout.cxx
index e4cf889b02ff..6a333819274b 100644
--- a/sfx2/source/sidebar/PanelLayout.cxx
+++ b/sfx2/source/sidebar/PanelLayout.cxx
@@ -21,11 +21,12 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const
OString& rID, const OUStrin
, m_bInClose(false)
, mxFrame(rFrame)
{
-SetStyle(GetStyle() | WB_DIALOGCONTROL);
m_aPanelLayoutIdle.SetPriority(TaskPriority::RESIZE);
m_aPanelLayoutIdle.SetInvokeHandler( LINK( this, PanelLayout,
ImplHandlePanelLayoutTimerHdl ) );
m_aPanelLayoutIdle.SetDebugName("sfx2::PanelLayout m_aPanelLayoutIdle");
+SetStyle(GetStyle() | WB_DIALOGCONTROL);
+
// Builder will trigger resize and start Idle
m_xVclContentArea = VclPtr::Create(this);
m_xVclContentArea->Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: 2 commits - ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/run-libreoffice-ciabot.pl
ciabot/irker-cia-proxy.py| 152 +++
ciabot/libreoffice-bugzilla2.py | 19 +---
ciabot/run-libreoffice-ciabot.pl |6 -
3 files changed, 160 insertions(+), 17 deletions(-)
New commits:
commit 00bd505620f9c5f491c3dd0d15fe38ab383b98a3
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 01:27:25 2020 +0200
ciabot: Port libreoffice-bugzilla2.py and irker-cia-proxy.py to python3.
diff --git a/ciabot/irker-cia-proxy.py b/ciabot/irker-cia-proxy.py
index c26996c..6ea6c83 100644
--- a/ciabot/irker-cia-proxy.py
+++ b/ciabot/irker-cia-proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
irker-cia-proxy - proxy CIA requests to an irker relay agent
@@ -15,8 +15,8 @@ from the use of this software.
import json, socket, posixpath, re, sys
from xml.dom import minidom
-from SimpleXMLRPCServer import SimpleXMLRPCServer
-from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+from xmlrpc.server import SimpleXMLRPCServer
+from xmlrpc.server import SimpleXMLRPCRequestHandler
bind_ip = ''
bind_port = 8000
@@ -117,9 +117,9 @@ class CIAMessage:
def get_template(self):
# If there is a template for this branch, use it, otherwise fall back
to the project or the global one.
branch_template = "template-%s" % self.data()['branch']
-if projmap[self.project()].has_key(branch_template):
+if branch_template in projmap[self.project()]:
return projmap[self.project()][branch_template]
-if projmap[self.project()].has_key('template'):
+if 'template' in projmap[self.project()]:
return projmap[self.project()]['template']
return template
def get_target(self):
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
# - adds a comment to the report
# - updates the whiteboard field with target information
-from __future__ import print_function
-
import datetime
import os
import re
import sys, getopt
import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
import bugzilla
-from bugzilla import Bugzilla
master_target = "7.1.0"
bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
bz = None
def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
url = config.get('bugzilla', 'url')
user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
print(bugnr)
if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version))
else:
bug = self.bz.getbug(bugnr)
print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback."""
%(new_version)
if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" %
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" %
comment_msg))
else:
bug.addcomment(comment_msg)
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
return m
def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
path = config.get(repo_name, 'location')
repo = git.repo.base.Repo(path)
diff --git a/ciabot/run-libreoffice-ciabot.pl b/ciabot/run-libreoffice-ciabot.pl
index c48e821..eb90f0b 100755
--- a/ciabot/run-libreoffice-ciabot.pl
+++ b/ciabot/run-libreoffice-ciabot.pl
@@ -89,7 +89,7 @@ sub report($$$) {
my %old = %{$old_ref};
my %new = %{$new_ref};
my $ciabot = "timeout 60 $cwd/libreoffice-ciabot.pl";
-my $ciaproxy = "| ( cd $cwd && python irker-cia-proxy.py -s )";
+my $ciaproxy = "| ( cd $cwd && python3 irker-cia-proxy.py -s )";
foreach my $key ( keys %new ) {
my $branch_name = $key;
@@ -127,13 +127,13 @@ sub report($$$) {
my $branch = $branch_name;
$branch = 'master' if ($branch eq '');
print "reporting to bugzilla: $_ and
branch $branch\n";
-qx(python
$cwd/libreoff
[Libreoffice-commits] dev-tools.git: 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py | 19 +--
1 file changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 7a647c3da1a93cc38fe922706f25124c384a4a48
Author: Guilhem Moulin
AuthorDate: Thu Jul 2 01:13:10 2020 +0200
Commit: Guilhem Moulin
CommitDate: Thu Jul 2 01:13:10 2020 +0200
ciabot: Port libreoffice-bugzilla2.py to python3.
diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py
index 8d11e31..8ba84e2 100644
--- a/ciabot/libreoffice-bugzilla2.py
+++ b/ciabot/libreoffice-bugzilla2.py
@@ -18,23 +18,14 @@
# - adds a comment to the report
# - updates the whiteboard field with target information
-from __future__ import print_function
-
import datetime
import os
import re
import sys, getopt
import git
-import ConfigParser
-
-if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
-# pylint: disable=F0401,E0611
-from urllib.parse import urlparse
-else:
-from urlparse import urlparse
+import configparser
import bugzilla
-from bugzilla import Bugzilla
master_target = "7.1.0"
bug_regex = "\\b(?:bug|fdo|tdf|lo)[#:]?(\\d+)\\b"
@@ -46,7 +37,7 @@ class FreedesktopBZ:
bz = None
def connect(self):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
url = config.get('bugzilla', 'url')
user = config.get('bugzilla', 'user')
@@ -58,7 +49,7 @@ class FreedesktopBZ:
def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name):
print(bugnr)
if dry_run:
-print("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version)
+print(("DRY RUN, we would set the whiteboard to: target:\n%s" %
new_version))
else:
bug = self.bz.getbug(bugnr)
print(bug)
@@ -99,7 +90,7 @@ https://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback."""
%(new_version)
if dry_run:
-print("DRY RUN, we would add the following comment:\n%s" %
comment_msg)
+print(("DRY RUN, we would add the following comment:\n%s" %
comment_msg))
else:
bug.addcomment(comment_msg)
@@ -177,7 +168,7 @@ def find_bugid(repo, commit_id):
return m
def read_repo(repo_name):
-config = ConfigParser.ConfigParser()
+config = configparser.ConfigParser()
config.read(os.path.dirname(os.path.abspath(__file__)) + '/config.cfg')
path = config.get(repo_name, 'location')
repo = git.repo.base.Repo(path)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/fwe/helper/titlehelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6ddd8673f9985afd48b3212444a942ebe37197f6
Author: Michael Meeks
AuthorDate: Wed Jul 1 17:59:35 2020 +0100
Commit: Thorsten Behrens
CommitDate: Thu Jul 2 00:32:02 2020 +0200
Disable flavour in title bar for Linux.
Tweaks c5404831344 after discussion with Rene.
Change-Id: I7820643f79e673a90055f74770bffaf8ad7a077f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97646
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index d02287da16b4..e1a9738267d0 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -518,10 +518,10 @@ void TitleHelper::impl_updateTitleForFrame (const
css::uno::Reference< css::fram
// document name (from the above "component title").
impl_appendProductName (sTitle);
+#if defined(WNT) || defined(MACOSX)
if (!std::string_view(PRODUCTFLAVOR).empty())
-{
sTitle.append(" " PRODUCTFLAVOR);
-}
+#endif
impl_appendModuleName (sTitle);
impl_appendDebugVersion (sTitle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - framework/source
framework/source/fwe/helper/titlehelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5a782225adc069a9b39986f7ced37eb78e542ae3
Author: Michael Meeks
AuthorDate: Wed Jul 1 17:59:35 2020 +0100
Commit: Thorsten Behrens
CommitDate: Thu Jul 2 00:32:21 2020 +0200
Disable flavour in title bar for Linux.
Tweaks c5404831344 after discussion with Rene.
Change-Id: I7820643f79e673a90055f74770bffaf8ad7a077f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97587
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index d02287da16b4..e1a9738267d0 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -518,10 +518,10 @@ void TitleHelper::impl_updateTitleForFrame (const
css::uno::Reference< css::fram
// document name (from the above "component title").
impl_appendProductName (sTitle);
+#if defined(WNT) || defined(MACOSX)
if (!std::string_view(PRODUCTFLAVOR).empty())
-{
sTitle.append(" " PRODUCTFLAVOR);
-}
+#endif
impl_appendModuleName (sTitle);
impl_appendDebugVersion (sTitle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/qa sfx2/source
sfx2/qa/cppunit/test_controlleritem.cxx |2
sfx2/source/appl/appuno.cxx | 124 ++--
sfx2/source/appl/childwin.cxx |2
sfx2/source/appl/shutdownicon.cxx |2
sfx2/source/appl/workwin.cxx| 10 +-
sfx2/source/bastyp/fltfnc.cxx |4
sfx2/source/bastyp/frmhtml.cxx |8 -
sfx2/source/bastyp/frmhtmlw.cxx |4
sfx2/source/bastyp/sfxhtml.cxx |2
sfx2/source/control/recentdocsview.cxx |4
sfx2/source/control/templatedefaultview.cxx |4
sfx2/source/dialog/dockwin.cxx |2
sfx2/source/dialog/filtergrouping.cxx |2
sfx2/source/dialog/mailmodel.cxx|2
sfx2/source/doc/DocumentMetadataAccess.cxx |8 -
sfx2/source/doc/Metadatable.cxx |4
sfx2/source/doc/SfxDocumentMetaData.cxx |2
sfx2/source/doc/objxtor.cxx |2
sfx2/source/notebookbar/SfxNotebookBar.cxx |4
sfx2/source/sidebar/DeckLayouter.cxx|2
sfx2/source/sidebar/DeckTitleBar.cxx|4
sfx2/source/sidebar/PanelTitleBar.cxx |4
sfx2/source/sidebar/SidebarController.cxx |8 -
sfx2/source/sidebar/TitleBar.cxx|4
sfx2/source/view/lokhelper.cxx |4
25 files changed, 109 insertions(+), 109 deletions(-)
New commits:
commit 69861703cb40a27ed0427313a2ab0237140d54a8
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 22:39:03 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 23:48:44 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sfx2
Change-Id: I67ac4f4ed5ddd488c3fd5bae83d1fce18d6213d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sfx2/qa/cppunit/test_controlleritem.cxx
b/sfx2/qa/cppunit/test_controlleritem.cxx
index 9576e7b192a5..75d220536712 100644
--- a/sfx2/qa/cppunit/test_controlleritem.cxx
+++ b/sfx2/qa/cppunit/test_controlleritem.cxx
@@ -30,7 +30,7 @@ public:
private:
};
-static bool bDeleted = false;
+bool bDeleted = false;
class FooController : public SfxControllerItem {
public:
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 1bdb0c0e9831..7ac8358696be 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -92,68 +92,68 @@ SfxFormalArgument const aFormalArgs[] = {
{ reinterpret_cast(&aSfxStringItem_Impl), "RedactionStyle",
SID_REDACTION_STYLE },
};
-static sal_uInt16 const nMediaArgsCount = SAL_N_ELEMENTS(aFormalArgs);
-
-static char const sTemplateRegionName[] = "TemplateRegionName";
-static char const sTemplateName[] = "TemplateName";
-static char const sAsTemplate[] = "AsTemplate";
-static char const sOpenNewView[] = "OpenNewView";
-static char const sViewId[] = "ViewId";
-static char const sPluginMode[] = "PluginMode";
-static char const sReadOnly[] = "ReadOnly";
-static char const sDdeReconnect[] = "DDEReconnect";
-static char const sStartPresentation[] = "StartPresentation";
-static char const sFrameName[] = "FrameName";
-static char const sMediaType[] = "MediaType";
-static char const sPostData[] = "PostData";
-static char const sCharacterSet[] = "CharacterSet";
-static char const sInputStream[] = "InputStream";
-static char const sStream[] = "Stream";
-static char const sOutputStream[] = "OutputStream";
-static char const sHidden[] = "Hidden";
-static char const sPreview[] = "Preview";
-static char const sViewOnly[] = "ViewOnly";
-static char const sDontEdit[] = "DontEdit";
-static char const sSilent[] = "Silent";
-static char const sJumpMark[] = "JumpMark";
-static char const sSalvagedFile[] = "SalvagedFile";
-static char const sStatusInd[] = "StatusIndicator";
-static char const sModel[] = "Model";
-static char const sFrame[] = "Frame";
-static char const sViewData[] = "ViewData";
-static char const sFilterData[] = "FilterData";
-static char const sSelectionOnly[] = "SelectionOnly";
-static char const sMacroExecMode[] = "MacroExecutionMode";
-static char const sUpdateDocMode[] = "UpdateDocMode";
-static char const sMinimized[] = "Minimized";
-static char const sInteractionHdl[] = "InteractionHandler";
-static char const sUCBContent[] = "UCBContent";
-static char const sRepairPackage[] = "RepairPackage";
-static char const sDocumentTitle[] = "DocumentTitle";
-static char const sComponentData[] = "ComponentData";
-static char const sComponentContext[] = "ComponentContext";
-static char const sDocumentBaseURL[] = "DocumentBaseURL";
-static char const sHierarchicalDocumentName[] = "HierarchicalDocumentName";
-static char const sCopyStreamIfPossible[] = "CopyStreamIfPossible";
-static char const sNoAutoSave[] = "NoAutoSave";
-static char const sFolderName[] = "FolderName";
-static char const sUseSystemDialog[] = "UseSystemDialog";
-static char const sStandardDir[] = "StandardDir";
-static char cons
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/strmname.h |8 +- sd/source/core/sdpage.cxx |4 - sd/source/filter/eppt/pptx-epptbase.cxx|2 sd/source/filter/eppt/pptx-epptooxml.cxx |2 sd/source/filter/html/htmlex.cxx | 12 +-- sd/source/filter/xml/sdtransform.cxx |6 - sd/source/ui/animations/motionpathtag.cxx |2 sd/source/ui/annotations/annotationtag.cxx |2 sd/source/ui/controller/displaymodecontroller.cxx |4 - sd/source/ui/controller/slidelayoutcontroller.cxx |8 +- sd/source/ui/dlg/gluectrl.cxx |2 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 10 +-- sd/source/ui/framework/factories/BasicPaneFactory.cxx |4 - sd/source/ui/framework/factories/PresentationFactory.cxx |2 sd/source/ui/framework/module/ModuleController.cxx |4 - sd/source/ui/framework/module/SlideSorterModule.cxx|4 - sd/source/ui/framework/module/ToolBarModule.cxx|8 +- sd/source/ui/framework/module/ViewTabBarModule.cxx |6 - sd/source/ui/func/fuoltext.cxx |2 sd/source/ui/func/fusearch.cxx |2 sd/source/ui/func/futext.cxx |2 sd/source/ui/inc/OutlineView.hxx |2 sd/source/ui/inc/ViewShell.hxx |8 +- sd/source/ui/presenter/PresenterTextView.cxx | 18 ++--- sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx |2 sd/source/ui/sidebar/LayoutMenu.cxx|6 - sd/source/ui/sidebar/MasterPagesSelector.cxx |2 sd/source/ui/sidebar/PreviewValueSet.cxx |4 - sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx |2 sd/source/ui/sidebar/SlideBackground.hxx |2 sd/source/ui/slideshow/showwin.cxx |4 - sd/source/ui/slideshow/slideshowimpl.cxx | 10 +-- sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx |2 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx|4 - sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 32 +- sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx |2 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx |6 - sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |2 sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx|8 +- sd/source/ui/slidesorter/view/SlsTheme.cxx |4 - sd/source/ui/table/TableDesignPane.cxx | 16 ++--- sd/source/ui/tools/EventMultiplexer.cxx|6 - sd/source/ui/unoidl/DrawController.cxx |2 sd/source/ui/unoidl/UnoDocumentSettings.cxx|2 sd/source/ui/unoidl/unoobj.cxx | 30 - sd/source/ui/unoidl/unopage.cxx|2 sd/source/ui/view/viewoverlaymanager.cxx |6 - 47 files changed, 140 insertions(+), 140 deletions(-) New commits: commit 72fcc08ea042f660dba802f20714a7fe8e86e1a8 Author: Stephan Bergmann AuthorDate: Wed Jul 1 21:26:45 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Jul 1 23:44:43 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: sd Change-Id: I4a7a3771890e3b7f782954a1bdce9e55db99739c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97656 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h index 724bd3987fa3..5af7cdd1fd36 100644 --- a/sd/inc/strmname.h +++ b/sd/inc/strmname.h @@ -23,12 +23,12 @@ #include // PowerPoint-Filter -static const OUString pFilterPowerPoint97( "MS PowerPoint 97" ); -static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" ); -static const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" ); +const OUString pFilterPowerPoint97( "MS PowerPoint 97" ); +const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" ); +const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" ); // XML content stream -static const OUString pStarDrawXMLContent( "content.xml" ); +const OUString pStarDrawXMLContent( "content.xml" ); #endif // INCLUDED_SD_INC_STRMNAME_H diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 39b59ca30ed6..899912028ea2 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -888,11 +888,11 @@ void SdPage::CreateTitl
[Libreoffice-commits] core.git: scripting/source
scripting/source/basprov/basprov.cxx |2 +-
scripting/source/dlgprov/dlgprov.cxx |4 ++--
scripting/source/provider/MasterScriptProvider.cxx |2 +-
scripting/source/provider/URIHelper.cxx|8
scripting/source/stringresource/stringresource.cxx |4 ++--
scripting/source/vbaevents/eventhelper.cxx |4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 9c6100c26a295bba568f89b2eb0ade104ddb2069
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 21:24:52 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 23:43:58 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: scripting
Change-Id: Iee244e5b7f3f768d2e58165ae438824a1f1a0d0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97654
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/scripting/source/basprov/basprov.cxx
b/scripting/source/basprov/basprov.cxx
index 6c7ede60649f..bd1832ba98ba 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -492,7 +492,7 @@ namespace basprov
}
-static struct ::cppu::ImplementationEntry const s_component_entries [] =
+struct ::cppu::ImplementationEntry const s_component_entries [] =
{
{
create_BasicProviderImpl, getImplementationName_BasicProviderImpl,
diff --git a/scripting/source/dlgprov/dlgprov.cxx
b/scripting/source/dlgprov/dlgprov.cxx
index 2f120497cf28..2117982e7c39 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -593,7 +593,7 @@ namespace dlgprov
// XDialogProvider
-static const char aDecorationPropName[] = "Decoration";
+const char aDecorationPropName[] = "Decoration";
Reference < XControl > DialogProviderImpl::createDialogImpl(
const OUString& URL, const Reference< XInterface >& xHandler,
@@ -735,7 +735,7 @@ namespace dlgprov
}
-static struct ::cppu::ImplementationEntry const s_component_entries [] =
+struct ::cppu::ImplementationEntry const s_component_entries [] =
{
{create_DialogProviderImpl,
getImplementationName_DialogProviderImpl,getSupportedServiceNames_DialogProviderImpl,
::cppu::createSingleComponentFactory,nullptr, 0},
{
&comp_DialogModelProvider::_create,&comp_DialogModelProvider::_getImplementationName,&comp_DialogModelProvider::_getSupportedServiceNames,&::cppu::createSingleComponentFactory,
nullptr, 0 },
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 0ed11a20348f..0f4429d2dd79 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -709,7 +709,7 @@ static OUString urihelper_getImplementationName( )
return "com.sun.star.script.provider.ScriptURIHelper";
}
-static const struct cppu::ImplementationEntry s_entries [] =
+const struct cppu::ImplementationEntry s_entries [] =
{
{
sp_create, sp_getImplementationName,
diff --git a/scripting/source/provider/URIHelper.cxx
b/scripting/source/provider/URIHelper.cxx
index 1497df6b92a8..f9c07a741b64 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -35,13 +35,13 @@ namespace ucb = ::com::sun::star::ucb;
namespace lang = ::com::sun::star::lang;
namespace uri = ::com::sun::star::uri;
-static const char SHARE[] = "share";
+const char SHARE[] = "share";
-static const char SHARE_UNO_PACKAGES_URI[] =
+const char SHARE_UNO_PACKAGES_URI[] =
"vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE";
-static const char USER[] = "user";
-static const char USER_URI[] =
+const char USER[] = "user";
+const char USER_URI[] =
"vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE( "bootstrap") "::UserInstallation}";
diff --git a/scripting/source/stringresource/stringresource.cxx
b/scripting/source/stringresource/stringresource.cxx
index 4d4bcb1c045e..dc8b38466416 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -697,7 +697,7 @@ Sequence< OUString >
StringResourcePersistenceImpl::getSupportedServiceNames( )
// XInitialization base functionality for derived classes
-static const char aNameBaseDefaultStr[] = "strings";
+const char aNameBaseDefaultStr[] = "strings";
void StringResourcePersistenceImpl::implInitializeCommonParameters
( const Sequence< Any >& aArguments )
@@ -2656,7 +2656,7 @@ const Reference< ucb::XSimpleFileAccess3 > &
StringResourceWithLocationImpl::get
// component export operations
-static const struct ::cppu::ImplementationEntry s_component_entries [] =
+const struct ::cppu::ImplementationEntry s_component_entries [] =
{
{
create_StringResourceImpl, getImplementationName_StringResourceImpl,
diff --git a/scriptin
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 13 + 1 file changed, 13 insertions(+) New commits: commit d604b828b93b41758d81bf79921ca43bcea7bbd6 Author: Marco Pinto AuthorDate: Fri Jun 26 08:57:58 2020 +0200 Commit: Aron Budea CommitDate: Wed Jul 1 23:12:23 2020 +0200 [pt-PT] Added 13 autocorrect words Change-Id: Id20f9c7b22f7255b8fe4598dcb884edb4f11fd53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97140 Tested-by: Jenkins Reviewed-by: Aron Budea diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index b22562211a22..7a8e5e678270 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -71,6 +71,7 @@ + @@ -416,6 +417,8 @@ + + @@ -563,6 +566,7 @@ + @@ -1158,6 +1162,8 @@ + + @@ -1344,6 +1350,7 @@ + @@ -1399,6 +1406,7 @@ + @@ -1486,6 +1494,7 @@ + @@ -2102,6 +2111,8 @@ + + @@ -2264,6 +2275,8 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sfx2/source
desktop/source/lib/init.cxx | 12
sfx2/source/control/unoctitm.cxx | 15 +--
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 5a08b856e5a5f722e6b49d2e5e526593a4ad65de
Author: Aron Budea
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit: Aron Budea
CommitDate: Wed Jul 1 23:03:04 2020 +0200
Send various state changes to LOK
Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865
Tested-by: Jenkins
Reviewed-by: Aron Budea
(cherry picked from commit f2e059ca3b1d55c721c6a698e6761536534224ba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97585
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9bd636910959..29439f85912c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2669,6 +2669,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertRowsAfter"),
OUString(".uno:InsertColumnsBefore"),
OUString(".uno:InsertColumnsAfter"),
+OUString(".uno:MergeCells"),
OUString(".uno:DeleteRows"),
OUString(".uno:DeleteColumns"),
OUString(".uno:DeleteTable"),
@@ -2717,9 +2718,20 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertPageHeader"),
OUString(".uno:InsertPageFooter"),
OUString(".uno:OnlineAutoFormat"),
+OUString(".uno:InsertObjectChart"),
+OUString(".uno:InsertSection"),
+OUString(".uno:InsertAnnotation"),
+OUString(".uno:InsertPagebreak"),
+OUString(".uno:InsertColumnBreak"),
+OUString(".uno:HyperlinkDialog"),
OUString(".uno:InsertSymbol"),
OUString(".uno:EditRegion"),
OUString(".uno:ThesaurusDialog"),
+OUString(".uno:FormatArea"),
+OUString(".uno:FormatLine"),
+OUString(".uno:FormatColumns"),
+OUString(".uno:Watermark"),
+OUString(".uno:ResetAttributes"),
OUString(".uno:Orientation"),
OUString(".uno:ObjectAlignLeft"),
OUString(".uno:ObjectAlignRight"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 693e11746349..5d7ed29ac9f7 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1070,6 +1070,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "InsertRowsAfter" ||
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "InsertObjectChart" ||
+ aEvent.FeatureURL.Path == "InsertSection" ||
+ aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "InsertPagebreak" ||
+ aEvent.FeatureURL.Path == "InsertColumnBreak" ||
+ aEvent.FeatureURL.Path == "HyperlinkDialog" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
aEvent.FeatureURL.Path == "InsertPage" ||
aEvent.FeatureURL.Path == "DeletePage" ||
@@ -1124,8 +1131,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "OutlineRight" ||
aEvent.FeatureURL.Path == "OutlineLeft" ||
aEvent.FeatureURL.Path == "OutlineDown" ||
- aEvent.FeatureURL.Path == "OutlineUp")
-
+ aEvent.FeatureURL.Path == "OutlineUp" ||
+ aEvent.FeatureURL.Path == "FormatArea" ||
+ aEvent.FeatureURL.Path == "FormatLine" ||
+ aEvent.FeatureURL.Path == "FormatColumns" ||
+ aEvent.FeatureURL.Path == "Watermark" ||
+ aEvent.FeatureURL.Path == "ResetAttributes")
{
aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") :
OUStringLiteral("disabled"));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source
vcl/source/window/toolbox.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit f0daeb39aa61cc3435630cf0b9727f6da818de1a
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 16:42:35 2020 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 1 22:51:34 2020 +0200
tdf#130991 Scale the drop-down arrow size-request
When requesting the size of the drop-down arrow button, the arrow
rect must be scaled, like all other native size requests.
Change-Id: Ic0ccd96e812527c880868d385484655526ebb09b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97536
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
(cherry picked from commit ba956e60a868e98d22bc95efd041f423987e7f76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97576
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 543e1b507c50..02600732c747 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1354,20 +1354,22 @@ static void ImplAddButtonBorder( long &rWidth, long&
rHeight, bool bNativeButton
bool ToolBox::ImplCalcItem()
{
-
// recalc required ?
if ( !mbCalc )
return false;
ImplDisableFlatButtons();
+OutputDevice *pDefault = Application::GetDefaultDevice();
+float fScaleFactor = pDefault ? pDefault->GetDPIScaleFactor() : 1.0;
+
longnDefWidth;
longnDefHeight;
longnMaxWidth = 0;
longnMaxHeight = 0;
longnMinWidth = 6;
longnMinHeight = 6;
-longnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
+longnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH * fScaleFactor;
#ifdef IOS
nDropDownArrowWidth *= 3;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.cxx |4 ++--
scaddins/source/datefunc/datefunc.cxx |2 +-
scaddins/source/pricing/pricing.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 93ef2735b847b1277793b267373878ccef1b581c
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 21:16:41 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 22:37:08 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: scaddins
Change-Id: Ib3e2cdac213e59b8906aa42c90a7665b73c10b93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97653
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index 2669a00c2633..36a3012c046a 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -272,7 +272,7 @@ OUString SAL_CALL AnalysisAddIn::getArgumentDescription(
const OUString& aName,
return aRet;
}
-static const char pDefCatName[] = "Add-In";
+const char pDefCatName[] = "Add-In";
OUString SAL_CALL AnalysisAddIn::getProgrammaticCategoryName( const OUString&
aName )
{
@@ -321,7 +321,7 @@ OUString SAL_CALL AnalysisAddIn::getDisplayCategoryName(
const OUString& aProgra
static const char* pLang[] = { "de", "en" };
static const char* pCoun[] = { "DE", "US" };
-static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang);
+const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang);
void AnalysisAddIn::InitDefLocales()
{
diff --git a/scaddins/source/datefunc/datefunc.cxx
b/scaddins/source/datefunc/datefunc.cxx
index f47b9b74a3dd..41e7437b883c 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -126,7 +126,7 @@ ScaDateAddIn::ScaDateAddIn()
static const char* pLang[] = { "de", "en" };
static const char* pCoun[] = { "DE", "US" };
-static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
+const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaDateAddIn::InitDefLocales()
{
diff --git a/scaddins/source/pricing/pricing.cxx
b/scaddins/source/pricing/pricing.cxx
index 32f4414dd0a0..4781baa9babe 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -132,7 +132,7 @@ ScaPricingAddIn::~ScaPricingAddIn()
static const char* pLang[] = { "de", "en" };
static const char* pCoun[] = { "DE", "US" };
-static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
+const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS( pLang );
void ScaPricingAddIn::InitDefLocales()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/expatwrap/sax_expat.cxx |2 +-
sax/source/tools/converter.cxx | 12 ++--
sax/source/tools/fastserializer.cxx | 18 +-
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 5e3241cf1659a441af28f1e1adc8da2719e7cb85
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 19:54:23 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 21:29:44 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sax
Change-Id: I9f6a90d41d33350d0ebb72b1bf67527d24ab1dd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97649
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index b80ebf033782..439166cb5641 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -140,7 +140,7 @@ struct Entity
};
-static constexpr OUStringLiteral gsCDATA = "CDATA";
+constexpr OUStringLiteral gsCDATA = "CDATA";
class SaxExpatParser_Impl
{
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 1f070e0260e1..cea2c41e9caf 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -42,11 +42,11 @@ using namespace ::com::sun::star::i18n;
namespace sax {
-static const char* const gpsMM = "mm";
-static const char* const gpsCM = "cm";
-static const char* const gpsPT = "pt";
-static const char* const gpsINCH = "in";
-static const char* const gpsPC = "pc";
+const char* const gpsMM = "mm";
+const char* const gpsCM = "cm";
+const char* const gpsPT = "pt";
+const char* const gpsINCH = "in";
+const char* const gpsPC = "pc";
const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 14;
@@ -492,7 +492,7 @@ bool Converter::convertColor( sal_Int32& rColor, const
OUString& rValue )
return true;
}
-static const char aHexTab[] = "0123456789abcdef";
+const char aHexTab[] = "0123456789abcdef";
/** convert color to string */
void Converter::convertColor( OUStringBuffer& rBuffer, sal_Int32 nColor )
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index 202641999b78..792784eb2a9c 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -42,15 +42,15 @@ using ::com::sun::star::io::XOutputStream;
// number of characters without terminating 0
#define N_CHARS(string) (SAL_N_ELEMENTS(string) - 1)
-static const char sClosingBracket[] = ">";
-static const char sSlashAndClosingBracket[] = "/>";
-static const char sColon[] = ":";
-static const char sOpeningBracket[] = "<";
-static const char sOpeningBracketAndSlash[] = "\n";
+const char sClosingBracket[] = ">";
+const char sSlashAndClosingBracket[] = "/>";
+const char sColon[] = ":";
+const char sOpeningBracket[] = "<";
+const char sOpeningBracketAndSlash[] = "\n";
namespace sax_fastparser {
FastSaxSerializer::FastSaxSerializer( const css::uno::Reference<
css::io::XOutputStream >& xOutputStream )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/bigrange.hxx|4 sc/source/core/data/colorscale.cxx |2 sc/source/core/data/docpool.cxx|2 sc/source/core/data/dpdimsave.cxx |2 sc/source/core/data/sheetevents.cxx|2 sc/source/core/opencl/formulagroupcl.cxx |2 sc/source/core/tool/autoform.cxx |2 sc/source/core/tool/consoli.cxx|2 sc/source/core/tool/interpr1.cxx |4 sc/source/filter/excel/xeformula.cxx |2 sc/source/filter/excel/xepivot.cxx |2 sc/source/filter/excel/xiescher.cxx|2 sc/source/filter/excel/xlchart.cxx |4 sc/source/filter/excel/xlescher.cxx|2 sc/source/filter/excel/xlformula.cxx | 22 sc/source/filter/excel/xlroot.cxx |4 sc/source/filter/excel/xlstyle.cxx | 70 +- sc/source/filter/excel/xltools.cxx | 20 sc/source/filter/html/htmlexp.cxx | 10 sc/source/filter/oox/formulabase.cxx | 22 sc/source/filter/oox/numberformatsbuffer.cxx | 250 +- sc/source/filter/oox/pagesettings.cxx | 14 sc/source/filter/oox/stylesbuffer.cxx |2 sc/source/filter/oox/worksheethelper.cxx |2 sc/source/filter/qpro/qproform.cxx |2 sc/source/filter/xcl97/xcl97rec.cxx|4 sc/source/filter/xml/XMLCodeNameProvider.cxx |4 sc/source/filter/xml/XMLConverter.cxx |2 sc/source/filter/xml/XMLStylesExportHelper.cxx | 20 sc/source/filter/xml/xmlexprt.cxx |2 sc/source/filter/xml/xmlimprt.cxx |6 sc/source/filter/xml/xmlstyli.cxx |8 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx|6 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |2 sc/source/ui/app/msgpool.cxx |2 sc/source/ui/app/rfindlst.cxx |2 sc/source/ui/cctrl/tbzoomsliderctrl.cxx|2 sc/source/ui/dbgui/asciiopt.cxx|4 sc/source/ui/dbgui/dpgroupdlg.cxx |4 sc/source/ui/dbgui/imoptdlg.cxx|2 sc/source/ui/dbgui/pvfundlg.cxx|2 sc/source/ui/dbgui/scuiasciiopt.cxx|2 sc/source/ui/docshell/docsh.cxx| 38 - sc/source/ui/docshell/impex.cxx|2 sc/source/ui/navipi/content.cxx|4 sc/source/ui/navipi/navipi.cxx |2 sc/source/ui/optdlg/tpusrlst.cxx |2 sc/source/ui/unoobj/condformatuno.cxx | 12 sc/source/ui/unoobj/dispuno.cxx|4 sc/source/ui/unoobj/styleuno.cxx |2 sc/source/ui/unoobj/targuno.cxx|2 sc/source/ui/vba/vbaassistant.cxx |2 sc/source/ui/vba/vbaborders.cxx| 12 sc/source/ui/vba/vbadialog.cxx |2 sc/source/ui/vba/vbainterior.cxx |6 sc/source/ui/vba/vbapalette.cxx|2 sc/source/ui/vba/vbarange.cxx | 22 sc/source/ui/vba/vbastyle.cxx |2 sc/source/ui/view/olinewin.cxx |2 sc/source/ui/view/output.cxx |4 sc/source/ui/view/viewdata.cxx |2 61 files changed, 325 insertions(+), 325 deletions(-) New commits: commit 45170005287b7f1c9610684b3d5913a356b0f4e1 Author: Stephan Bergmann AuthorDate: Wed Jul 1 19:56:24 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Jul 1 21:23:34 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: sc Change-Id: Ie2d2d26bac69f4b228eadef712b06b665b3974eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97650 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index fef2443b1461..13
[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-6.2' - source/tr
source/tr/officecfg/registry/data/org/openoffice/Office/UI.po | 14 +- source/tr/sfx2/messages.po|6 +--- 2 files changed, 9 insertions(+), 11 deletions(-) New commits: commit 3f1238d044c7f9e383e6df3e1b14d6ab16ccf5ee Author: Muhammet Kara AuthorDate: Wed Jul 1 19:38:02 2020 +0300 Commit: Muhammet Kara CommitDate: Wed Jul 1 22:21:32 2020 +0300 l10n: Turkish translation update (redaction) Change-Id: Id734f5992ef0dd24c9075eb94dd8d956a843470e diff --git a/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po b/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po index dec57436a4c..72f409fbacb 100644 --- a/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po +++ b/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po @@ -10662,7 +10662,7 @@ msgctxt "" "UIName\n" "value.text" msgid "Redaction" -msgstr "" +msgstr "Redaksiyon" #: Effects.xcu msgctxt "" @@ -20735,7 +20735,7 @@ msgctxt "" "Label\n" "value.text" msgid "Redact" -msgstr "" +msgstr "Arındır" #: GenericCommands.xcu msgctxt "" @@ -20744,7 +20744,7 @@ msgctxt "" "ContextLabel\n" "value.text" msgid "Redact" -msgstr "" +msgstr "Arındır" #: GenericCommands.xcu msgctxt "" @@ -20753,7 +20753,7 @@ msgctxt "" "TooltipLabel\n" "value.text" msgid "Redact Document" -msgstr "" +msgstr "Belgeyi Arındır" #: GenericCommands.xcu msgctxt "" @@ -20762,7 +20762,7 @@ msgctxt "" "Label\n" "value.text" msgid "Auto-Redact" -msgstr "" +msgstr "Otomatik Arındır" #: GenericCommands.xcu msgctxt "" @@ -20771,7 +20771,7 @@ msgctxt "" "ContextLabel\n" "value.text" msgid "Auto-Redact" -msgstr "" +msgstr "Otomatik Arındır" #: GenericCommands.xcu msgctxt "" @@ -20780,7 +20780,7 @@ msgctxt "" "TooltipLabel\n" "value.text" msgid "Auto-Redact Document" -msgstr "" +msgstr "Belgeyi Otomatik Arındır" #: GenericCommands.xcu msgctxt "" diff --git a/source/tr/sfx2/messages.po b/source/tr/sfx2/messages.po index ed2a6bd6810..f60af652bd8 100644 --- a/source/tr/sfx2/messages.po +++ b/source/tr/sfx2/messages.po @@ -2020,7 +2020,7 @@ msgstr "" #: sfx2/uiconfig/ui/autoredactdialog.ui:200 msgctxt "menuassignpage|contentslabel" msgid "_Redaction Targets" -msgstr "" +msgstr "_Redaksiyon Hedefleri" #: sfx2/uiconfig/ui/autoredactdialog.ui:219 msgctxt "autoredactdialog|btnLoadTargets" @@ -2035,16 +2035,14 @@ msgstr "Hedefleri Kaydet" #: sfx2/uiconfig/ui/autoredactdialog.ui:270 msgctxt "autoredactdialog|add" msgid "Add" -msgstr "" +msgstr "Ekle" #: sfx2/uiconfig/ui/autoredactdialog.ui:283 -#, fuzzy msgctxt "autoredactdialog|edit" msgid "Edit" msgstr "Düzenle" #: sfx2/uiconfig/ui/autoredactdialog.ui:296 -#, fuzzy msgctxt "autoredactdialog|delete" msgid "Delete" msgstr "Sil" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: remotebridges/source
remotebridges/source/unourl_resolver/unourl_resolver.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e50b9ca808e668d1f55d6b2dc517e6221fe1df7
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 16:20:29 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 21:22:10 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: remotebridges
Change-Id: I0204c51f456aa500d9132d4fa4fd877df0c2c442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97634
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index d4eea66c0269..fee9e0dbdf78 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -141,7 +141,7 @@ static Reference< XInterface > ResolverImpl_create( const
Reference< XComponentC
using namespace unourl_resolver;
-static const struct ImplementationEntry g_entries[] =
+const struct ImplementationEntry g_entries[] =
{
{
ResolverImpl_create, resolver_getImplementationName,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d7283c7874e18f4e42085ef4a97fda4c69bb225 Author: Muhammet Kara AuthorDate: Wed Jul 1 22:21:56 2020 +0300 Commit: Gerrit Code Review CommitDate: Wed Jul 1 21:21:56 2020 +0200 Update git submodules * Update translations from branch 'distro/collabora/cp-6.2' to 3f1238d044c7f9e383e6df3e1b14d6ab16ccf5ee - l10n: Turkish translation update (redaction) Change-Id: Id734f5992ef0dd24c9075eb94dd8d956a843470e diff --git a/translations b/translations index cda1ee131f39..3f1238d044c7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit cda1ee131f39a4f8329749ff1ca4aa1022422b03 +Subproject commit 3f1238d044c7f9e383e6df3e1b14d6ab16ccf5ee ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/source
registry/source/keyimpl.cxx |2 +-
registry/source/reflread.cxx |4 ++--
registry/source/reflwrit.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 21a30e3f1172bef710ca017558dca670f0790013
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 16:19:06 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 21:14:48 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: registry
Change-Id: Id96932c7944b5136f5fa7b5f698b8bb3b616e9ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97633
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx
index e14a88ec2576..f3cb2d00b34e 100644
--- a/registry/source/keyimpl.cxx
+++ b/registry/source/keyimpl.cxx
@@ -32,7 +32,7 @@
using namespace store;
-namespace { static char const VALUE_PREFIX[] = "$VL_"; }
+namespace { char const VALUE_PREFIX[] = "$VL_"; }
// ORegKey()
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 89c9cbf9c35a..57884e110075 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -37,8 +37,8 @@
#include
-static const char NULL_STRING[1] = { 0 };
-static const sal_Unicode NULL_WSTRING[1] = { 0 };
+const char NULL_STRING[1] = { 0 };
+const sal_Unicode NULL_WSTRING[1] = { 0 };
const sal_uInt32magic = 0x12345678;
const sal_uInt16 minorVersion = 0x;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 48d28ab8766b..04be2db6e702 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -44,7 +44,7 @@ OString toByteString(rtl_uString const * str) {
}
-static const sal_Unicode NULL_WSTRING[1] = { 0 };
+const sal_Unicode NULL_WSTRING[1] = { 0 };
#define BLOP_OFFSET_MAGIC 0
#define BLOP_OFFSET_SIZE(BLOP_OFFSET_MAGIC + sizeof(sal_uInt32))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/uibase/sidebar/TableEditPanel.cxx | 24 ++--
1 file changed, 10 insertions(+), 14 deletions(-)
New commits:
commit c4eb732bc38156d2d6c373c6ce3520eecf323d32
Author: Caolán McNamara
AuthorDate: Tue Jun 30 20:05:30 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 1 21:13:25 2020 +0200
Related: tdf#134360 table row/height widgets can get stuck insensitive
Change-Id: I1be53f33f60c510757c67f1da8f863539ecbffdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97573
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 4d76cc0878dd..46f75cd9a9d6 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -45,6 +45,9 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID,
const SfxItemState
{
case SID_ATTR_TABLE_ROW_HEIGHT:
{
+bool bDisabled = eState == SfxItemState::DISABLED;
+m_xRowHeightEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast(pState);
@@ -55,18 +58,16 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16
nSID, const SfxItemState
m_xRowHeightEdit->set_value(nNewHeight, FieldUnit::TWIP);
}
}
-else if (eState == SfxItemState::DISABLED)
-{
-m_xRowHeightEdit->set_sensitive(false);
-}
-else
-{
+else if (eState != SfxItemState::DISABLED)
m_xRowHeightEdit->set_text("");
-}
+
break;
}
case SID_ATTR_TABLE_COLUMN_WIDTH:
{
+bool bDisabled = eState == SfxItemState::DISABLED;
+m_xColumnWidthEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast(pState);
@@ -77,14 +78,9 @@ void TableEditPanel::NotifyItemUpdate(const sal_uInt16 nSID,
const SfxItemState
m_xColumnWidthEdit->set_value(nNewWidth, FieldUnit::TWIP);
}
}
-else if (eState == SfxItemState::DISABLED)
-{
-m_xColumnWidthEdit->set_sensitive(false);
-}
-else
-{
+else if (eState != SfxItemState::DISABLED)
m_xColumnWidthEdit->set_text("");
-}
+
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/source
include/vcl/fmtfield.hxx| 229
include/vcl/formatter.hxx | 261 ++
solenv/clang-format/blacklist |1
vcl/inc/salvtables.hxx |2
vcl/source/app/salvtables.cxx | 10
vcl/source/control/fmtfield.cxx | 569 +---
6 files changed, 583 insertions(+), 489 deletions(-)
New commits:
commit 175eba0d87cc0d4693920341077617ef443809b4
Author: Caolán McNamara
AuthorDate: Wed Jul 1 15:49:57 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 1 21:12:51 2020 +0200
split Formatter part of FormattedField from SpinButton part
Change-Id: Ic1454d63a17bd3ec1d70cd5eef5895aee2d919ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97642
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index be6c82ff003a..08fc7d9174f8 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -20,147 +20,15 @@
#ifndef INCLUDED_VCL_FMTFIELD_HXX
#define INCLUDED_VCL_FMTFIELD_HXX
-#include
+#include
#include
-#include
-
-class SvNumberFormatter;
-
-namespace validation { class NumberValidator; }
-
-enum class FORMAT_CHANGE_TYPE
-{
-KEYONLY = 0x00,// only a new key was set
-FORMATTER = 0x01,// a new formatter was set, usually
implies a change of the key, too
-PRECISION = 0x02,// a new precision was set
-THOUSANDSSEP = 0x03,// the thousands separator setting changed
-CURRENCY_SYMBOL = 0x10,
-CURRSYM_POSITION = 0x20,
-};
-
class VCL_DLLPUBLIC FormattedField : public SpinField
+ , public Formatter
{
-private:
-// A SvNumberFormatter is very expensive (regarding time and space), it is
a Singleton
-class StaticFormatter
-{
-static SvNumberFormatter* s_cFormatter;
-static sal_uLongs_nReferences;
-public:
-StaticFormatter();
-~StaticFormatter();
-
-operator SvNumberFormatter* () { return GetFormatter(); }
-UNLESS_MERGELIBS(VCL_DLLPUBLIC) static SvNumberFormatter*
GetFormatter();
-};
-
-protected:
-OUString m_sLastValidText;
-// Has nothing to do with the current value. It is the last text, which
was valid at input (checked by CheckText,
-// not yet through formatter)
-Selection m_aLastSelection;
-
-double m_dMinValue;
-double m_dMaxValue;
-boolm_bHasMin : 1;
-boolm_bHasMax : 1;
-
-boolm_bWrapOnLimits : 1;
-boolm_bStrictFormat : 1;
-
-boolm_bEnableEmptyField : 1;
-boolm_bAutoColor : 1;
-boolm_bEnableNaN : 1;
-boolm_bDisableRemainderFactor : 1;
-enum valueState { valueDirty, valueString, valueDouble };
-valueState m_ValueState;
-double m_dCurrentValue;
-double m_dDefaultValue;
-
-sal_uLong m_nFormatKey;
-SvNumberFormatter* m_pFormatter;
-StaticFormatter m_aStaticFormatter;
-
-double m_dSpinSize;
-double m_dSpinFirst;
-double m_dSpinLast;
-
-// There is a difference, when text formatting is enabled, if LostFocus
formats the current String and displays it,
-// or if a double is created from the String and then
-boolm_bTreatAsNumber;
-// And with the following members we can use it for formatted text output
as well ...
-OUStringm_sCurrentTextValue;
-OUStringm_sDefaultText;
-
-// The last color from the Formatter at the last output operation (not we
would use it, but you can get it)
-Color* m_pLastOutputColor;
-
-boolm_bUseInputStringForFormatting;
-
public:
FormattedField(vcl::Window* pParent, WinBits nStyle);
-// Min-/Max-management
-boolHasMinValue() const { return m_bHasMin; }
-voidClearMinValue() { m_bHasMin = false; }
-voidSetMinValue(double dMin);
-double GetMinValue() const { return m_dMinValue; }
-
-boolHasMaxValue() const { return m_bHasMax; }
-voidClearMaxValue() { m_bHasMax = false; }
-voidSetMaxValue(double dMax);
-double GetMaxValue() const { return m_dMaxValue; }
-
-// Current value
-voidSetValue(double dVal);
-double GetValue();
-// The default implementation uses a formatter, if available
-
-voidSetTextValue(const OUString& rText);
-// The String is transformed to a double (with a formatter) and SetValue
is called afterwards
-//
-voidSetValueFromString(const OUString& rStr);
-
-boolIsEmptyFieldEnabled() const { return m_bEnableEmptyField; }
-voidEnableEm
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java |
7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 03093a91b64fea9852704f49cd20d162784ca748
Author: Michael Weghorn
AuthorDate: Wed Jul 1 16:06:33 2020 +0200
Commit: Michael Weghorn
CommitDate: Wed Jul 1 20:16:13 2020 +0200
tdf#134405 android: Add null check
Without it, Android Viewer crashes in experimental editing
mode when e.g. opening the sample doc and clicking into the
text area.
E AndroidRuntime: FATAL EXCEPTION: main
E AndroidRuntime: Process: org.libreoffice, PID: 6152
E AndroidRuntime: java.lang.NullPointerException: Attempt to read from
field 'float android.graphics.RectF.left' on a null object reference
E AndroidRuntime:at
org.mozilla.gecko.gfx.RectUtils.scale(RectUtils.java:45)
E AndroidRuntime:at
org.libreoffice.overlay.DocumentOverlayView.convertToScreen(DocumentOverlayView.java:194)
E AndroidRuntime:at
org.libreoffice.overlay.DocumentOverlayView.repositionWithViewport(DocumentOverlayView.java:184)
E AndroidRuntime:at
org.libreoffice.overlay.DocumentOverlayView.changeGraphicSelection(DocumentOverlayView.java:157)
E AndroidRuntime:at
org.libreoffice.overlay.DocumentOverlay$11.run(DocumentOverlay.java:199)
E AndroidRuntime:at
android.os.Handler.handleCallback(Handler.java:883)
E AndroidRuntime:at
android.os.Handler.dispatchMessage(Handler.java:100)
E AndroidRuntime:at android.os.Looper.loop(Looper.java:214)
E AndroidRuntime:at
android.app.ActivityThread.main(ActivityThread.java:7356)
E AndroidRuntime:at java.lang.reflect.Method.invoke(Native
Method)
E AndroidRuntime:at
com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:492)
E AndroidRuntime:at
com.android.internal.os.ZygoteInit.main(ZygoteInit.java:930)
Change-Id: Ibff148a5d83413b4eed8a054b0143c9dae4e5537
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97632
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java
b/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java
index b425fbb59ef2..086108cd903f 100644
--- a/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java
+++ b/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java
@@ -181,8 +181,11 @@ public class DocumentOverlayView extends View implements
View.OnTouchListener {
mCalcSelectionBox.reposition(rect);
}
-RectF scaledGraphicSelection =
convertToScreen(mGraphicSelection.mRectangle, x, y, zoom);
-mGraphicSelection.reposition(scaledGraphicSelection);
+if (mGraphicSelection != null && mGraphicSelection.mRectangle != null)
{
+RectF scaledGraphicSelection =
convertToScreen(mGraphicSelection.mRectangle, x, y, zoom);
+mGraphicSelection.reposition(scaledGraphicSelection);
+}
+
invalidate();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/qt5
vcl/qt5/Qt5Graphics_Controls.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 499ea815432eee3d0555aae96927c2568dbaf5d5
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 17:03:53 2020 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 1 20:10:00 2020 +0200
tdf#134054 Qt5 really scale the toolbox button
I missed that code in the HiDPI patch. Instead of some fixed 25px
size, use the real content size and ask the QStyle for the real
size.
Change-Id: I227190baab2c1716aa40ef6d16d55dbded0830cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97538
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 36a95b632173d1131c9da5737d2e2958eb4594ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97577
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index ee7b43d86d86..6f54e6f189ea 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -935,8 +935,12 @@ bool
Qt5Graphics_Controls::getNativeControlRegion(ControlType type, ControlPart
}
else if (part == ControlPart::Button)
{
-contentRect = QRect(boundingRect.left(), boundingRect.top(),
-upscale(25, Round::Ceil), upscale(25,
Round::Ceil));
+QStyleOptionToolButton option;
+option.arrowType = Qt::NoArrow;
+option.features = QStyleOptionToolButton::None;
+option.rect = downscale(QRect({ 0, 0 }, contentRect.size()));
+contentRect = upscale(
+subControlRect(QStyle::CC_ToolButton, &option,
QStyle::SC_ToolButton));
boundingRect = contentRect;
retVal = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx | 12
sfx2/source/control/unoctitm.cxx | 15 +--
2 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit b0a3883a45edac3c8f9bccf6926b34d9da8f30e8
Author: Aron Budea
AuthorDate: Fri Apr 24 17:01:47 2020 +0200
Commit: Aron Budea
CommitDate: Wed Jul 1 20:02:10 2020 +0200
Send various state changes to LOK
Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865
Tested-by: Jenkins
Reviewed-by: Aron Budea
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8b86eb2e4b8f..eabca148f850 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2639,6 +2639,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertRowsAfter"),
OUString(".uno:InsertColumnsBefore"),
OUString(".uno:InsertColumnsAfter"),
+OUString(".uno:MergeCells"),
OUString(".uno:DeleteRows"),
OUString(".uno:DeleteColumns"),
OUString(".uno:DeleteTable"),
@@ -2687,9 +2688,20 @@ static void doc_iniUnoCommands ()
OUString(".uno:InsertPageHeader"),
OUString(".uno:InsertPageFooter"),
OUString(".uno:OnlineAutoFormat"),
+OUString(".uno:InsertObjectChart"),
+OUString(".uno:InsertSection"),
+OUString(".uno:InsertAnnotation"),
+OUString(".uno:InsertPagebreak"),
+OUString(".uno:InsertColumnBreak"),
+OUString(".uno:HyperlinkDialog"),
OUString(".uno:InsertSymbol"),
OUString(".uno:EditRegion"),
OUString(".uno:ThesaurusDialog"),
+OUString(".uno:FormatArea"),
+OUString(".uno:FormatLine"),
+OUString(".uno:FormatColumns"),
+OUString(".uno:Watermark"),
+OUString(".uno:ResetAttributes"),
OUString(".uno:Orientation"),
OUString(".uno:ObjectAlignLeft"),
OUString(".uno:ObjectAlignRight"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c9ae7b6e32fe..760376d7b767 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1070,6 +1070,13 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "InsertRowsAfter" ||
aEvent.FeatureURL.Path == "InsertColumnsBefore" ||
aEvent.FeatureURL.Path == "InsertColumnsAfter" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "InsertObjectChart" ||
+ aEvent.FeatureURL.Path == "InsertSection" ||
+ aEvent.FeatureURL.Path == "InsertAnnotation" ||
+ aEvent.FeatureURL.Path == "InsertPagebreak" ||
+ aEvent.FeatureURL.Path == "InsertColumnBreak" ||
+ aEvent.FeatureURL.Path == "HyperlinkDialog" ||
aEvent.FeatureURL.Path == "InsertSymbol" ||
aEvent.FeatureURL.Path == "InsertPage" ||
aEvent.FeatureURL.Path == "DeletePage" ||
@@ -1124,8 +1131,12 @@ static void InterceptLOKStateChangeEvent(sal_uInt16
nSID, SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "OutlineRight" ||
aEvent.FeatureURL.Path == "OutlineLeft" ||
aEvent.FeatureURL.Path == "OutlineDown" ||
- aEvent.FeatureURL.Path == "OutlineUp")
-
+ aEvent.FeatureURL.Path == "OutlineUp" ||
+ aEvent.FeatureURL.Path == "FormatArea" ||
+ aEvent.FeatureURL.Path == "FormatLine" ||
+ aEvent.FeatureURL.Path == "FormatColumns" ||
+ aEvent.FeatureURL.Path == "Watermark" ||
+ aEvent.FeatureURL.Path == "ResetAttributes")
{
aBuffer.append(aEvent.IsEnabled ? OUStringLiteral("enabled") :
OUStringLiteral("disabled"));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/misc/reportformula.cxx |4 ++--
reportdesign/source/filter/xml/xmlStyleImport.cxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 70246cf9c6fc36ae2f669eb349b795de2543968a
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 16:44:40 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 19:51:12 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: reportdesign
Change-Id: Ia5047d90b14e886f5ba8de805462ca9b946ad65a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97635
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/reportdesign/source/core/misc/reportformula.cxx
b/reportdesign/source/core/misc/reportformula.cxx
index b035493e6e42..5cd19dc4d55c 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -27,8 +27,8 @@ namespace rptui
namespace
{
-static const char sExpressionPrefix[] = "rpt:";
-static const char sFieldPrefix[] = "field:";
+const char sExpressionPrefix[] = "rpt:";
+const char sFieldPrefix[] = "field:";
}
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx
b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index edb20e072bfc..6d8148311ccc 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -143,10 +143,10 @@ void OControlStyleContext::SetAttribute( sal_uInt16
nPrefixKey,
}
-static const OUStringLiteral g_sTableStyleFamilyName(
XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME );
-static const OUStringLiteral g_sColumnStyleFamilyName(
XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME );
-static const OUStringLiteral g_sRowStyleFamilyName(
XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME );
-static const OUStringLiteral g_sCellStyleFamilyName(
XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME );
+const OUStringLiteral g_sTableStyleFamilyName(
XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME );
+const OUStringLiteral g_sColumnStyleFamilyName(
XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME );
+const OUStringLiteral g_sRowStyleFamilyName(
XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME );
+const OUStringLiteral g_sCellStyleFamilyName(
XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME );
OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
const bool bTempAutoStyles ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang solenv/clang-format solenv/CompilerTest_compilerplugins_clang.mk
compilerplugins/clang/external.cxx | 13 +++
compilerplugins/clang/externvar.cxx | 95 ---
compilerplugins/clang/test/external.cxx | 70 +++
compilerplugins/clang/test/external.hxx |7 -
compilerplugins/clang/test/externvar.cxx | 61 -
solenv/CompilerTest_compilerplugins_clang.mk |1
solenv/clang-format/blacklist|4 -
7 files changed, 84 insertions(+), 167 deletions(-)
New commits:
commit 631cec87e2da1925246e4a1902cec6f2952f939e
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 16:45:28 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 19:50:42 2020 +0200
loplugin:externvar is covered by loplugin:external
...so drop the former. But keep the relevant externvar tests by moving them
into compilerplugins/clang/test/external.cxx. (Which revealed one
difference
between the two plugins, regarding certain extern "C" variables in unnamed
namespaces, where Clang (and for that matter also e.g. GCC, it appears)
deliberately deviates from the Standard and considers them to have external
linkage. Add clarifying comments that loplugin:external keeps considering
these
as having internal linkage, following the Standard.)
Change-Id: I344fcd0135fdaf6bf08a4b396af2ed2299389a7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97639
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/external.cxx
b/compilerplugins/clang/external.cxx
index 6ec2cfdb1c8d..bc75237a15fd 100644
--- a/compilerplugins/clang/external.cxx
+++ b/compilerplugins/clang/external.cxx
@@ -471,8 +471,17 @@ private:
{
return true;
}
-//TODO: in some cases getLinkageInternal() appears to report
ExternalLinkage instead of
-// UniqueExternalLinkage:
+// In some cases getLinkageInternal() arguably wrongly reports
ExternalLinkage, see the
+// commit message of "DR1113: anonymous
namespaces formally give
+// their contents internal linkage":
+//
+// "We still deviate from the standard in one regard here: extern "C"
declarations
+// in anonymous namespaces are still granted external linkage.
Changing those does
+// not appear to have been an intentional consequence of the
standard change in
+// DR1113."
+//
+// Do not warn about such "wrongly external" declarations here:
if (decl->isInAnonymousNamespace())
{
return true;
diff --git a/compilerplugins/clang/externvar.cxx
b/compilerplugins/clang/externvar.cxx
deleted file mode 100644
index 05e9820d4da3..
--- a/compilerplugins/clang/externvar.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#ifndef LO_CLANG_SHARED_PLUGINS
-
-#include "check.hxx"
-#include "plugin.hxx"
-
-// Find variable declarations at namespace scope that need not have external
-// linkage.
-
-namespace {
-
-class ExternVar: public loplugin::FilteringPlugin
-{
-public:
-explicit ExternVar(loplugin::InstantiationData const & data):
FilteringPlugin(data)
-{}
-
-void run() override
-{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
-
-bool VisitVarDecl(VarDecl const * decl) {
-if (ignoreLocation(decl)) {
-return true;
-}
-if (decl->isStaticDataMember()) {
-return true;
-}
-if (!(decl->isFirstDecl()
- && compiler.getSourceManager().isInMainFile(decl->getLocation())
- && loplugin::hasExternalLinkage(decl)))
-{
-return true;
-}
-auto def = decl->getDefinition();
-if (def == nullptr) {
-// Code like
-//
-// namespace { extern int v; }
-// int f() { return sizeof(v); }
-//
-// is already handled by Clang itself with an error "variable 'v'
is
-// not needed and will not be emitted"
-return true;
-}
-if (loplugin::DeclCheck(def).Var("_pRawDllMain").GlobalNamespace()) {
-return true;
-}
-SourceLocation argLoc;
-if
(compiler.getSourceManager().isMacroArgExpansion(def->getLocation(), &argLoc)
-&& (Lexer::getImmediateMacroName(
-argLoc, compiler.getSourceManager(),
compiler.getLangOpts())
-== "DEFINE_GUID"))
-{
-
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/dump/dumperbase.hxx |4 -
oox/source/core/xmlfilterbase.cxx |2
oox/source/crypto/AgileEngine.cxx | 10 +--
oox/source/crypto/Standard2007Engine.cxx |2
oox/source/drawingml/chart/chartconverter.cxx |6 +-
oox/source/drawingml/chart/objectformatter.cxx| 62 +++---
oox/source/drawingml/chart/typegroupconverter.cxx |4 -
oox/source/drawingml/customshapegeometry.cxx |2
oox/source/drawingml/presetgeometrynames.cxx |2
oox/source/drawingml/shapepropertymap.cxx |2
oox/source/export/vmlexport.cxx |4 -
oox/source/helper/modelobjecthelper.cxx | 10 +--
oox/source/ole/oleobjecthelper.cxx|2
oox/source/ole/vbacontrol.cxx |2
oox/source/vml/vmlinputstream.cxx |4 -
15 files changed, 59 insertions(+), 59 deletions(-)
New commits:
commit 740d87c0cc833a8159d79100f789033750a8427c
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 13:24:37 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 19:50:18 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: oox
Change-Id: I1c6a2852e4794529ec7d55ceae485196a8170e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97617
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 6b9144646069..21e88b2fc2c7 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -384,7 +384,7 @@ public:
OUString operator()( const char* pcDefault ) const { if( has() ) return
*this; return String( pcDefault ); }
};
-static const String EMPTY_STRING;
+const String EMPTY_STRING;
/** Base class for all dumper classes.
@@ -733,7 +733,7 @@ private:
mutable NameListRef mxList;
};
-static const NameListWrapper NO_LIST;
+const NameListWrapper NO_LIST;
class ItemFormatMap
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 5c5d5e5076e5..17a12acde6e7 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -180,7 +180,7 @@ struct XmlFilterBaseImpl
explicitXmlFilterBaseImpl();
};
-static const OUStringLiteral gaBinSuffix( ".bin" );
+const OUStringLiteral gaBinSuffix( ".bin" );
XmlFilterBaseImpl::XmlFilterBaseImpl() :
mrNamespaceMap(StaticNamespaceMap::get())
diff --git a/oox/source/crypto/AgileEngine.cxx
b/oox/source/crypto/AgileEngine.cxx
index f4eb9d21ea6f..df3bf4bb19d8 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -187,11 +187,11 @@ public:
constexpr const sal_uInt32 constSegmentLength = 4096;
-static const std::vector constBlock1 { 0xfe, 0xa7, 0xd2, 0x76,
0x3b, 0x4b, 0x9e, 0x79 };
-static const std::vector constBlock2 { 0xd7, 0xaa, 0x0f, 0x6d,
0x30, 0x61, 0x34, 0x4e };
-static const std::vector constBlock3 { 0x14, 0x6e, 0x0b, 0xe7,
0xab, 0xac, 0xd0, 0xd6 };
-static const std::vector constBlockHmac1 { 0x5f, 0xb2, 0xad, 0x01,
0x0c, 0xb9, 0xe1, 0xf6 };
-static const std::vector constBlockHmac2 { 0xa0, 0x67, 0x7f, 0x02,
0xb2, 0x2c, 0x84, 0x33 };
+const std::vector constBlock1 { 0xfe, 0xa7, 0xd2, 0x76, 0x3b, 0x4b,
0x9e, 0x79 };
+const std::vector constBlock2 { 0xd7, 0xaa, 0x0f, 0x6d, 0x30, 0x61,
0x34, 0x4e };
+const std::vector constBlock3 { 0x14, 0x6e, 0x0b, 0xe7, 0xab, 0xac,
0xd0, 0xd6 };
+const std::vector constBlockHmac1 { 0x5f, 0xb2, 0xad, 0x01, 0x0c,
0xb9, 0xe1, 0xf6 };
+const std::vector constBlockHmac2 { 0xa0, 0x67, 0x7f, 0x02, 0xb2,
0x2c, 0x84, 0x33 };
bool hashCalc(std::vector& output,
std::vector& input,
diff --git a/oox/source/crypto/Standard2007Engine.cxx
b/oox/source/crypto/Standard2007Engine.cxx
index 2aaf6f4ec3f3..2799ec5286f9 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -32,7 +32,7 @@ void lclRandomGenerateValues(sal_uInt8* aArray, sal_uInt32
aSize)
rtl_random_destroyPool(aRandomPool);
}
-static const OUString lclCspName = "Microsoft Enhanced RSA and AES
Cryptographic Provider";
+const OUString lclCspName = "Microsoft Enhanced RSA and AES Cryptographic
Provider";
constexpr const sal_uInt32 AES128Size = 16;
} // end anonymous namespace
diff --git a/oox/source/drawingml/chart/chartconverter.cxx
b/oox/source/drawingml/chart/chartconverter.cxx
index e75b1c09c866..a864aac47e47 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -40,9 +40,9 @@ using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-static const sal_Unicode API_TOKEN_ARRAY_OPEN = '{';
-static const sal_Unicode API_TOKEN_ARRAY_CLOSE = '}';
-static const sal_Unicode API_TOKEN_ARRAY_COLSEP= ';';
+const sal_Unicode API_TOKEN_ARRAY_OPEN = '{';
+co
[Libreoffice-commits] core.git: package/source
package/source/manifest/ManifestImport.cxx | 142 ++--- 1 file changed, 71 insertions(+), 71 deletions(-) New commits: commit 38cfe86259c63b0080d3f064dd0e7999d276 Author: Stephan Bergmann AuthorDate: Wed Jul 1 13:29:00 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Jul 1 19:49:56 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: package Change-Id: Ie183cb0d374e8d9a02891a765f46583f7cc1c345 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97618 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index cc7558f3b87f..9e3508361b56 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -34,77 +34,77 @@ using namespace com::sun::star; using namespace std; -static const OUStringLiteral gsFileEntryElement ( ELEMENT_FILE_ENTRY ); -static const OUStringLiteral gsEncryptionDataElement( ELEMENT_ENCRYPTION_DATA ); -static const OUStringLiteral gsAlgorithmElement ( ELEMENT_ALGORITHM ); -static const OUStringLiteral gsStartKeyAlgElement ( ELEMENT_START_KEY_GENERATION ); -static const OUStringLiteral gsKeyDerivationElement( ELEMENT_KEY_DERIVATION ); - -static const OUStringLiteral gsMediaTypeAttribute ( ATTRIBUTE_MEDIA_TYPE ); -static const OUStringLiteral gsVersionAttribute ( ATTRIBUTE_VERSION ); -static const OUStringLiteral gsFullPathAttribute( ATTRIBUTE_FULL_PATH ); -static const OUStringLiteral gsSizeAttribute( ATTRIBUTE_SIZE ); -static const OUStringLiteral gsSaltAttribute( ATTRIBUTE_SALT ); -static const OUStringLiteral gsInitialisationVectorAttribute ( ATTRIBUTE_INITIALISATION_VECTOR ); -static const OUStringLiteral gsIterationCountAttribute ( ATTRIBUTE_ITERATION_COUNT ); -static const OUStringLiteral gsKeySizeAttribute ( ATTRIBUTE_KEY_SIZE ); -static const OUStringLiteral gsAlgorithmNameAttribute ( ATTRIBUTE_ALGORITHM_NAME ); -static const OUStringLiteral gsStartKeyAlgNameAttribute ( ATTRIBUTE_START_KEY_GENERATION_NAME ); -static const OUStringLiteral gsKeyDerivationNameAttribute ( ATTRIBUTE_KEY_DERIVATION_NAME ); -static const OUStringLiteral gsChecksumAttribute( ATTRIBUTE_CHECKSUM ); -static const OUStringLiteral gsChecksumTypeAttribute( ATTRIBUTE_CHECKSUM_TYPE ); - -static const OUStringLiteral gsKeyInfoElement ( ELEMENT_ENCRYPTED_KEYINFO ); -static const OUStringLiteral gsManifestKeyInfoElement ( ELEMENT_MANIFEST_KEYINFO ); -static const OUStringLiteral gsEncryptedKeyElement ( ELEMENT_ENCRYPTEDKEY ); -static const OUStringLiteral gsEncryptionMethodElement ( ELEMENT_ENCRYPTIONMETHOD ); -static const OUStringLiteral gsPgpDataElement ( ELEMENT_PGPDATA ); -static const OUStringLiteral gsPgpKeyIDElement ( ELEMENT_PGPKEYID ); -static const OUStringLiteral gsPGPKeyPacketElement ( ELEMENT_PGPKEYPACKET ); -static const OUStringLiteral gsAlgorithmAttribute ( ATTRIBUTE_ALGORITHM ); -static const OUStringLiteral gsCipherDataElement( ELEMENT_CIPHERDATA ); -static const OUStringLiteral gsCipherValueElement ( ELEMENT_CIPHERVALUE ); - -static const OUStringLiteral gsManifestKeyInfoElement13 ( ELEMENT_MANIFEST13_KEYINFO ); -static const OUStringLiteral gsEncryptedKeyElement13 ( ELEMENT_ENCRYPTEDKEY13 ); -static const OUStringLiteral gsEncryptionMethodElement13 ( ELEMENT_ENCRYPTIONMETHOD13 ); -static const OUStringLiteral gsPgpDataElement13 ( ELEMENT_PGPDATA13 ); -static const OUStringLiteral gsPgpKeyIDElement13 ( ELEMENT_PGPKEYID13 ); -static const OUStringLiteral gsPGPKeyPacketElement13 ( ELEMENT_PGPKEYPACKET13 ); -static const OUStringLiteral gsAlgorithmAttribute13 ( ATTRIBUTE_ALGORITHM13 ); -static const OUStringLiteral gsCipherDataElement13( ELEMENT_CIPHERDATA13 ); -static const OUStringLiteral gsCipherValueElement13 ( ELEMENT_CIPHERVALUE13 ); - -static const OUStringLiteral gsFullPathProperty ( "FullPath" ); -static const OUStringLiteral gsMediaTypeProperty( "MediaType" ); -static const OUStringLiteral gsVersionProperty ( "Version" ); -static const OUStringLiteral gsIterationCountProperty ( "IterationCount" ); -static const OUStringLiteral gsDerivedKeySizeProperty ( "DerivedKeySize" ); -static const OUStringLiteral gsSaltProperty ( "Salt" ); -static const OUStringLiteral gsInitialisationVectorProperty ( "InitialisationVector" ); -static const OUStringLiteral gsSizeProperty ( "Size" ); -static const OUStringLiteral gsDigestProperty ( "Digest" ); -static const OUStringLiteral gsEncryptionAlgProperty( "EncryptionAlgorithm" ); -st
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - config_host/config_buildid.h.in configure.ac cui/source framework/source icon-themes/colibre include/sfx2 sfx2/source sfx2/uiconfig
config_host/config_buildid.h.in |1
configure.ac | 16
cui/source/dialogs/about.cxx |9 ++
cui/source/inc/about.hxx |1
framework/source/fwe/helper/titlehelper.cxx |7 ++
icon-themes/colibre/brand/intro-highres.png |binary
icon-themes/colibre/brand/intro.png |binary
icon-themes/colibre/brand/shell/logo.svg |2
icon-themes/colibre/brand/shell/logo_flavor.svg | 71 ++
icon-themes/colibre/brand/shell/logo_inverted.svg |2
include/sfx2/strings.hrc |1
sfx2/source/dialog/backingwindow.cxx | 12 +++
sfx2/source/dialog/backingwindow.hxx |2
sfx2/uiconfig/ui/startcenter.ui | 17 +
14 files changed, 138 insertions(+), 3 deletions(-)
New commits:
commit fd94276fbbd3632b2241133900b995d75f9b14fc
Author: Miklos Vajna
AuthorDate: Mon Jun 29 16:54:31 2020 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 1 19:38:59 2020 +0200
configure: add a --with-product-flavor switch
Defaults to Personal to point out this is supported by volunteers.
This affects the splash screen, the window title, the about dialog and
the start center.
(cherry picked from commit c540483134482d437ea6e02390ff429f4300cbb0)
Change-Id: I216a7f547618377ed268454ebfd2801c4c3901b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97638
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
index 04f03b83543a..d9663cb3f8f0 100644
--- a/config_host/config_buildid.h.in
+++ b/config_host/config_buildid.h.in
@@ -6,5 +6,6 @@ Optional Build ID displayed in the about dialog
#define CONFIG_BUILDID_H
#undef EXTRA_BUILDID
+#undef PRODUCTFLAVOR
#endif
diff --git a/configure.ac b/configure.ac
index 4243c7242120..e5591d3eabae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1481,6 +1481,11 @@ AC_ARG_WITH(product-name,
[Define the product name. Default is AC_PACKAGE_NAME.]),
,with_product_name=$PRODUCTNAME)
+AC_ARG_WITH(product-flavor,
+AS_HELP_STRING([--with-product-flavor='My Own Personal Flavor'],
+[Define the product flavor. Default is Personal.]),
+,with_product_flavor=Personal)
+
AC_ARG_WITH(package-version,
AS_HELP_STRING([--with-package-version='3.1.4.5'],
[Define the package version. Default is AC_PACKAGE_VERSION. Use only
if you distribute an own build for macOS.]),
@@ -2343,6 +2348,15 @@ fi
AC_SUBST(ENABLE_RELEASE_BUILD)
AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
+AC_MSG_CHECKING([for product flavor])
+if test "$with_product_flavor" = "no"; then
+PRODUCTFLAVOR=""
+elif test -n "$with_product_flavor"; then
+PRODUCTFLAVOR="$with_product_flavor"
+fi
+AC_MSG_RESULT([$PRODUCTFLAVOR])
+AC_DEFINE_UNQUOTED([PRODUCTFLAVOR], ["$PRODUCTFLAVOR"])
+
dnl ===
dnl Test whether to sign Windows Build
dnl ===
@@ -12775,7 +12789,7 @@ dnl
===
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
BRAND_INTRO_IMAGES="intro.png intro-highres.png"
-brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg"
+brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo_flavor.svg
about.svg"
if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 53f05d52b2e1..c4e88e37dd73 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,6 +32,8 @@
#include //CuiResId
#include
#include //SfxApplication::loadBrandSvg
+#include
+#include
#include
#include
#include //utl::Bootstrap::getBuildVersion
@@ -65,6 +67,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel(m_xBuilder->weld_label("lbUIString")),
m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
+ m_pAboutLabel(m_xBuilder->weld_label("lbAbout")),
m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
// Labels
@@ -87,6 +90,12 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel->set_label(Application::GetHWOSConfInfo(2));
m_pLocaleLabel->set_label(GetLocaleString());
m_pMiscLabel->set_label(GetMiscString());
+
+ if (std::string_view(PRODUCTFLAVOR) == "Personal")
+ {
+ m_pAboutLabel->set_label(SfxResId(STR_PERSONALDESC));
+ }
+
m_pCopyrightLabel->set_label(GetCopyrightString());
// Images
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2262da38de96..37d1710a7f93 100644
--- a/cui/source/inc/about.hxx
+++ b/cui
[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-7.0.0.1'
Tag 'libreoffice-7.0.0.1' created by Andras Timar at 2020-07-01 17:22 + libreoffice-7.0.0.1 Changes since libreoffice-7-0-branch-point-29: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - .gitreview
.gitreview |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 691ef3f645f69ca6c02255ca7655023e4ea9a97f Author: Andras Timar AuthorDate: Wed Jul 1 19:05:23 2020 +0200 Commit: Andras Timar CommitDate: Wed Jul 1 19:05:23 2020 +0200 set .gitreview for this branch Change-Id: Id0acd04ba43944d48997a9c0bf86f94096db83c5 diff --git a/.gitreview b/.gitreview index 6907d1470..0f0114e0e 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=gerrit.libreoffice.org port=29418 project=online defaultremote=logerrit -defaultbranch=master +defaultbranch=libreofiice-7-0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source filter/source include/xmloff reportdesign/source sc/source starmath/source sw/source xmloff/source
dbaccess/source/filter/xml/xmlExport.cxx |2 +-
filter/source/svg/svgexport.cxx |4 ++--
include/xmloff/xmlexp.hxx |2 +-
reportdesign/source/filter/xml/xmlExport.cxx |2 +-
sc/source/filter/xml/xmlexprt.cxx |4 ++--
starmath/source/mathmlexport.cxx |2 +-
sw/source/filter/xml/xmlexp.cxx |2 +-
xmloff/source/chart/SchXMLExport.cxx |2 +-
xmloff/source/core/xmlexp.cxx |2 +-
xmloff/source/draw/sdxmlexp.cxx |2 +-
xmloff/source/meta/MetaExportComponent.cxx|2 +-
xmloff/source/text/XMLAutoTextEventExport.cxx |2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit a380b4e972710b495ee80344152093a5a09317ef
Author: Noel Grandin
AuthorDate: Wed Jul 1 13:01:16 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 1 18:40:30 2020 +0200
reorder parameters of SvXMLExport::SvXMLExport
so they all have similar order
Change-Id: Id8baef058d52f6cce9d9be41b0341eec8ad648b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97628
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 13b68d9f15bc..49e7f04a3c76 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -190,7 +190,7 @@ namespace dbaxml
}
ODBExport::ODBExport(const Reference< XComponentContext >& _rxContext,
OUString const & implementationName, SvXMLExportFlags nExportFlag)
-: SvXMLExport( util::MeasureUnit::MM_10TH, _rxContext, implementationName,
XML_DATABASE,
+: SvXMLExport( _rxContext, implementationName, util::MeasureUnit::MM_10TH,
XML_DATABASE,
SvXMLExportFlags::OASIS | nExportFlag)
,m_aTypeCollection(_rxContext)
,m_bAllreadyFilled(false)
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index e07ce224c1ea..76ad8c3b2ca2 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -324,8 +324,8 @@ SVGExport::SVGExport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
const Reference< XDocumentHandler >& rxHandler,
const Sequence< PropertyValue >& rFilterData )
-: SvXMLExport( util::MeasureUnit::MM_100TH,
- rContext, "",
+: SvXMLExport( rContext, "",
+ util::MeasureUnit::MM_100TH,
xmloff::token::XML_TOKEN_INVALID,
SvXMLExportFlags::META|SvXMLExportFlags::PRETTY )
{
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 963bd3148cfc..eee53a95d91b 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -263,9 +263,9 @@ protected:
public:
SvXMLExport(
-sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
OUString const & implementationName,
+sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/,
const enum ::xmloff::token::XMLTokenEnum eClass,
SvXMLExportFlags nExportFlag );
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 0151bad80865..bd93ff3a54e7 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -197,7 +197,7 @@ static void
lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
}
ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,
OUString const & implementationName, SvXMLExportFlags nExportFlag)
-: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName,
XML_REPORT, SvXMLExportFlags::OASIS)
+: SvXMLExport( _rxContext, implementationName, util::MeasureUnit::MM_100TH,
XML_REPORT, SvXMLExportFlags::OASIS)
,m_bAllreadyFilled(false)
{
setExportFlags( SvXMLExportFlags::OASIS | nExportFlag);
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index d2461326f36b..eca716116c69 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -341,8 +341,8 @@ static const OUStringLiteral gsLayerID( SC_LAYERID );
ScXMLExport::ScXMLExport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlag)
-: SvXMLExport( GetMeasureUnit(),
-rContext, implementationName, XML_SPREADSHEET, nExportFlag ),
+: SvXMLExport(
+rContext, implementationName, GetMeasureUnit(), XML_SPREADSHEET,
nExportFlag ),
pDoc(nullptr),
nSourceStreamPos(0),
aTableStyles(),
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index c619f22f4dc1..2f7f8de552ff 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -337,7 +337,7 @@ bool SmX
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf133861_RelativeAnchorWidthFromInsideOutsideMargin.docx
|binary
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
| 23 ++
sw/source/core/layout/anchoreddrawobject.cxx
| 36 +-
writerfilter/source/dmapper/GraphicImport.cxx
|2
4 files changed, 59 insertions(+), 2 deletions(-)
New commits:
commit d63321d949563759ee2ada96fdc2e0f8728941b2
Author: Regényi Balázs
AuthorDate: Wed Jun 10 14:27:32 2020 +0200
Commit: László Németh
CommitDate: Wed Jul 1 18:33:59 2020 +0200
tdf#133863 tdf#133864 DOCX shape import: width relative to inside
and outside margins.
See commit 43d7f4e3640c5e370fd1204739c2b0c7eb5f40e4
(offapi: document the 4 new properties which are no longer read-only).
commit b46f4bc9760267ac5e45d43b77b5d2721ee4c386
(tdf#133070 DOCX import: fix shape height relative to bottom page margin)
commit 330ed8120e9881656716d70d87b9f49f861f0bfa
(tdf#133670 DOCX import: fix shape width relative to right margin)
commit 7380905abc0833d9e4c4fe731d76174db8a8724c
(tdf#132976 DOCX import: fix shape width relative to left margin)
Co-authored-by: Szabolcs Tóth
Change-Id: If81b7c80732141be1491ca82770cf6eee99f5656
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97627
Tested-by: László Németh
Reviewed-by: László Németh
diff --git
a/sw/qa/extras/ooxmlexport/data/tdf133861_RelativeAnchorWidthFromInsideOutsideMargin.docx
b/sw/qa/extras/ooxmlexport/data/tdf133861_RelativeAnchorWidthFromInsideOutsideMargin.docx
new file mode 100644
index ..453320f388f1
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf133861_RelativeAnchorWidthFromInsideOutsideMargin.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 4c6428321792..ea7a3643954b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1169,6 +1169,29 @@
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromLeftMargin, "tdf132976_testR
CPPUNIT_ASSERT_EQUAL(static_cast(1133), nAnchoredWidth);
}
+DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorWidthFromInsideOutsideMargin,
"tdf133861_RelativeAnchorWidthFromInsideOutsideMargin.docx")
+{
+// TODO: Fix export.
+if (mbExported)
+return;
+
+// tdf#133863 tdf#133864 The sizes of the width of these shapes depend on
the sizes of the inside and outside margins.
+// The open book: outside --text-- inside | inside --text-- outside
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+// Outside
+sal_Int32 nAnchoredWidth = getXPath(pXmlDoc,
"(//SwAnchoredDrawObject)[1]/bounds", "width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(2552), nAnchoredWidth);
+// Inside
+nAnchoredWidth = getXPath(pXmlDoc, "(//SwAnchoredDrawObject)[2]/bounds",
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(1440), nAnchoredWidth);
+// Inside
+nAnchoredWidth = getXPath(pXmlDoc, "(//SwAnchoredDrawObject)[3]/bounds",
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(1440), nAnchoredWidth);
+// Outside
+nAnchoredWidth = getXPath(pXmlDoc, "(//SwAnchoredDrawObject)[4]/bounds",
"width").toInt32();
+CPPUNIT_ASSERT_EQUAL(static_cast(2552), nAnchoredWidth);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx
b/sw/source/core/layout/anchoreddrawobject.cxx
index 9b4bce8e44ef..1af32ed2fa80 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -620,6 +620,26 @@ SwRect SwAnchoredDrawObject::GetObjRect() const
return GetDrawObj()->GetSnapRect();
}
+namespace
+{
+// Imagine an open book, inside margin is the one that is at the inner
side of the pages, at the center of the book,
+// outside margin is at the two opposite edges of the book.
+// outside --text-- inside | inside --text-- outside
+// With mirrored margins, when relating the size of an object from the
inside margin for example, on the
+// first page we calculate the new size of the object using the size of
the right margin,
+// on second page the left margin, third page right margin, etc.
+long getInsideOutsideRelativeWidth(bool isOutside, const SwPageFrame*
const pPageFrame)
+{
+// Alternating between the only two possible cases: inside and outside.
+// Inside = false, Outside = true.
+auto nPageNum = pPageFrame->GetPhyPageNum();
+if (nPageNum % 2 == (isOutside ? 0 : 1))
+return pPageFrame->GetRightMargin();
+else
+return pPageFrame->GetLeftMargin();
+}
+}
+
// --> #i70122#
SwRect SwAnchoredDrawObject::GetObjBoundRect() const
{
@@ -640,10 +660,22 @@ SwRect
[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - 15 commits - common/FileUtil.cpp common/SigUtil.cpp common/SigUtil.hpp configure.ac ios/Mobile loleaflet/css loleaflet/html loleaflet/Makef
common/FileUtil.cpp|2
common/SigUtil.cpp |6 +-
common/SigUtil.hpp |3 -
configure.ac | 28 +
ios/Mobile/DocumentViewController.mm | 26 +---
loleaflet/Makefile.am |7 ++
loleaflet/css/loleaflet.css|6 +-
loleaflet/css/menubar.css |2
loleaflet/css/toolbar.css | 35 +--
loleaflet/html/framed.doc.html |2
loleaflet/html/loleaflet.html.m4 |1
loleaflet/src/control/Control.DocumentNameInput.js | 11 +++
loleaflet/src/control/Control.LokDialog.js |5 +
loleaflet/src/control/Ruler.js |1
loleaflet/src/core/Socket.js | 19 +++---
loolwsd.xml.in |7 ++
wsd/Admin.cpp | 26 +++-
wsd/Admin.hpp |4 +
wsd/AdminModel.cpp | 63 -
wsd/AdminModel.hpp | 60 +---
wsd/ClientSession.cpp | 13 ++--
wsd/LOOLWSD.cpp| 15 +
22 files changed, 267 insertions(+), 75 deletions(-)
New commits:
commit f067b861c770d57e54911bee6f18fb518f2a402e
Author: Andras Timar
AuthorDate: Wed Jul 1 18:21:31 2020 +0200
Commit: Andras Timar
CommitDate: Wed Jul 1 18:21:31 2020 +0200
Bump version to 7.0.0.1
Change-Id: I80af9a636d00faa63359d3fc3476108f5c448806
diff --git a/configure.ac b/configure.ac
index eb66b48d6..00cb4ac02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [7.0.0.0.beta1], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [7.0.0.1], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit f486265ca70a5b120e6006127add219e63e80693
Author: Henry Castro
AuthorDate: Thu May 28 08:17:16 2020 -0400
Commit: Andras Timar
CommitDate: Wed Jul 1 18:20:32 2020 +0200
loleaflet: remove install node_module in configure phase
Fair enough, let's not get in conflict with IOS platform,
It is restored and get another solution
Change-Id: I1cde236595479bdf41e29d8a30bb9d71aa196e54
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95036
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/configure.ac b/configure.ac
index 53ad8954d..eb66b48d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -992,31 +992,13 @@ fi
AC_SUBST(ENABLE_SETCAP)
-
-tryLinkFile () {
-if test ! -r "$1"; then
-AC_MSG_ERROR(["$1: file not found"])
-fi
-
-rm -f $2
-ln -s "$1" "$2" 2>/dev/null ||
-ln "$1" "$2" 2>/dev/null ||
-cp -p "$1" "$2" ||
-AC_MSG_ERROR(["cannot link or copy $1 to $2"])
-}
-
-if test "$srcdir" != '.'; then
-mkdir -p loleaflet
-tryLinkFile $srcdir/loleaflet/package.json loleaflet/package.json
-tryLinkFile $srcdir/loleaflet/archived-packages loleaflet/archived-packages
-cp -p $srcdir/loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json
-fi
-
AC_CONFIG_LINKS([discovery.xml:discovery.xml])
AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu])
+AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json])
AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json])
AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json])
AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins])
+AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages])
AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin])
APP_BRANDING_DIR=
@@ -1087,6 +1069,7 @@ AC_CONFIG_FILES([Makefile
gtk/Makefile
test/Makefile
loleaflet/Makefile
+ loleaflet/npm-shrinkwrap.json
loolwsd.spec
loolwsd.xml
debian/loolwsd.postinst])
@@ -1106,9 +1089,6 @@ fi
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
-AC_CONFIG_COMMANDS_PRE([AS_IF([test `uname -s` = "Linux"],
- [echo Installing node modules packages... && (cd
loleaflet && npm install)])])
-
AC_OUTPUT
AC_LANG_POP
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b23ab1a10..0d922a18d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,6 +1,5 @@
MAKEFLAGS = --no-builtin-rules
CTAGS = ctags
-CONFIG_STATUS_DEPENDENCIES=$(builddir)/node_modules
L10N_PO = $(wildcard $(srcdir)/po/*.po)
@@ -435,6 +434,12 @@ node_modules: package.json archived-packages
@npm install
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/gridcell.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b8db739c20f7a174702bab34eb9373ee3d0a9d02
Author: Caolán McNamara
AuthorDate: Wed Jul 1 14:00:49 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 1 18:05:23 2020 +0200
don't use a variable called 'min' to store a max value
Change-Id: If21dcd572147d8aeffd2fe2c30b3c8f7b2366960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97626
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 06ac175b99e5..b502d39b6daa 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1384,13 +1384,13 @@ void DbFormattedField::Init( vcl::Window& rParent,
const Reference< XRowSet >& x
bool bClearMax = true;
if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MAX, xUnoModel))
{
-Any aMin( xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MAX));
-if (aMin.getValueType().getTypeClass() != TypeClass_VOID)
+Any aMax(xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MAX));
+if (aMax.getValueType().getTypeClass() != TypeClass_VOID)
{
-DBG_ASSERT(aMin.getValueType().getTypeClass() ==
TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid max value
!");
-double dMin = ::comphelper::getDouble(aMin);
-
static_cast(m_pWindow.get())->SetMaxValue(dMin);
-
static_cast(m_pPainter.get())->SetMaxValue(dMin);
+DBG_ASSERT(aMax.getValueType().getTypeClass() ==
TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid max value
!");
+double dMax = ::comphelper::getDouble(aMax);
+
static_cast(m_pWindow.get())->SetMaxValue(dMax);
+
static_cast(m_pPainter.get())->SetMaxValue(dMax);
bClearMax = false;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source dbaccess/source include/svtools reportdesign/source solenv/sanitizers svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/source sw/source
chart2/source/controller/dialogs/DataBrowser.cxx | 15 -
chart2/source/controller/dialogs/DataBrowser.hxx |2
dbaccess/source/ui/browser/brwctrlr.cxx |1
dbaccess/source/ui/browser/sbagrid.cxx|5
dbaccess/source/ui/control/TableGrantCtrl.cxx | 11 -
dbaccess/source/ui/inc/TableGrantCtrl.hxx |4
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 42 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 88 +
dbaccess/source/ui/tabledesign/TEditControl.hxx |6
dbaccess/source/ui/tabledesign/TableUndo.cxx |2
include/svtools/editbrowsebox.hxx | 173 +++---
include/svtools/editimplementation.hxx| 21 --
reportdesign/source/ui/dlg/GroupsSorting.cxx |4
solenv/sanitizers/ui/svt.suppr|1
svtools/UIConfig_svt.mk |1
svtools/source/brwbox/ebbcontrols.cxx | 77
svtools/source/brwbox/editbrowsebox.cxx | 19 -
svtools/uiconfig/ui/thineditcontrol.ui| 27 ++
svx/source/fmcomp/fmgridcl.cxx|2
svx/source/fmcomp/gridcell.cxx| 25 +-
svx/source/fmcomp/gridctrl.cxx| 11 -
sw/source/ui/index/cnttab.cxx | 14 -
23 files changed, 370 insertions(+), 183 deletions(-)
New commits:
commit d2f1cd004310b9ea6654d17fddc11cb08e884c90
Author: Caolán McNamara
AuthorDate: Fri Jun 26 20:57:29 2020 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 1 18:04:46 2020 +0200
weld EditControl for browsebox
Change-Id: I8f21c12f7ee10e1b9ba883a8ff01bb5252429f09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0aaccdea65cf..a693b142d6d0 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -498,7 +498,7 @@ DataBrowser::DataBrowser(const
css::uno::Reference &rParent,
m_bIsReadOnly( false ),
m_bDataValid( true ),
m_aNumberEditField( VclPtr::Create( &
EditBrowseBox::GetDataWindow(), WB_NOBORDER ) ),
-m_aTextEditField( VclPtr::Create( & EditBrowseBox::GetDataWindow(),
WB_NOBORDER ) ),
+
m_aTextEditField(VclPtr::Create(&EditBrowseBox::GetDataWindow())),
m_pColumnsWin(pColumns),
m_pColorsWin(pColors),
m_rNumberEditController( new ::svt::FormattedFieldCellController(
m_aNumberEditField.get() )),
@@ -1128,8 +1128,9 @@ void DataBrowser::InitController(
if( rController == m_rTextEditController )
{
OUString aText( GetCellText( nRow, nCol ) );
-m_aTextEditField->SetText( aText );
-m_aTextEditField->SetSelection( ::Selection( 0, aText.getLength() ));
+weld::Entry& rEntry = m_aTextEditField->get_widget();
+rEntry.set_text(aText);
+rEntry.select_region(0, -1);
}
else if( rController == m_rNumberEditController )
{
@@ -1210,7 +1211,8 @@ bool DataBrowser::SaveModified()
break;
case DataBrowserModel::TEXTORDATE:
{
-OUString aText( m_aTextEditField->GetText() );
+weld::Entry& rEntry = m_aTextEditField->get_widget();
+OUString aText(rEntry.get_text());
double fValue = 0.0;
bChangeValid = false;
if( isDateTimeString( aText, fValue ) )
@@ -1221,7 +1223,8 @@ bool DataBrowser::SaveModified()
break;
case DataBrowserModel::TEXT:
{
-OUString aText( m_aTextEditField->GetText());
+weld::Entry& rEntry = m_aTextEditField->get_widget();
+OUString aText(rEntry.get_text());
bChangeValid = m_apDataBrowserModel->setCellText( nCol, nRow,
aText );
}
break;
@@ -1233,7 +1236,7 @@ bool DataBrowser::SaveModified()
RowModified( GetCurRow(), GetCurColumnId());
::svt::CellController* pCtrl = GetController( GetCurRow(),
GetCurColumnId());
if( pCtrl )
-pCtrl->ClearModified();
+pCtrl->SaveValue();
}
return bChangeValid;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx
b/chart2/source/controller/dialogs/DataBrowser.hxx
index 8e6372b0b833..7f213382cf81 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -161,7 +161,7 @@ private:
boolm_bDataValid;
VclPtr m_aNumberEditField;
-VclPtrm_aTextEditField;
+VclPtrm_aTextEditField;
weld::Container*m_pColumnsWin;
weld::Container*m_pColorsWin;
diff --git a/
[Libreoffice-commits] core.git: solenv/flatpak-manifest.in
solenv/flatpak-manifest.in | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 96dc14a041ea803f0d194a47a8f3d62f6cfa37be
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 15:34:51 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 18:02:55 2020 +0200
Adapt solenv/flatpak-manifest.in to recent download.lst changes
Change-Id: I6490a4d6151ae163053f12c872477f2bbfcb3d95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97630
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 073a559d57e6..035505103ac5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -189,22 +189,22 @@
"dest-filename": "external/tarballs/glm-0.9.9.7.zip"
},
{
-"url":
"https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";,
-"sha256":
"1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb",
+"url":
"https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2";,
+"sha256":
"c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46",
"type": "file",
-"dest-filename": "external/tarballs/gpgme-1.9.0.tar.bz2"
+"dest-filename": "external/tarballs/gpgme-1.13.1.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";,
-"sha256":
"47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449",
+"url":
"https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2";,
+"sha256":
"91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702",
"type": "file",
-"dest-filename":
"external/tarballs/libassuan-2.5.1.tar.bz2"
+"dest-filename":
"external/tarballs/libassuan-2.5.3.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";,
-"sha256":
"4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2",
+"url":
"https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2";,
+"sha256":
"b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763",
"type": "file",
-"dest-filename":
"external/tarballs/libgpg-error-1.27.tar.bz2"
+"dest-filename":
"external/tarballs/libgpg-error-1.37.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";,
@@ -351,10 +351,10 @@
"dest-filename": "external/tarballs/mdds-1.6.0.tar.bz2"
},
{
-"url":
"https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";,
-"sha256":
"db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca",
+"url":
"https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz";,
+"sha256":
"c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d",
"type": "file",
-"dest-filename": "external/tarballs/neon-0.30.2.tar.gz"
+"dest-filename": "external/tarballs/neon-0.31.1.tar.gz"
},
{
"url":
"https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";,
@@ -573,10 +573,10 @@
"dest-filename":
"external/tarballs/libatomic_ops-7.6.8.tar.gz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz";,
-"sha256":
"d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f",
+"url":
"https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";,
+"sha256":
"3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760",
"type": "file",
-"dest-filename":
"external/tarballs/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
+"dest-filename":
"external/tarballs/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/dtoa-20180411.tgz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/CPAndroidX86.conf
distro-configs/CPAndroidX86.conf |4 1 file changed, 4 insertions(+) New commits: commit cae77280d13c549ca023f50b5449a05f3fbecc7c Author: Jan Holesovsky AuthorDate: Wed Jul 1 12:38:59 2020 +0200 Commit: Jan Holesovsky CommitDate: Wed Jul 1 18:00:09 2020 +0200 android: Add a CP x86 configuration too. Change-Id: I8d584811244cd613b8637d9dd2cf1bfe1985ecec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97610 Tested-by: Jan Holesovsky Reviewed-by: Jan Holesovsky (cherry picked from commit 9213bfce95aa3300d87c5fece638a0d8101c718e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97579 Tested-by: Jenkins diff --git a/distro-configs/CPAndroidX86.conf b/distro-configs/CPAndroidX86.conf new file mode 100644 index ..6fba0d609cfb --- /dev/null +++ b/distro-configs/CPAndroidX86.conf @@ -0,0 +1,4 @@ +# Use LibreOfficeAndroidX86.conf as the base +INCLUDE:LibreOfficeAndroidX86 +# Add the CP stuff +INCLUDE:CPAndroidBranding ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/src wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/Storage.cpp wsd/Storage.hpp
loleaflet/reference.html | 15 +-- loleaflet/src/core/Socket.js |4 +++- wsd/ClientSession.cpp| 10 ++ wsd/DocumentBroker.cpp | 19 +++ wsd/DocumentBroker.hpp |8 wsd/Storage.cpp |1 + wsd/Storage.hpp | 11 +++ 7 files changed, 53 insertions(+), 15 deletions(-) New commits: commit 9f8fdb7bd7b12c1591e2c118e59ea3154844c960 Author: Samuel Mehrbrodt AuthorDate: Wed Jul 1 12:46:58 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Wed Jul 1 17:57:53 2020 +0200 tdf#131123 Report back real save result 665b1629de30a4a402c6b10dd542de158db1f428 was not correct, as it reported back the save result of the internal save (which usually succeeds). Instead we want to know the save result of the remote storage (WOPI/Webdav). So report that back instead. Change-Id: Iaaa42b8c817a19c2c77935a6f81c1951fdf2216c Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97637 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/loleaflet/reference.html b/loleaflet/reference.html index b52d34688..99cae5ec6 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -3040,18 +3040,21 @@ Editor to WOPI host success:result: + errorMsg: Acknowledgement when save finishes. + This response is only emitted if Notify parameter + is mentioned by Action_Save PostMessage API. + success tells if LOOL was able to save the document - successfully. When this is false, then another - parameter, result is present which contains the - reason that document was not saved. + successfully. + result contains the reason the document was not saved. In case, document was not saved because it was not modified, then this parameter contains the string 'unmodified'. In this case, WOPI hosts can be sure that there are no changes pending - in the document to be saved to the storage. - This response is only emitted if Notify parameter - is mentioned by Action_Save PostMessage API. + in the document to be saved to the storage. + errorMsg contains a detailed error message in case saving failed. + Probably it will contain the error message returned from the WOPI/Webdav host. diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js index 5a5568424..c3798a774 100644 --- a/loleaflet/src/core/Socket.js +++ b/loleaflet/src/core/Socket.js @@ -365,7 +365,9 @@ L.Socket = L.Class.extend({ } var postMessageObj = { - success: commandresult['success'] + success: commandresult['success'], + result: commandresult['result'], + errorMsg: commandresult['errorMsg'] }; this._map.fire('postMessage', {msgId: 'Action_Save_Resp', args: postMessageObj}); } diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index 5f79a07fa..7762089aa 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -553,11 +553,8 @@ bool ClientSession::_handleInput(const char *buffer, int length) constexpr bool isAutosave = false; constexpr bool isExitSave = false; -bool result = docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, dontSaveIfUnmodified != 0, +docBroker->sendUnoSave(getId(), dontTerminateEdit != 0, dontSaveIfUnmodified != 0, isAutosave, isExitSave, extendedData); -std::string resultstr = result ? "true" : "false"; -std::string msg = "commandresult: { \"command\": \"save\", \"success\": " + resultstr + " }"; -docBroker->broadcastMessage(msg); } } else if (tokens.equals(0, "savetostorage")) @@ -566,10 +563,7 @@ bool ClientSession::_handleInput(const char *buffer, int length) if (tokens.size() > 1) getTokenInteger(tokens[1], "force", force); -bool result = docBroker->saveToStorage(getId(), true, "" /* This is irrelevant when success is true*/, true); -std::string resultstr = result ? "true" : "false"; -std::string msg = "commandresult: { \"command\": \"savetostorage\", \"success\": " + resultstr + " }"; -docBroker->broadcastMessage(msg); +docBroker->saveToStorage(getId(), true, "" /* This is irrelevant when success is true*/, true)
[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in
distro-configs/LibreOfficeFlatpak.conf |1 +
solenv/flatpak-manifest.in |6 ++
2 files changed, 7 insertions(+)
New commits:
commit 4332375acee8b8ce618c1833a0c11ab13aea21fd
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 10:53:26 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 17:41:25 2020 +0200
Adapt Flatpak build to new Box2D external requirement
...introduced with a7f2239e649ea1b9ef611d758841584ab51abed0 "external:
bundle
box2d"
Change-Id: Ia1a46dc517073d3cf7f221d3f7275741e94995a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97629
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index 0d0f9ce5c881..81604de9f1f7 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -14,6 +14,7 @@
--without-system-beanshell
--without-system-bluez
--without-system-boost
+--without-system-box2d
--without-system-clucene
--without-system-coinmp
--without-system-cppunit
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index aec05edaa8bc..073a559d57e6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -584,6 +584,12 @@
"type": "file",
"dest-filename": "external/tarballs/dtoa-20180411.tgz"
},
+{
+"url":
"https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz";,
+"sha256":
"58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c",
+"type": "file",
+"dest-filename": "external/tarballs/box2d-2.3.1.tar.gz"
+},
{
"url":
"https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf";,
"sha256":
"884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting agenda: 2020-07-02 16:00 Berlin time
Hi, Prototype agenda below. Extra items appreciated either in this document or as a reply to this mail: https://nextcloud.documentfoundation.org/apps/files/?dir=/Shared/Common/esc-minutes You can join jitsi here: https://jitsi.documentfoundation.org/esc Regards, Miklos * Present: + * Completed Action Items: + send the welcome committer mail to Yunusemre (Miklos) + grant gerrit commit access to Yunusemre (Cloph) * Pending Action Items: + put together some proposal on what are the benefits of a dev list move from FDO to TDF (William) + update the TDF wiki to advertise https://nextcloud.documentfoundation.org/apps/files/?dir=/Shared/Common/esc-minutes (William) * Release Engineering update (Cloph) + 7.0 status + UI freeze & string freeze in the first week of July + there will be 3 RCs (Cloph) + 6.4 status + Remotes + Android viewer + Online * Documentation (Olivier) * UX Update (Heiko) + Bugzilla (topicUI) statistics 245(245) (topicUI) bugs open, 261(261) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 7(-2)18(-4)43(-4) 165(0) commented 79(24) 293(5)956(1) 3535(18) removed 2(2) 3(2) 7(1) 48(2) resolved 8(0) 43(2)134(3) 376(8) + top 10 contributors: Heiko Tietze made 197 changes in 1 month, and 2119 changes in 1 year Foote, V Stuart made 48 changes in 1 month, and 608 changes in 1 year Telesto made 41 changes in 1 month, and 232 changes in 1 year Ilmari Lauhakangas made 38 changes in 1 month, and 166 changes in 1 year Xisco Fauli made 28 changes in 1 month, and 556 changes in 1 year srijan bhatia made 26 changes in 1 month, and 26 changes in 1 year Kainz, Andreas made 22 changes in 1 month, and 458 changes in 1 year Dieter Praas made 21 changes in 1 month, and 521 changes in 1 year Timur made 21 changes in 1 month, and 225 changes in 1 year BogdanB made 19 changes in 1 month, and 85 changes in 1 year * Crash Reporting (Caolan) + 5(+5) import failure, 4(+0) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (from crashreport.libreoffice.org) + 6.4.2.272983(+1945) + 6.4.3.260125(+2604) + 6.4.4.235310(+7973) + 7.0.0.01852(+283) * GSoC 2020 (Ilmari) + Projects announced: https://blog.documentfoundation.org/blog/2020/05/05/9769/ + June 1, 2020 - August 24, 2020: Students work on their projects + 6 projects accepted + the game is on, students are reporting more or less regularly + remind your students if it's not happening + 1st evaluation: June 29, 2020 - July 3, 2020 (next week) + no emergency observed so far + feature branch vs gerrit changes (Thorsten) + a combination of these works great + push once a day to the branch, but get the changes into master soon * Mentoring/easyhack update committer... 1 week 1 month 3 months12 months open 105(-28)171(-27)175(-24) 185(-24) reviews 536(8) 1800(-4)4252(36)20861(-90) merged 536(173) 1947(210) 5086(193) 19422(237) abandoned 26(1) 87(7) 289(15) 1052(4) own commits 315(67)1161(55)3758(76)15761(127) review commits 63(-47)352(-97) 1147(-32)4635(-26) contributor... 1 week 1 month 3 months 12 months open 35(-8) 75(-1) 76(-4) 78(-4) reviews 1620(314) 5254(264) 12526(460) 41868(664) merged 21(-16)138(-45) 368(-8) 1008(11) abandoned 13(4) 50(-3) 121(4) 574(5) own commits 23(-43)187(-83) 538(-24)1315(7) review commits0(0)0(0) 0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 2(2) cleanup_comments 227(227) total 276(276) assigned 23(23) open 235(235) + top 10 contributors: Johnny_M made 64 patches in 1 month, and 152 patches in 1 year LibreOfficiant made 16 patches in 1 month, and 140 patches in 1 year Steve Fanning made 16 patches in 1 month, and 86 patches in 1 year Gökay ŞATIR made 16 patches in 1 month, and 22 patches in 1 year yakovru made 6 patches in 1 month, and 6 patches in 1 year Ilmari Lauhakangas made 5 patches in 1 month, and 28 patches in 1 year Aditya Sahu made 5 patches in 1 month, and 11 patches in 1 year srijan bhatia made 5 patches in 1 month, and 5 patches in 1 year Attila Bakos made 4 patches in 1 month, and 18 patches in 1 year Ahmad Ganzouri made 4 patches
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2cc95ef7f001d284ce70563ade4acc28f0a28caa Author: Olivier Hallot AuthorDate: Wed Jul 1 12:20:45 2020 -0300 Commit: Gerrit Code Review CommitDate: Wed Jul 1 17:20:45 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 659dba3909b17d8a3206572b9b6de5acad3db590 - Capitalize funciton name Change-Id: I48c456ecdd591b84315f95b15013d708e6028cb4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97641 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 93dc60612485..659dba3909b1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 93dc60612485b96089088ec8c316e62b836b9bc4 +Subproject commit 659dba3909b17d8a3206572b9b6de5acad3db590 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/calc_functions.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 659dba3909b17d8a3206572b9b6de5acad3db590 Author: Olivier Hallot AuthorDate: Wed Jul 1 12:11:39 2020 -0300 Commit: Olivier Hallot CommitDate: Wed Jul 1 17:20:45 2020 +0200 Capitalize funciton name Change-Id: I48c456ecdd591b84315f95b15013d708e6028cb4 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97641 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/calc_functions.xhp b/source/text/sbasic/shared/calc_functions.xhp index c9c18e3be..a58f14f4c 100644 --- a/source/text/sbasic/shared/calc_functions.xhp +++ b/source/text/sbasic/shared/calc_functions.xhp @@ -531,7 +531,7 @@ -Imsin +IMSIN com.sun.star.sheet.addin.Analysis.getImsin ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
New commits:
commit 17b75eb1d7032f8ff85d9af1ec635fa1800cca1e
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 16:49:52 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Jul 1 17:18:15 2020 +0200
tdf#130991 Fit the drop-down arrow into its rect
Looking at the original fixed-size arrow painting code replaced
in commit b62c43d1200e524369d9c7c2bd1dad3044efd672 ("Anti-alias
toolbar button drop-downs."), it used some fixed values of 5
and 3 to match the arrow box width of 11.
The new code assumes the width is the expected arrow size, minus
a minimal margin to separate the arrow from the button border,
and there is enough height available. Based on these assumptions,
the code now scales, positions and paints the triangle to fill
the available space.
Change-Id: Ied721e494d105106086ef6252e72ae7395eafe08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97537
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 02600732c747..935a7e3ae9ec 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2391,27 +2391,28 @@ static void ImplDrawDropdownArrow(vcl::RenderContext&
rRenderContext, const tool
rRenderContext.SetFillColor(COL_BLACK);
}
-float fScaleFactor = rRenderContext.GetDPIScaleFactor();
-
tools::Polygon aPoly(4);
-long width = round(rDropDownRect.getHeight()/5.5) * fScaleFactor; // scale
triangle depending on theme/toolbar height with 7 for gtk, 5 for gen
-long height = round(rDropDownRect.getHeight()/9.5) * fScaleFactor; // 4
for gtk, 3 for gen
-if (width < 4) width = 4;
-if (height < 3) height = 3;
+// the assumption is, that the width always specifies the size of the
expected arrow.
+const long nMargin = round(2 * rRenderContext.GetDPIScaleFactor());
+const long nSize = rDropDownRect.getWidth() - 2 * nMargin;
+const long nHalfSize = (nSize + 1) / 2;
+const long x = rDropDownRect.Left() + nMargin + (bRotate ?
(rDropDownRect.getWidth() - nHalfSize) / 2 : 0);
+const long y = rDropDownRect.Top() + nMargin + (rDropDownRect.getHeight()
- (bRotate ? nSize : nHalfSize)) / 2;
-long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
-long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
-
-long halfwidth = (width+1)>>1;
aPoly.SetPoint(Point(x, y), 0);
-aPoly.SetPoint(Point(x + halfwidth, y + height), 1);
-aPoly.SetPoint(Point(x + halfwidth*2, y), 2);
+if (bRotate) // >
+{
+aPoly.SetPoint(Point(x, y + nSize), 1);
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 2);
+}
+else // v
+{
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 1);
+aPoly.SetPoint(Point(x + nSize, y), 2);
+}
aPoly.SetPoint(Point(x, y), 3);
-if (bRotate) // TESTME: harder ...
-aPoly.Rotate(Point(x,y+height/2),2700);
-
auto aaflags = rRenderContext.GetAntialiasing();
rRenderContext.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
rRenderContext.DrawPolygon( aPoly );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 53d5e2db91a7fd158fe0cfae3e3139b0ee8f3934 Author: Olivier Hallot AuthorDate: Wed Jul 1 12:12:40 2020 -0300 Commit: Gerrit Code Review CommitDate: Wed Jul 1 17:12:40 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 93dc60612485b96089088ec8c316e62b836b9bc4 - mute l10n in some lines of Basic Change-Id: Ibdf0ffcf32e47174c3572d95e9afeaa366a109d9 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97640 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5e74f53b9313..93dc60612485 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5e74f53b93134f1174f477fcbf54e93f06a4c707 +Subproject commit 93dc60612485b96089088ec8c316e62b836b9bc4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/calc_functions.xhp |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 93dc60612485b96089088ec8c316e62b836b9bc4
Author: Olivier Hallot
AuthorDate: Wed Jul 1 12:00:45 2020 -0300
Commit: Olivier Hallot
CommitDate: Wed Jul 1 17:12:40 2020 +0200
mute l10n in some lines of Basic
Change-Id: Ibdf0ffcf32e47174c3572d95e9afeaa366a109d9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97640
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/calc_functions.xhp
b/source/text/sbasic/shared/calc_functions.xhp
index 7f0169fd7..c9c18e3be 100644
--- a/source/text/sbasic/shared/calc_functions.xhp
+++ b/source/text/sbasic/shared/calc_functions.xhp
@@ -34,10 +34,10 @@
REM Example calling Addin
function SQRTPI
Function MySQRTPI(arg as
double) as double
- Dim oService as
Object
- oService =
createUNOService("com.sun.star.sheet.addin.Analysis")
+ Dim
oService as Object
+
oService = createUNOService("com.sun.star.sheet.addin.Analysis")
MySQRTPI =
oService.getSqrtPi(arg)
-End Function
+End
Function
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/uibase/uno/unotxdoc.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3bd01dc22c18acbca14b52bb982e7effd5a2b8a8 Author: Samuel Mehrbrodt AuthorDate: Mon Jun 29 14:58:57 2020 +0200 Commit: Xisco Fauli CommitDate: Wed Jul 1 17:09:42 2020 +0200 tdf#130151 Fix toc pointing to wrong page Change-Id: I26c1027722613f751bd39fde97f1e14d3238eefa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97413 Reviewed-by: Ilmari Lauhakangas Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins (cherry picked from commit 63f3485b57904de4e77c04f5759e6563fcce6748) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97504 Reviewed-by: Xisco Fauli diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 1fb4ce3713be..b65386a7c392 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2583,8 +2583,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // there is no time to sort this out. //TODO: check what exactly needs to be done and make just one function for that pViewShell->CalcLayout(); -pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); - // #122919# Force field update before PDF export, but after layout init (tdf#121962) bool bStateChanged = false; @@ -2598,6 +2596,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( if( bStateChanged ) pRenderDocShell->EnableSetModified(); +pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); + pViewShell->SetPDFExportOption( false ); // enable view again ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib android/README configure.ac
android/README | 16
android/lib/src/main/cpp/CMakeLists.txt.in |4 ++
configure.ac | 53 -
3 files changed, 64 insertions(+), 9 deletions(-)
New commits:
commit 37b3acbdf12364620e42bf41d0f1f4db2bebf967
Author: Jan Holesovsky
AuthorDate: Wed Jul 1 11:10:01 2020 +0200
Commit: Jan Holesovsky
CommitDate: Wed Jul 1 17:10:28 2020 +0200
android: Add support for x86 ABI too.
Turns out that the ChromeOS uses the x86 Android runtime, not x86-64.
Change-Id: Ic3b6f7a65d35d2298daa731f46e57068eaf2583d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97607
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/android/README b/android/README
index 7223e121e..5cffa4b4f 100644
--- a/android/README
+++ b/android/README
@@ -68,6 +68,22 @@ build the native parts on Windows.
# install
PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
make -j8 ANDROID_ABI=arm64-v8a CC=aarch64-linux-android21-clang
CXX=aarch64-linux-android21-clang++ SYSLIBS=-static-libstdc++ install
INSTALLDIR=/opt/poco-android-64bit
+* Poco for x86 (if you want to add the support for that into the APK too):
+
+ # checkout the 1.10.1 in yet another location
+ git clone https://github.com/pocoproject/poco poco-android-x86
+ cd poco-android-x86
+ git checkout -b poco-1.10.1 origin/poco-1.10.1
+
+ # configure
+ ./configure --config=Android --no-samples --no-tests
--omit=Crypto,NetSSL_OpenSSL,Zip,Data,Data/SQLite,Data/ODBC,Data/MySQL,MongoDB,PDF,CppParser,PageCompiler,JWT
+
+ # build
+
PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
make -j8 ANDROID_ABI=x86 CC=i686-linux-android21-clang
CXX=i686-linux-android21-clang++ SYSLIBS=-static-libstdc++
+
+ # install
+
PATH="$PATH":~/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin
make -j8 ANDROID_ABI=x86 CC=i686-linux-android21-clang
CXX=i686-linux-android21-clang++ SYSLIBS=-static-libstdc++ install
INSTALLDIR=/opt/poco-android-x86
+
* Poco for x86_64 (if you want to add the support for that into the APK too):
# checkout the 1.10.1 in yet another location
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in
b/android/lib/src/main/cpp/CMakeLists.txt.in
index 53a3fafd7..2e1a5fdb8 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -37,6 +37,10 @@ elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
set(LOBUILDDIR_ABI @LOBUILDDIR_ARM64_V8A@)
set(POCOINCLUDE_ABI @POCOINCLUDE_ARM64_V8A@)
set(POCOLIB_ABI @POCOLIB_ARM64_V8A@)
+elseif(${ANDROID_ABI} STREQUAL "x86")
+set(LOBUILDDIR_ABI @LOBUILDDIR_X86@)
+set(POCOINCLUDE_ABI @POCOINCLUDE_X86@)
+set(POCOLIB_ABI @POCOLIB_X86@)
elseif(${ANDROID_ABI} STREQUAL "x86_64")
set(LOBUILDDIR_ABI @LOBUILDDIR_X86_64@)
set(POCOINCLUDE_ABI @POCOINCLUDE_X86_64@)
diff --git a/configure.ac b/configure.ac
index 7a8177e91..ff78941ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,12 +168,14 @@ AC_ARG_WITH(android-package-versioncode,
AC_ARG_WITH(android-abi,
AS_HELP_STRING([--with-android-abi=x86_64],
- [Allows specification of a concrete ABI that is to
be built for. By default, builds for all the 3
-supported ABIs at the same time: armeabi-v7a,
arm64-v8a and x86_64.
+ [Allows specification of a concrete ABI that is to
be built for, defaults to armeabi-v7a
+(when only one build dir is provided in
--with-lo-builddir) or to all 4 supported ABIs at
+the same time (when there are more builddirs
provided in --with-lo-builddir, separated
+by colons). The supported ABIs are: armeabi-v7a,
arm64-v8a, x86 and x86_64.
Please note that you need to specify the
parameters for --with-lo-builddir,
---with-poco-includes and --with-poco-libs in the
order of armeabi-v7a:arm64-v8a:x86_64. For
-example, when you use --with-android-abi=x86_64,
-you have to specify
--with-lo-builddir=::/path/to/x86-64/builddir]),
+--with-poco-includes and --with-poco-libs in the
order of armeabi-v7a:arm64-v8a:x86:x86_64.
+For example, when you use
--with-android-abi=x86_64,
+you have to specify
--with-lo-builddir=:::/path/to/x86-64/builddir]),
,)
AC_ARG_WITH([app-name],
@@ -368,12 +370,15 @@ fi
LOBUILDDIR=
ANDROID_ABI=
LOBUILDDIR_ARM64_V8A=
+LOBUILDDIR_X86=
LOBUILDDIR_X86_64=
POCOINCLUDE=
POCOINCLUDE_ARM64_V8A=
+POCOINCLUDE_X86=
POCOINCLUDE_X86_64=
POCOLIB=
POCOLIB_ARM64_V8A=
+POCOLIB_X86=
POCOLIB_X86_64=
POCODEBUG=
CORE_VERSION_HASH=""
@@ -381,7 +386,7 @@ if test \( "$enable_
[Libreoffice-commits] online.git: Branch 'private/tml/ios-gen2' - 2 commits - wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9e8ddfc0c1668067219a1debca2aa5cb8f4c72b4
Author: Tor Lillqvist
AuthorDate: Wed Jul 1 13:48:01 2020 +0300
Commit: Tor Lillqvist
CommitDate: Wed Jul 1 16:43:56 2020 +0200
Don't call JailUtil::cleanupJails() on MOBILEAPP
Change-Id: I7a01ff9afaccb6e3f4b399a12d828c8d44bcb4c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97612
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a93b41f5f..6efb55655 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1185,13 +1185,14 @@ void LOOLWSD::initialize(Application& self)
}
else
{
+#if !MOBILEAPP
if (CleanupOnly)
{
// Cleanup and exit.
JailUtil::cleanupJails(ChildRoot);
std::exit(EX_OK);
}
-
+#endif
if (ChildRoot[ChildRoot.size() - 1] != '/')
ChildRoot += '/';
commit 22e2f50f556a3eb4ee292301c63a30a252c12b07
Author: Jan Holesovsky
AuthorDate: Wed Jul 1 12:34:36 2020 +0200
Commit: Tor Lillqvist
CommitDate: Wed Jul 1 16:43:09 2020 +0200
android: Make the documents open again.
The files stopped opening after
5c9988f2e345ca82e7bb5f5e9bf66a30b82a0446, but just avoiding the new
Jails stuff seems enough to fix it.
Change-Id: I4c3be058dd24e9500f64c240571f0e76a17ac8b8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97608
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3d3f2f290..a93b41f5f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1205,6 +1205,7 @@ void LOOLWSD::initialize(Application& self)
LOG_INF("Creating childroot: " + ChildRoot);
}
+#if !MOBILEAPP
// Setup the jails.
JailUtil::setupJails(getConfigValue(conf, "mount_jail_tree", true),
ChildRoot,
SysTemplate);
@@ -1225,7 +1226,6 @@ void LOOLWSD::initialize(Application& self)
}
LOG_INF("NumPreSpawnedChildren set to " << NumPreSpawnedChildren << '.');
-#if !MOBILEAPP
FileUtil::registerFileSystemForDiskSpaceChecks(ChildRoot);
const auto maxConcurrency = getConfigValue(conf,
"per_document.max_concurrency", 4);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/loader/pyuno_loader.cxx |2 +-
pyuno/source/module/pyuno_impl.hxx | 10 +-
pyuno/source/module/pyuno_module.cxx |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 71999016feeb371b5f3eb1d2f71385176039db06
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 14:18:51 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 16:43:14 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: pyuno
Change-Id: I188716d5da92d495b9511f000dd9c1a78259fa9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97621
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/pyuno/source/loader/pyuno_loader.cxx
b/pyuno/source/loader/pyuno_loader.cxx
index 07dc748235f9..9df4ecfb770e 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -276,7 +276,7 @@ static Reference CreateInstance(const
Reference &
}
-static const struct cppu::ImplementationEntry g_entries[] =
+const struct cppu::ImplementationEntry g_entries[] =
{
{
pyuno_loader::CreateInstance, pyuno_loader::getImplementationName,
diff --git a/pyuno/source/module/pyuno_impl.hxx
b/pyuno/source/module/pyuno_impl.hxx
index 05ff32252670..6517884a01ef 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -70,9 +70,9 @@ struct RuntimeCargo;
namespace LogLevel
{
// when you add a loglevel, extend the log function !
-static const sal_Int32 NONE = 0;
-static const sal_Int32 CALL = 1;
-static const sal_Int32 ARGS = 2;
+const sal_Int32 NONE = 0;
+const sal_Int32 CALL = 1;
+const sal_Int32 ARGS = 2;
}
bool isLog( RuntimeCargo const *cargo, sal_Int32 loglevel );
@@ -88,8 +88,8 @@ void logReply( RuntimeCargo *cargo, const char *intro,
void logException( RuntimeCargo *cargo, const char *intro,
void * ptr, const OUString &aFunctionName,
const void * data, const css::uno::Type & type );
-static const sal_Int32 VAL2STR_MODE_DEEP = 0;
-static const sal_Int32 VAL2STR_MODE_SHALLOW = 1;
+const sal_Int32 VAL2STR_MODE_DEEP = 0;
+const sal_Int32 VAL2STR_MODE_SHALLOW = 1;
OUString val2str( const void * pVal, typelib_TypeDescriptionReference *
pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP );
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index 579da0a583a0..cb2824d5 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -313,7 +313,7 @@ static PyObject* getComponentContext(
// exactly once near the end of the process, if InitVCL has ever been called
via
// pyuno.private_initTestEnvironment):
-static osl::Module * testModule = nullptr;
+osl::Module * testModule = nullptr;
static PyObject* initTestEnvironment(
SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9e8ddfc0c1668067219a1debca2aa5cb8f4c72b4
Author: Tor Lillqvist
AuthorDate: Wed Jul 1 13:48:01 2020 +0300
Commit: Tor Lillqvist
CommitDate: Wed Jul 1 16:43:56 2020 +0200
Don't call JailUtil::cleanupJails() on MOBILEAPP
Change-Id: I7a01ff9afaccb6e3f4b399a12d828c8d44bcb4c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97612
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a93b41f5f..6efb55655 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1185,13 +1185,14 @@ void LOOLWSD::initialize(Application& self)
}
else
{
+#if !MOBILEAPP
if (CleanupOnly)
{
// Cleanup and exit.
JailUtil::cleanupJails(ChildRoot);
std::exit(EX_OK);
}
-
+#endif
if (ChildRoot[ChildRoot.size() - 1] != '/')
ChildRoot += '/';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 22e2f50f556a3eb4ee292301c63a30a252c12b07
Author: Jan Holesovsky
AuthorDate: Wed Jul 1 12:34:36 2020 +0200
Commit: Tor Lillqvist
CommitDate: Wed Jul 1 16:43:09 2020 +0200
android: Make the documents open again.
The files stopped opening after
5c9988f2e345ca82e7bb5f5e9bf66a30b82a0446, but just avoiding the new
Jails stuff seems enough to fix it.
Change-Id: I4c3be058dd24e9500f64c240571f0e76a17ac8b8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97608
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3d3f2f290..a93b41f5f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1205,6 +1205,7 @@ void LOOLWSD::initialize(Application& self)
LOG_INF("Creating childroot: " + ChildRoot);
}
+#if !MOBILEAPP
// Setup the jails.
JailUtil::setupJails(getConfigValue(conf, "mount_jail_tree", true),
ChildRoot,
SysTemplate);
@@ -1225,7 +1226,6 @@ void LOOLWSD::initialize(Application& self)
}
LOG_INF("NumPreSpawnedChildren set to " << NumPreSpawnedChildren << '.');
-#if !MOBILEAPP
FileUtil::registerFileSystemForDiskSpaceChecks(ChildRoot);
const auto maxConcurrency = getConfigValue(conf,
"per_document.max_concurrency", 4);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/qrcodegen.ui | 44 ++- 1 file changed, 39 insertions(+), 5 deletions(-) New commits: commit eac284aa0067d7c209f4acac891185f1cc271265 Author: Olivier Hallot AuthorDate: Tue Jun 30 09:50:10 2020 -0300 Commit: Olivier Hallot CommitDate: Wed Jul 1 16:37:20 2020 +0200 Move ahelp contents for ext'ded tooltips QR code Copy contents of the QRcode Help page to the AtkObject::accesible-description field in qrcodegen.ui file for each applicable widget. Such move will turn tag obsolete, althout its contents should be preserved. helpcontent2/source/text/shared/guide/qrcode.xhp Change-Id: Icded2e6bfd6c5c0e525a8174bea44a2997217510 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97526 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui index 2c01c16f1715..973df071daf5 100644 --- a/cui/uiconfig/ui/qrcodegen.ui +++ b/cui/uiconfig/ui/qrcodegen.ui @@ -1,9 +1,8 @@ - + -0 75 1 1 @@ -17,6 +16,9 @@ 0 0 dialog + + + False @@ -115,6 +117,11 @@ True True www.libreoffice.org + + +The text from which to generate the QR code. + + 1 @@ -170,9 +177,6 @@ 0 - - - 0 @@ -187,6 +191,11 @@ border_value True True + + +The width in dots of the border surrounding the QR code. + + 1 @@ -209,6 +218,11 @@ True True button_medium + + +7% of codewords can be restored. + + 0 @@ -226,6 +240,11 @@ True True button_low + + +15% of codewords can be restored. + + 0 @@ -243,6 +262,11 @@ True True button_low + + +25% of codewords can be restored. + + 0 @@ -260,6 +284,11 @@ True True button_low + + +30% of codewords can be restored. + + 0 @@ -306,5 +335,10 @@ ok help + + +Generate QR Code for any text or URL. + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fabad9e9dfbd70b687da0d9cbbc0085e9022642 Author: Olivier Hallot AuthorDate: Wed Jul 1 11:36:37 2020 -0300 Commit: Gerrit Code Review CommitDate: Wed Jul 1 16:36:37 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5e74f53b93134f1174f477fcbf54e93f06a4c707 - tdf#134376 Add Calc cell style Help page Change-Id: I57f32bdfc4435cbe21b7cca1cb5170892e69447d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97622 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b59586b7da5b..5e74f53b9313 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b59586b7da5b2fe01ffb0c55ae522b5e82bead0f +Subproject commit 5e74f53b93134f1174f477fcbf54e93f06a4c707 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/00/0405.xhp |7 +++- source/text/scalc/01/0502.xhp |6 +--- source/text/scalc/01/0507.xhp | 12 ++-- source/text/scalc/01/0510.xhp | 29 --- source/text/scalc/01/cell_styles.xhp| 38 + source/text/scalc/guide/print_title_row.xhp |9 ++ source/text/scalc/main0105.xhp | 18 ++-- source/text/schart/01/05010100.xhp | 13 +++- source/text/schart/01/05010200.xhp | 14 ++--- source/text/schart/01/05020100.xhp | 11 +++ source/text/schart/01/05020200.xhp |8 + source/text/schart/01/0503.xhp | 14 ++--- source/text/schart/01/05040100.xhp | 14 ++--- source/text/schart/01/05040200.xhp | 14 - source/text/shared/01/0502.xhp |4 +- source/text/shared/01/05020100.xhp | 21 ++ source/text/shared/01/05020300.xhp | 13 ++-- source/text/shared/01/05040100.xhp | 42 source/text/shared/01/05340405.xhp | 13 ++-- source/text/simpress/01/0509m.xhp |3 -- source/text/swriter/01/05130002.xhp |1 22 files changed, 162 insertions(+), 143 deletions(-) New commits: commit 5e74f53b93134f1174f477fcbf54e93f06a4c707 Author: Olivier Hallot AuthorDate: Wed Jul 1 09:40:51 2020 -0300 Commit: Olivier Hallot CommitDate: Wed Jul 1 16:36:37 2020 +0200 tdf#134376 Add Calc cell style Help page Change-Id: I57f32bdfc4435cbe21b7cca1cb5170892e69447d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97622 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index d0599281e..c339ed099 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -181,6 +181,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/12120200 \ helpcontent2/source/text/scalc/01/12120300 \ helpcontent2/source/text/scalc/01/calculate \ +helpcontent2/source/text/scalc/01/cell_styles \ helpcontent2/source/text/scalc/01/data_form \ helpcontent2/source/text/scalc/01/data_provider \ helpcontent2/source/text/scalc/01/ex_data_stat_func \ diff --git a/source/text/scalc/00/0405.xhp b/source/text/scalc/00/0405.xhp index beedce6e7..a3fe793be 100644 --- a/source/text/scalc/00/0405.xhp +++ b/source/text/scalc/00/0405.xhp @@ -28,8 +28,11 @@ -Format Menu -Choose Format - Cells. +Format Menu + +Choose Format - Cells. +Press CommandCtrl+1. + Choose Format - Cells - Cell Protection tab. Choose Format - Rows. Choose Format - Rows - Optimal Height. diff --git a/source/text/scalc/01/0502.xhp b/source/text/scalc/01/0502.xhp index 513f08ac6..da4e8bb76 100644 --- a/source/text/scalc/01/0502.xhp +++ b/source/text/scalc/01/0502.xhp @@ -39,10 +39,8 @@ -Numbers - -Font - + + diff --git a/source/text/scalc/01/0507.xhp b/source/text/scalc/01/0507.xhp index 61b7c6092..945b0ff83 100644 --- a/source/text/scalc/01/0507.xhp +++ b/source/text/scalc/01/0507.xhp @@ -27,10 +27,18 @@ + +style;page +page;style +format;page +formatting;page + + Page Style - Opens a dialog where you can define the appearance of all pages in your document. - + +Opens a dialog where you can define the appearance of all pages in your document. + diff --git a/source/text/scalc/01/0510.xhp b/source/text/scalc/01/0510.xhp index 8de45e742..befc16a8d 100644 --- a/source/text/scalc/01/0510.xhp +++ b/source/text/scalc/01/0510.xhp @@ -20,25 +20,25 @@ -Styles +Styles in Calc /text/scalc/01/0510.xhp - - Stylist, see Styles window - Styles window - formats; Styles window - formatting; Styles window - paint can for applying styles +Stylist, see Styles window +Styles window +formats; Styles window +formatting; Styles window +paint can for applying styles +styles in spreadsheets +styles; in Calc - -Styles +Styles in Calc Use the Styles deck of the Sidebar to assign styles to cells and pages. You can apply, update, and modify existing styles or create new styles. The Styles dockable window can remain open while editing the document. @@ -57,11 +57,9 @@ Double-click the style in the Styles window. - - -Cell Styles -Displays the list of the available Cell Styles for indirect cell formatting. + +Displays the list of the available Cell Styles. @@ -75,8 +73,8 @@ -Page Styles -Displays the Page Styles available for indirect page formatting. +Page Styles +Displays the Page Styles available. @@ -105,7 +103,6 @@ - How to apply a new style with the paint can: diff --git a/source/text/scalc/01/cell_
[Libreoffice-commits] core.git: config_host/config_buildid.h.in configure.ac cui/source framework/source icon-themes/colibre include/sfx2 sfx2/source sfx2/uiconfig
config_host/config_buildid.h.in |1
configure.ac | 16
cui/source/dialogs/about.cxx |9 ++
cui/source/inc/about.hxx |1
framework/source/fwe/helper/titlehelper.cxx |7 ++
icon-themes/colibre/brand/intro-highres.png |binary
icon-themes/colibre/brand/intro.png |binary
icon-themes/colibre/brand/shell/logo.svg |2
icon-themes/colibre/brand/shell/logo_flavor.svg | 71 ++
icon-themes/colibre/brand/shell/logo_inverted.svg |2
include/sfx2/strings.hrc |1
sfx2/source/dialog/backingwindow.cxx | 12 +++
sfx2/source/dialog/backingwindow.hxx |2
sfx2/uiconfig/ui/startcenter.ui | 17 +
14 files changed, 138 insertions(+), 3 deletions(-)
New commits:
commit c540483134482d437ea6e02390ff429f4300cbb0
Author: Miklos Vajna
AuthorDate: Mon Jun 29 16:54:31 2020 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 1 16:35:13 2020 +0200
configure: add a --with-product-flavor switch
Defaults to Personal to point out this is supported by volunteers.
This affects the splash screen, the window title, the about dialog and
the start center.
Change-Id: I216a7f547618377ed268454ebfd2801c4c3901b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97427
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in
index 04f03b83543a..d9663cb3f8f0 100644
--- a/config_host/config_buildid.h.in
+++ b/config_host/config_buildid.h.in
@@ -6,5 +6,6 @@ Optional Build ID displayed in the about dialog
#define CONFIG_BUILDID_H
#undef EXTRA_BUILDID
+#undef PRODUCTFLAVOR
#endif
diff --git a/configure.ac b/configure.ac
index b8492f0fc343..d477665acc28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1504,6 +1504,11 @@ AC_ARG_WITH(product-name,
[Define the product name. Default is AC_PACKAGE_NAME.]),
,with_product_name=$PRODUCTNAME)
+AC_ARG_WITH(product-flavor,
+AS_HELP_STRING([--with-product-flavor='My Own Personal Flavor'],
+[Define the product flavor. Default is Personal.]),
+,with_product_flavor=Personal)
+
AC_ARG_WITH(package-version,
AS_HELP_STRING([--with-package-version='3.1.4.5'],
[Define the package version. Default is AC_PACKAGE_VERSION. Use only
if you distribute an own build for macOS.]),
@@ -2376,6 +2381,15 @@ fi
AC_SUBST(ENABLE_RELEASE_BUILD)
AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
+AC_MSG_CHECKING([for product flavor])
+if test "$with_product_flavor" = "no"; then
+PRODUCTFLAVOR=""
+elif test -n "$with_product_flavor"; then
+PRODUCTFLAVOR="$with_product_flavor"
+fi
+AC_MSG_RESULT([$PRODUCTFLAVOR])
+AC_DEFINE_UNQUOTED([PRODUCTFLAVOR], ["$PRODUCTFLAVOR"])
+
dnl ===
dnl Test whether to sign Windows Build
dnl ===
@@ -12877,7 +12891,7 @@ dnl
===
AC_MSG_CHECKING([for alternative branding images directory])
# initialize mapped arrays
BRAND_INTRO_IMAGES="intro.png intro-highres.png"
-brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg about.svg"
+brand_files="$BRAND_INTRO_IMAGES logo.svg logo_inverted.svg logo_flavor.svg
about.svg"
if test -z "$with_branding" -o "$with_branding" = "no"; then
AC_MSG_RESULT([none])
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 53f05d52b2e1..c4e88e37dd73 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -32,6 +32,8 @@
#include //CuiResId
#include
#include //SfxApplication::loadBrandSvg
+#include
+#include
#include
#include
#include //utl::Bootstrap::getBuildVersion
@@ -65,6 +67,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel(m_xBuilder->weld_label("lbUIString")),
m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
+ m_pAboutLabel(m_xBuilder->weld_label("lbAbout")),
m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
// Labels
@@ -87,6 +90,12 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pUILabel->set_label(Application::GetHWOSConfInfo(2));
m_pLocaleLabel->set_label(GetLocaleString());
m_pMiscLabel->set_label(GetMiscString());
+
+ if (std::string_view(PRODUCTFLAVOR) == "Personal")
+ {
+ m_pAboutLabel->set_label(SfxResId(STR_PERSONALDESC));
+ }
+
m_pCopyrightLabel->set_label(GetCopyrightString());
// Images
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2262da38de96..37d1710a7f93 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -40,6 +40,7 @@ private:
std::unique_ptr m_pUILab
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/LotusWordProImportFilter.cxx |2 +-
lotuswordpro/source/filter/explode.cxx |4 ++--
lotuswordpro/source/filter/lwppttntbl.hxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b551604a81d6cd5ab9b85d56c57a97f4abc457fd
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 13:23:11 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 16:17:39 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: lotuswordpro
Change-Id: I5b68c490b534da933de4f26e01328dfb2976dafc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97616
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 9d65394bae8c..73335e0bab88 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -42,7 +42,7 @@ using com::sun::star::document::XImporter;
using com::sun::star::xml::sax::XDocumentHandler;
// W o r d P r o
-static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
+const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
bool LotusWordProImportFilter::importImpl( const Sequence<
css::beans::PropertyValue >& aDescriptor )
{
diff --git a/lotuswordpro/source/filter/explode.cxx
b/lotuswordpro/source/filter/explode.cxx
index 017bd476139b..ab82f3380b23 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -61,7 +61,7 @@
#include
#include
-const static char Tree1String[][32] = {
+const char Tree1String[][32] = {
"101",
"11",
"100",
@@ -80,7 +80,7 @@
"000",
};
-const static char Tree2String[][32] = {
+const char Tree2String[][32] = {
"11",
"1011" ,
"1010" ,
diff --git a/lotuswordpro/source/filter/lwppttntbl.hxx
b/lotuswordpro/source/filter/lwppttntbl.hxx
index a0774fbbb8bf..f74c8f6eda9d 100644
--- a/lotuswordpro/source/filter/lwppttntbl.hxx
+++ b/lotuswordpro/source/filter/lwppttntbl.hxx
@@ -64,7 +64,7 @@
#include
-static const sal_uInt8 s_pLwpPatternTab[][8] = {//Id Name
+const sal_uInt8 s_pLwpPatternTab[][8] = {//Id Name
{ 0xDF, 0xAF, 0x77, 0x77, 0x77, 0x77, 0xFA, 0xFD },//0 Transparent
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },//1 SolidForeground
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },//2 SolidBackground
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/dicimp.cxx | 20 ++--
linguistic/source/gciterator.cxx |8
linguistic/source/iprcache.cxx|2 +-
linguistic/source/lngprophelp.cxx |2 +-
linguistic/source/misc.cxx|2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 6a9f71f232eb214a4be943b4f6a9e4a228a1ed5c
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 13:21:56 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 16:16:34 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: linguistic
Change-Id: I9f179db10c55f41e07c1f7fd519a58d68b7e6ad9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97614
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index ef348f75a594..d29a2bcb0ad3 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -76,16 +76,16 @@ using namespace linguistic;
// text stripping and dictionary saving.
#define EXTENSION_FOR_TITLE_TEXT "."
-static const char* const pVerStr2= "WBSWG2";
-static const char* const pVerStr5= "WBSWG5";
-static const char* const pVerStr6= "WBSWG6";
-static const char* const pVerOOo7= "OOoUserDict1";
-
-static const sal_Int16 DIC_VERSION_DONTKNOW = -1;
-static const sal_Int16 DIC_VERSION_2 = 2;
-static const sal_Int16 DIC_VERSION_5 = 5;
-static const sal_Int16 DIC_VERSION_6 = 6;
-static const sal_Int16 DIC_VERSION_7 = 7;
+const char* const pVerStr2= "WBSWG2";
+const char* const pVerStr5= "WBSWG5";
+const char* const pVerStr6= "WBSWG6";
+const char* const pVerOOo7= "OOoUserDict1";
+
+const sal_Int16 DIC_VERSION_DONTKNOW = -1;
+const sal_Int16 DIC_VERSION_2 = 2;
+const sal_Int16 DIC_VERSION_5 = 5;
+const sal_Int16 DIC_VERSION_6 = 6;
+const sal_Int16 DIC_VERSION_7 = 7;
static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl()
{
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index ac8fd2bf2cf4..6e1a5ea0602f 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -68,7 +68,7 @@ static OUString
GrammarCheckingIterator_getImplementationName() throw();
static uno::Sequence< OUString >
GrammarCheckingIterator_getSupportedServiceNames() throw();
// white space list: obtained from the fonts.config.txt of a Linux system.
-static const sal_Unicode aWhiteSpaces[] =
+const sal_Unicode aWhiteSpaces[] =
{
0x0020, /* SPACE */
0x00a0, /* NO-BREAK SPACE */
@@ -121,10 +121,10 @@ static const sal_Unicode aWhiteSpaces[] =
};
// Information about reason for proofreading (ProofInfo)
- static const sal_Int32 PROOFINFO_GET_PROOFRESULT = 1;
- static const sal_Int32 PROOFINFO_MARK_PARAGRAPH = 2;
+ const sal_Int32 PROOFINFO_GET_PROOFRESULT = 1;
+ const sal_Int32 PROOFINFO_MARK_PARAGRAPH = 2;
-static const int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces );
+const int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces );
static bool lcl_IsWhiteSpace( sal_Unicode cChar )
{
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index eb49db33892f..14eee1dfc69b 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -39,7 +39,7 @@ namespace linguistic
#define NUM_FLUSH_PROPS 6
-static const struct
+const struct
{
const char *pPropName;
sal_Int32 nPropHdl;
diff --git a/linguistic/source/lngprophelp.cxx
b/linguistic/source/lngprophelp.cxx
index 1c066e7eba34..d6681c28 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -54,7 +54,7 @@ static const char *aCH[] =
UPN_IS_USE_DICTIONARY_LIST,
};
-static const int nCHCount = SAL_N_ELEMENTS(aCH);
+const int nCHCount = SAL_N_ELEMENTS(aCH);
PropertyChgHelper::PropertyChgHelper(
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 8024a3b34437..3e0beddada2d 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -625,7 +625,7 @@ OUString ToLower( const OUString &rText, LanguageType
nLanguage )
// sorted(!) array of unicode ranges for code points that are exclusively(!)
used as numbers
// and thus may NOT not be part of names or words like the Chinese/Japanese
number characters
-static const sal_uInt32 the_aDigitZeroes [] =
+const sal_uInt32 the_aDigitZeroes [] =
{
0x0030, //0039; Decimal # Nd [10] DIGIT ZERO..DIGIT NINE
0x0660, //0669; Decimal # Nd [10] ARABIC-INDIC DIGIT
ZERO..ARABIC-INDIC DIGIT NINE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 7bbe1e6b9878bf9f418b677fc8732c14e376e3b4 Author: Caolán McNamara AuthorDate: Tue Jun 30 20:21:41 2020 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 1 16:16:12 2020 +0200 name:border hack no longer in use and can be retired since... commit 3c5e074a8fe5e0a18d326d37bc54a5ec0f077e4e Author: Caolán McNamara Date: Fri Jun 19 12:37:05 2020 +0100 weld DataNavigator Change-Id: I5541ed81d695e6d3bae97aca866df08c1f8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97597 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 136d1bb048b2..1d897a5d8f08 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1394,9 +1394,6 @@ namespace nBits |= WB_SIZEABLE; if (extractCloseable(rMap)) nBits |= WB_CLOSEABLE; -OUString sBorder = BuilderUtils::extractCustomProperty(rMap); -if (!sBorder.isEmpty()) -nBits |= WB_BORDER; if (!extractDecorated(rMap)) nBits |= WB_OWNERDRAWDECORATION; OUString sType(extractTypeHint(rMap)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data3/tdf126504.odt |binary
sw/qa/extras/uiwriter/uiwriter3.cxx | 47 ++
2 files changed, 47 insertions(+)
New commits:
commit 6f9d03561f069cf563874515a7412e125c2b26de
Author: Xisco Fauli
AuthorDate: Wed Jul 1 12:52:40 2020 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 1 15:44:45 2020 +0200
tdf#126504: sw: Add unittest
Change-Id: Iceca8bc3ae2dcad04040498565200361157f83e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97613
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/data3/tdf126504.odt
b/sw/qa/extras/uiwriter/data3/tdf126504.odt
new file mode 100644
index ..3f09230f21d5
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf126504.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index db45c779d04e..d7f20d6bd21a 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -238,6 +238,53 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133990)
CPPUNIT_ASSERT_EQUAL(1, getPages());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126504)
+{
+load(DATA_DIRECTORY, "tdf126504.odt");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+//Use selectAll 2 times in a row
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:Copy", {});
+dispatchCommand(mxComponent, ".uno:GoToEndOfPage", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+//Without the fix in place, it would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133982)
{
load(DATA_DIRECTORY, "tdf133982.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xlsx/tdf131424.xlsx|binary
sc/qa/unit/subsequent_filters-test.cxx | 17 +
2 files changed, 17 insertions(+)
New commits:
commit c131d6c6b935617fa84286a9e441c1c791520445
Author: Xisco Fauli
AuthorDate: Wed Jul 1 10:31:07 2020 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 1 15:26:53 2020 +0200
tdf#131424: sc: Add unittest
Change-Id: Ida3df74d44ca027de68f9b5f96a352452d747bfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97595
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/xlsx/tdf131424.xlsx
b/sc/qa/unit/data/xlsx/tdf131424.xlsx
new file mode 100644
index ..e48f007dc68e
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf131424.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index a1027fd06d03..0c332f605f58 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -230,6 +230,7 @@ public:
void testTdf98844();
void testTdf100458();
void testTdf127982();
+void testTdf131424();
void testTdf100709XLSX();
void testTdf97598XLSX();
void testTdf110440XLSX();
@@ -388,6 +389,7 @@ public:
CPPUNIT_TEST(testTdf98844);
CPPUNIT_TEST(testTdf100458);
CPPUNIT_TEST(testTdf127982);
+CPPUNIT_TEST(testTdf131424);
CPPUNIT_TEST(testTdf100709XLSX);
CPPUNIT_TEST(testTdf97598XLSX);
CPPUNIT_TEST(testTdf110440XLSX);
@@ -3815,6 +3817,21 @@ void ScFiltersTest::testTdf127982()
xDocSh->DoClose();
}
+void ScFiltersTest::testTdf131424()
+{
+ScDocShellRef xDocSh = loadDoc("tdf131424.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Without the fix in place, table reference would have failed
+CPPUNIT_ASSERT_EQUAL(35.0, rDoc.GetValue(ScAddress(2,1,0)));
+CPPUNIT_ASSERT_EQUAL(58.0, rDoc.GetValue(ScAddress(2,2,0)));
+CPPUNIT_ASSERT_EQUAL(81.0, rDoc.GetValue(ScAddress(2,3,0)));
+CPPUNIT_ASSERT_EQUAL(104.0, rDoc.GetValue(ScAddress(2,4,0)));
+
+xDocSh->DoClose();
+}
+
void ScFiltersTest::testTdf100709XLSX()
{
ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("tdf100709.",
FORMAT_XLSX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'private/tml/ios-gen2'
New branch 'private/tml/ios-gen2' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp | 31 ++-
1 file changed, 14 insertions(+), 17 deletions(-)
New commits:
commit d4fa74916c3f18af037e4e36985070badce55456
Author: Michael Meeks
AuthorDate: Wed Jul 1 12:19:39 2020 +0100
Commit: Michael Meeks
CommitDate: Wed Jul 1 15:15:19 2020 +0200
Unconditionally display & log version on start & in dumpState.
Hopefully makes our logs generally much more useful.
Change-Id: I6e7a96792e322fc40eb7dda1aa16a2a4ada07df6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97615
Tested-by: Jenkins
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5d3b17808..3d3f2f290 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -219,10 +219,6 @@ int LOOLWSD::prisonerServerSocketFD;
#else
-/// New LOK child processes ready to host documents.
-//TODO: Move to a more sensible namespace.
-static bool DisplayVersion = false;
-
/// Funky latency simulation basic delay (ms)
static int SimulatedLatencyMs = 0;
@@ -1576,7 +1572,7 @@ void LOOLWSD::handleOption(const std::string& optionName,
std::exit(EX_OK);
}
else if (optionName == "version")
-DisplayVersion = true;
+; // ignore for compatibility
else if (optionName == "cleanup")
CleanupOnly = true; // Flag for later as we need the config.
else if (optionName == "port")
@@ -1836,8 +1832,7 @@ bool LOOLWSD::createForKit()
if (UnitWSD::get().hasKitHooks())
args.push_back("--unitlib=" + UnitTestLibrary);
-if (DisplayVersion)
-args.push_back("--version");
+args.push_back("--version");
if (NoCapsForKit)
args.push_back("--nocaps");
@@ -3513,8 +3508,12 @@ public:
Socket::InhibitThreadChecks = true;
SocketPoll::InhibitThreadChecks = true;
-os << "LOOLWSDServer:"
+std::string version, hash;
+Util::getVersionInfo(version, hash);
+
+os << "LOOLWSDServer: " << version << " - " << hash
#if !MOBILEAPP
+ << "\n Kit version: " << LOOLWSD::LOKitVersion
<< "\n Ports: server " << ClientPortNumber << " prisoner " <<
MasterLocation
<< "\n SSL: " << (LOOLWSD::isSSLEnabled() ? "https" : "http")
<< "\n SSL-Termination: " << (LOOLWSD::isSSLTermination() ? "yes"
: "no")
@@ -3734,19 +3733,17 @@ int LOOLWSD::innerMain()
SigUtil::setTerminationSignals();
#endif
-#ifdef __linux
+#if !MOBILEAPP
+# ifdef __linux
// down-pay all the forkit linking cost once & early.
setenv("LD_BIND_NOW", "1", 1);
+# endif
-#if !MOBILEAPP
HostIdentifier = Util::rng::getHexString(8);
-if (DisplayVersion)
-{
-std::string version, hash;
-Util::getVersionInfo(version, hash);
-LOG_INF("Loolwsd version details: " << version << " - " << hash << " -
id " << HostIdentifier << " - on " << Util::getLinuxVersion());
-}
-#endif
+
+std::string version, hash;
+Util::getVersionInfo(version, hash);
+LOG_INF("Loolwsd version details: " << version << " - " << hash << " - id
" << HostIdentifier << " - on " << Util::getLinuxVersion());
#endif
initializeSSL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/qt5
vcl/qt5/Qt5Frame.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 14eccc62b53e202cd9ed63442481922a320fc02e
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 17:41:53 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Jul 1 15:12:26 2020 +0200
tdf#132172 Qt5 just handle visible widget's focus
I investigated the state of isWindow() and the SalFrameToTop
flags for the detached find toolbar (tdf#126607) and the Impress
presentation and the tabbed "page size" drop-down and all had the
same status (isWin: 1, flags: 12). Than I had a look at the gtk3
implementation, which just handles focus requests, if the widget
is already mapped (gtk_widget_get_mapped).
So I also dumped the visibility as the nearest equivalent in Qt to
the X11 mapped state, and that was different. In the end Qt now
also just handles the focus for already visible widgets, like
gtk3, which works for all the cases I tested (incl. tdf#125517).
And omiting either activateWindow or setFocus breaks some cases...
and I still don't understand the GrabFocusOnly flag, which is just
handled in the X11 backends at all...
Note: this doesn't happen with 7.0+, because the weld'ed version
of that control (commit 3afc718eddcd81232392d46fccc24b8ec626c8df
"rework PageSizePopup to be a PopupWindowController") doesn't
expose this bug (and also doesn't support mouse-over highlight).
Change-Id: Id085732f6a52bbc69ed47fbd3d57454756a03121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97549
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 06fb3e7b7f1079c276ad2f048cd94299b4bd7006)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97575
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index b38b92f143c9..25be0a1a4bc9 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -758,7 +758,8 @@ void Qt5Frame::ToTop(SalFrameToTop nFlags)
pWidget->raise();
if ((nFlags & SalFrameToTop::RestoreWhenMin) || (nFlags &
SalFrameToTop::ForegroundTask))
pWidget->activateWindow();
-else if ((nFlags & SalFrameToTop::GrabFocus) || (nFlags &
SalFrameToTop::GrabFocusOnly))
+else if ((nFlags & (SalFrameToTop::GrabFocus |
SalFrameToTop::GrabFocusOnly))
+ && pWidget->isVisible())
{
pWidget->activateWindow();
pWidget->setFocus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/qt5
vcl/qt5/Qt5Frame.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 884cf2aef3a46c269243d6dbe08356ad831e956d
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 17:41:53 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Jul 1 15:12:02 2020 +0200
tdf#132172 Qt5 just handle visible widget's focus
I investigated the state of isWindow() and the SalFrameToTop
flags for the detached find toolbar (tdf#126607) and the Impress
presentation and the tabbed "page size" drop-down and all had the
same status (isWin: 1, flags: 12). Than I had a look at the gtk3
implementation, which just handles focus requests, if the widget
is already mapped (gtk_widget_get_mapped).
So I also dumped the visibility as the nearest equivalent in Qt to
the X11 mapped state, and that was different. In the end Qt now
also just handles the focus for already visible widgets, like
gtk3, which works for all the cases I tested (incl. tdf#125517).
And omiting either activateWindow or setFocus breaks some cases...
and I still don't understand the GrabFocusOnly flag, which is just
handled in the X11 backends at all...
Note: this doesn't happen with 7.0+, because the weld'ed version
of that control (commit 3afc718eddcd81232392d46fccc24b8ec626c8df
"rework PageSizePopup to be a PopupWindowController") doesn't
expose this bug (and also doesn't support mouse-over highlight).
Change-Id: Id085732f6a52bbc69ed47fbd3d57454756a03121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97549
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 43e09e1e890bd47ec1445f0b1537fcba3ef95dce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97574
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index ed3368ac3970..845b5860e713 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -764,7 +764,8 @@ void Qt5Frame::ToTop(SalFrameToTop nFlags)
pWidget->raise();
if ((nFlags & SalFrameToTop::RestoreWhenMin) || (nFlags &
SalFrameToTop::ForegroundTask))
pWidget->activateWindow();
-else if ((nFlags & SalFrameToTop::GrabFocus) || (nFlags &
SalFrameToTop::GrabFocusOnly))
+else if ((nFlags & (SalFrameToTop::GrabFocus |
SalFrameToTop::GrabFocusOnly))
+ && pWidget->isVisible())
{
pWidget->activateWindow();
pWidget->setFocus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Question about class DrawingML
Hi Stephan,
thank you.
Kind regards
Regina
Stephan Bergmann schrieb am 01-Jul-20 um 13:43:
On 01/07/2020 13:38, Regina Henschel wrote:
Is it possible to set a default value for a parameter
const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet
const css::uno::Reference< css::beans::XPropertySet >& rXShapePropSet
= {}
so that a caller can omit it, if it is not needed in his case?
will pass an empty Reference when none is specified
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/mtvelements.hxx |1 +
sc/source/core/data/mtvelements.cxx |5 +
sc/source/core/data/table2.cxx |2 +-
sc/source/core/data/table3.cxx |2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit ee2d2184133b3bf47d38a03b14abab2caa15dad1
Author: Luboš Luňák
AuthorDate: Wed Jul 1 11:24:08 2020 +0200
Commit: Luboš Luňák
CommitDate: Wed Jul 1 14:59:10 2020 +0200
don't add a cell to a non-existent column (tdf#104865)
This change also needs invalidating column position hints if
the columns get changed by the copying of the cells.
Change-Id: I4793e25f253c0197d88b313bc9336435cef649f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97603
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 0727bda0fa7f..7fa266ecf8f0 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -167,6 +167,7 @@ public:
~TableColumnBlockPositionSet();
ColumnBlockPosition* getBlockPosition( SCCOL nCol );
+void invalidate(); // discards cached positions
};
ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos,
size_t nOffset );
diff --git a/sc/source/core/data/mtvelements.cxx
b/sc/source/core/data/mtvelements.cxx
index 21eef33cad45..56c0fbab0d9a 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -150,6 +150,11 @@ ColumnBlockPosition*
TableColumnBlockPositionSet::getBlockPosition( SCCOL nCol )
return &it->second;
}
+void TableColumnBlockPositionSet::invalidate()
+{
+mpImpl->maColumns.clear();
+}
+
ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos,
size_t nOffset )
{
switch (itPos->type)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 9779964d10e0..ba596d54a8f1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3859,7 +3859,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW n
if (bThisTab)
{
-aCell.release(aCol[nDestX], nDestY);
+aCell.release(CreateColumnIfNotExists(nDestX), nDestY);
SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ) );
}
else
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 50fe4e8bb85d..8ce9cc9552a0 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3138,6 +3138,8 @@ SCSIZE ScTable::Query(const ScQueryParam& rParamOrg, bool
bKeepSub)
if (bResult)
{
CopyData( aParam.nCol1,j, aParam.nCol2,j,
aParam.nDestCol,nOutRow,aParam.nDestTab );
+if( nTab == aParam.nDestTab ) // copy to self, changes may
invalidate caching position hints
+blockPos.invalidate();
++nOutRow;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/inc chart2/Library_chartcore.mk chart2/source include/sfx2 sw/source
chart2/Library_chartcore.mk |1
chart2/inc/ChartModel.hxx|6 +++-
chart2/inc/ChartView.hxx |5 +++
chart2/source/inc/chartview/DrawModelWrapper.hxx |2 +
chart2/source/model/main/ChartModel.cxx | 14 +++
chart2/source/view/main/ChartView.cxx| 14 +++
chart2/source/view/main/DrawModelWrapper.cxx | 11
include/sfx2/xmldump.hxx | 29 +++
sw/source/core/ole/ndole.cxx |9 +++
9 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit 3b7c81b9536d8155f4134010aee61d27764f1a5f
Author: Miklos Vajna
AuthorDate: Wed Jul 1 12:03:20 2020 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 1 14:56:23 2020 +0200
sw doc model xml dump: show SdrModel of embedded charts
Change-Id: Iae9daefb9b2173736c039d6177d7356c27eb7a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97605
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index f42dfecd42fe..063e77d42305 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -27,6 +27,7 @@ $(eval $(call
gb_Library_set_precompiled_header,chartcore,chart2/inc/pch/precomp
$(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
+ libxml2 \
))
ifeq ($(DISABLE_GUI),)
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 8c9c4ad69344..8f1defa197be 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#include
@@ -105,7 +106,7 @@ typedef cppu::WeakImplHelper<
class UndoManager;
class ChartView;
-class OOO_DLLPUBLIC_CHARTTOOLS ChartModel final : public impl::ChartModel_Base
+class OOO_DLLPUBLIC_CHARTTOOLS ChartModel final : public
impl::ChartModel_Base, public sfx2::XmlDump
{
private:
@@ -465,6 +466,9 @@ public:
void removeDataProviders();
+/// See sfx2::XmlDump::dumpAsXml().
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
+
private:
sal_Int32 mnStart;
sal_Int32 mnEnd;
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index de9459ed6573..437d49527974 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -39,6 +39,7 @@
#include
#include
+#include
namespace com::sun::star::drawing { class XDrawPage; }
namespace com::sun::star::drawing { class XShapes; }
@@ -92,6 +93,7 @@ class ChartView final : public ::cppu::WeakImplHelper<
>
, public ExplicitValueProvider
, private SfxListener
+, public sfx2::XmlDump
{
private:
void init();
@@ -179,6 +181,9 @@ public:
void setViewDirty();
+/// See sfx2::XmlDump::dumpAsXml().
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
+
private: //methods
void createShapes();
void createShapes2D( const css::awt::Size& rPageSize );
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx
b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 3bc0b4fef2cf..bd9189dbff88 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -86,6 +86,8 @@ public:
static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList
const * pObjList );
static bool removeShape( const css::uno::Reference< css::drawing::XShape
>& xShape );
+
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
} //namespace chart
#endif
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index 96c49fb56655..4f1d055f6a13 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -738,6 +739,19 @@ void ChartModel::removeDataProviders()
m_xDataProvider.clear();
}
+void ChartModel::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("ChartModel"));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
+
+if (mxChartView.is())
+{
+mxChartView->dumpAsXml(pWriter);
+}
+
+xmlTextWriterEndElement(pWriter);
+}
+
sal_Bool SAL_CALL ChartModel::hasInternalDataProvider()
{
return m_xDataProvider.is() && m_xInternalDataProvider.is();
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 4b6b1fa9b48f..faa7fbe3511a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -103,6 +103,7 @@
#include
#include
+#include
namespace com::sun::star::chart2 { class XChartDocument; }
namespace chart {
@@ -2890,6 +2891,19 @@ OUString ChartView::dump()
#endif
}
+
[Libreoffice-commits] online.git: ios/GEN2.txt
ios/GEN2.txt | 53 + 1 file changed, 53 insertions(+) New commits: commit 38ea7a44b74c60e72ceb3dbdfd7fd8567b227f08 Author: Tor Lillqvist AuthorDate: Wed Jul 1 15:43:11 2020 +0300 Commit: Tor Lillqvist CommitDate: Wed Jul 1 15:48:44 2020 +0300 Add musings about a "second generation" of the iOS app diff --git a/ios/GEN2.txt b/ios/GEN2.txt new file mode 100644 index 0..4ab55b990 --- /dev/null +++ b/ios/GEN2.txt @@ -0,0 +1,53 @@ +Generation 2 of the iOS app: + +Goal: + +- Simplified plumbing and largely reduced risk of things going + horribly wrong. + +Ideas: + +- No more FakeSockets. + +- No more large number of threads emulating the processes and threads + in web-based Online. + +- Still based on WebView, though, and the same Online JavaScript still + used. + +- The completely unrelated "FakeWebSocket" thing in our JavaScript is + not going away. + +- Just handle incoming messages from JavaScript and callbacks from LO + core as received. Either directly or by scheduling a block to be + executed. Do not pretend that there is a bunch of processes that + need to use sockets for IPC as in web-based Online. Do not pass + messages between threads using FakeSockets. + +- Reduce and simplify the use of the Online C++ code. + +Steps: + +- Rename the Objective-C files/classes to have a CO prefix. Reduces + risk of confusion with C++ classes. + +- ... + +Problems: + +Clearly this change can't be done in one step, and is not necessarily +of high priority, but has to be done over a period of several months. +How to make sure other changes done to Online at the same time don't +interfere? If kept in a branch, changes from the master branch must be +merged in on an almost daily basis. + +When some of the functionality in Online C++ can/should be re-used +after all (probably things like the basic handling of messages, where +one might guess that large chunks of code is re-usable), separate out +such functionality into a class of its own in the master branch first, +and use that then in the gen2 branch. + +What about the Android app? There hardy is interest to make similar +changes to it, if it works fine already, and there is no need to make +it handle multiple open documents in the same app process. Need to +keep the FakeSocket code for it, etc. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/languageguessing/guesslang.cxx |2 +-
lingucomponent/source/numbertext/numbertext.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5ab5f2d8656a1a0f3c9631e767687f9bb51a6913
Author: Stephan Bergmann
AuthorDate: Wed Jul 1 11:35:26 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Jul 1 14:17:38 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic:
lingucomponent
Change-Id: I70423a669527f2ce6ec25f58b8c409c0e2231962
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97604
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index 7e9d1999b919..4f73e5e008a2 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -333,7 +333,7 @@ static Reference< XInterface > LangGuess_Impl_create(
}
// EXPORTED ### functions to allow for registration and creation of the
UNO component
-static const struct ::cppu::ImplementationEntry s_component_entries [] =
+const struct ::cppu::ImplementationEntry s_component_entries [] =
{
{
LangGuess_Impl_create, getImplementationName_LangGuess_Impl,
diff --git a/lingucomponent/source/numbertext/numbertext.cxx
b/lingucomponent/source/numbertext/numbertext.cxx
index 34e7694601a3..71927a7ac9c7 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -175,7 +175,7 @@ static Reference
NumberText_Impl_create(Reference
}
// EXPORTED ### functions to allow for registration and creation of the
UNO component
-static const struct ::cppu::ImplementationEntry s_component_entries[]
+const struct ::cppu::ImplementationEntry s_component_entries[]
= { { NumberText_Impl_create, getImplementationName_NumberText_Impl,
getSupportedServiceNames_NumberText_Impl,
::cppu::createSingleComponentFactory, nullptr,
0 },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text
source/text/scalc/01/04060109.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 81a850e6dbf2543d4134cd2e958ea468ff4d122d Author: Eike Rathke AuthorDate: Wed Jul 1 13:52:23 2020 +0200 Commit: Eike Rathke CommitDate: Wed Jul 1 14:06:06 2020 +0200 Adjust OFFSET() note to reality It was never necessary to enter OFFSET() as an array formula if a cell range reference is returned. Whether to use an array formula entirely depends on how the resulting range(s) are to be used as arguments to calling functions. Change-Id: Icb771c680f1b9c076017ebd2c78f440529ecc1b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97620 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit c8683685e228f1daae3d039886245b6dfea6d138) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97580 Tested-by: Eike Rathke diff --git a/source/text/scalc/01/04060109.xhp b/source/text/scalc/01/04060109.xhp index 98463df3f..46739a692 100644 --- a/source/text/scalc/01/04060109.xhp +++ b/source/text/scalc/01/04060109.xhp @@ -380,7 +380,7 @@ =OFFSET(B2:C3;1;0;3;4) returns a reference to B2:C3 moved down by one row resized to 3 rows and 4 columns (B3:E5). =SUM(OFFSET(A1;2;2;5;6)) determines the total of the area that starts in cell C3 and has a height of 5 rows and a width of 6 columns (area=C3:H7). - If the width or height is included, the OFFSET function returns a range and thus must be entered as an array formula. If both the width and height are missing, a cell reference is returned. + If Width or Height are given, the OFFSET function returns a cell range reference. If Reference is a single cell reference and both Width and Height are omitted, a single cell reference is returned. LOOKUP function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18d7d6fc7baa91016dd84f2be6b175976610c631 Author: Eike Rathke AuthorDate: Wed Jul 1 14:06:06 2020 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 1 14:06:06 2020 +0200 Update git submodules * Update helpcontent2 from branch 'libreoffice-7-0' to 81a850e6dbf2543d4134cd2e958ea468ff4d122d - Adjust OFFSET() note to reality It was never necessary to enter OFFSET() as an array formula if a cell range reference is returned. Whether to use an array formula entirely depends on how the resulting range(s) are to be used as arguments to calling functions. Change-Id: Icb771c680f1b9c076017ebd2c78f440529ecc1b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97620 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit c8683685e228f1daae3d039886245b6dfea6d138) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97580 Tested-by: Eike Rathke diff --git a/helpcontent2 b/helpcontent2 index e3dfb7c2ae94..81a850e6dbf2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e3dfb7c2ae942e05eac5e7715febc1aad8fad5a3 +Subproject commit 81a850e6dbf2543d4134cd2e958ea468ff4d122d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80496ca9cd19dd6bb14c6584cd059cebc11a4ca0 Author: Eike Rathke AuthorDate: Wed Jul 1 13:58:51 2020 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 1 13:58:51 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b59586b7da5b2fe01ffb0c55ae522b5e82bead0f - Adjust OFFSET() note to reality It was never necessary to enter OFFSET() as an array formula if a cell range reference is returned. Whether to use an array formula entirely depends on how the resulting range(s) are to be used as arguments to calling functions. Change-Id: Icb771c680f1b9c076017ebd2c78f440529ecc1b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97620 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index ba1243452608..b59586b7da5b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba1243452608af3997b42b975895a3e838c767c6 +Subproject commit b59586b7da5b2fe01ffb0c55ae522b5e82bead0f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060109.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b59586b7da5b2fe01ffb0c55ae522b5e82bead0f Author: Eike Rathke AuthorDate: Wed Jul 1 13:52:23 2020 +0200 Commit: Eike Rathke CommitDate: Wed Jul 1 13:58:51 2020 +0200 Adjust OFFSET() note to reality It was never necessary to enter OFFSET() as an array formula if a cell range reference is returned. Whether to use an array formula entirely depends on how the resulting range(s) are to be used as arguments to calling functions. Change-Id: Icb771c680f1b9c076017ebd2c78f440529ecc1b2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97620 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/source/text/scalc/01/04060109.xhp b/source/text/scalc/01/04060109.xhp index c35273cc3..ef5006005 100644 --- a/source/text/scalc/01/04060109.xhp +++ b/source/text/scalc/01/04060109.xhp @@ -380,7 +380,7 @@ =OFFSET(B2:C3;1;0;3;4) returns a reference to B2:C3 moved down by one row resized to 3 rows and 4 columns (B3:E5). =SUM(OFFSET(A1;2;2;5;6)) determines the total of the area that starts in cell C3 and has a height of 5 rows and a width of 6 columns (area=C3:H7). - If the width or height is included, the OFFSET function returns a range and thus must be entered as an array formula. If both the width and height are missing, a cell reference is returned. + If Width or Height are given, the OFFSET function returns a cell range reference. If Reference is a single cell reference and both Width and Height are omitted, a single cell reference is returned. LOOKUP function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
