[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry sd/uiconfig

[Muhammet Kara (via logerrit)]

 icon-themes/colibre/links.txt|
5 +++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
15 --
 sd/uiconfig/sdraw/menubar/menubar.xml|
2 -
 sd/uiconfig/sdraw/toolbar/redactionbar.xml   |
2 -
 4 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 3748535a5739f3cb1471516b2e7ae2601575b639
Author: Muhammet Kara 
AuthorDate: Sun Aug 22 03:24:25 2021 +0300
Commit: Muhammet Kara 
CommitDate: Sun Aug 22 03:45:34 2021 +0200

tdf#126915: Redaction: Clarify 'Export Directly as PDF'

* Add new uno command alias '.uno:RedactionPreviewExport' with the
  desired label.
* Add a link to the icon of the '.uno:ExportDirectToPDF' command so that
  the new alias is displayed correctly on the Redaction Toolbar
* Replace '.uno:ExportDirectToPDF' with '.uno:RedactionPreviewExport' on
  the Redaction toolbar and the Redaction menu

Change-Id: I72d17cac7d570341d89d1e59776e1af25f8d8b87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120835
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 8814a92445a7..226ba61f52e6 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2745,3 +2745,8 @@ cmd/sc_librelogo-goforward.png 
cmd/sc_arrowshapes.up-arrow.png
 cmd/sc_librelogo-run.png cmd/sc_runbasic.png
 cmd/sc_librelogo-stop.png cmd/sc_basicstop.png
 cmd/sc_librelogo-translate.png cmd/sc_editglossary.png
+
+# Draw/Redaction Toolbar
+cmd/32/redactionpreviewexport.png cmd/32/exportdirecttopdf.png
+cmd/lc_redactionpreviewexport.png cmd/lc_exportdirecttopdf.png
+cmd/sc_redactionpreviewexport.png cmd/sc_exportdirecttopdf.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 189037b67a57..7dbef3ceb655 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2501,7 +2501,7 @@
   
   
 
-  Redacted Export (Black)
+  Export Redacted PDF (Black)
 
 
   
.uno:ExportDirectToPDF?IsRedactMode:bool=trueRedactionStyle:string=Black
@@ -2512,7 +2512,7 @@
   
   
 
-  Redacted Export (White)
+  Export Redacted PDF (White)
 
 
   
.uno:ExportDirectToPDF?IsRedactMode:bool=trueRedactionStyle:string=White
@@ -2521,6 +2521,17 @@
   1
 
   
+  
+
+  Export Preview PDF
+
+
+  .uno:ExportDirectToPDF
+
+
+  1
+
+  
   
 
   ShapesDeck
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 544155d33f04..fd327d6bc91b 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -620,7 +620,7 @@
   
   
   
-  
+  
 
   
   
diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml 
b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
index 55cc492fdeee..2e4734e205ba 100644
--- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
@@ -23,5 +23,5 @@
  
  
  
- 
+ 
 

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc  |1 +
 cui/source/customize/cfg.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 487dbbb69bfcf7c0368e9dc17e5aae1f17f8187f
Author: Muhammet Kara 
AuthorDate: Sun May 23 11:22:57 2021 +0300
Commit: Heiko Tietze 
CommitDate: Wed Jun 2 16:13:24 2021 +0200

tdf#116491: Customize: Add indication for experimental commands

Change-Id: Id485f86598aa89cbce6d742c0207c178e5208ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116014
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9ee8d66b2e89..2e6b1276739e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -380,6 +380,7 @@
 #define RID_SVXSTR_COMMANDLABEL 
NC_("RID_SVXSTR_COMMANDLABEL", "Label")
 #define RID_SVXSTR_COMMANDNAME  
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
 #define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
+#define RID_SVXSTR_COMMANDEXPERIMENTAL  
NC_("RID_SVXSTR_COMMANDEXPERIMENTAL", "Experimental")
 
 #define RID_SVXSTR_QRCODEDATALONG   
NC_("RID_SVXSTR_QRCODEDATALONG", "The URL or text is too long for the current 
error correction level. Either shorten the text or decrease the correction 
level.")
 #define RID_SVXSTR_DELETEUSERCOLOR1 
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ef65977d3382..25f973016043 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -88,6 +88,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace uno = com::sun::star::uno;
 namespace frame = com::sun::star::frame;
@@ -1620,10 +1621,17 @@ IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, 
weld::TreeView&, void)
 SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xFunctions->get_selected_id().toInt64());
 if (pData)
 {
+bool bIsExperimental
+= 
vcl::CommandInfoProvider::IsExperimental(pData->sCommand, m_aModuleId);
+
+OUString aExperimental = "\n" + 
CuiResId(RID_SVXSTR_COMMANDEXPERIMENTAL);
 OUString aLabel = CuiResId(RID_SVXSTR_COMMANDLABEL) + ": " + 
pData->sLabel + "\n";
 OUString aName = CuiResId(RID_SVXSTR_COMMANDNAME) + ": " + 
pData->sCommand + "\n";
 OUString aTip = CuiResId(RID_SVXSTR_COMMANDTIP) + ": " + 
pData->sTooltip;
-m_xDescriptionField->set_text(aLabel + aName + aTip);
+if (bIsExperimental)
+m_xDescriptionField->set_text(aLabel + aName + aTip + 
aExperimental);
+else
+m_xDescriptionField->set_text(aLabel + aName + aTip);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 100 Paper Cuts - GSoC

[Muhammet Kara]

Hi Bayram,


On 5/31/21 12:48 PM, Bayram Çiçek wrote:


Hello LibreOffice Community,

I'm Bayram Çiçek. I am so happy and excited to be a part of 
LibreOffice as a GSoC student.




Happy to have you here. Welcome aboard!

Best,
Muhammet


My project is 100 Paper Cuts 
 
. The project aims to improve LibreOffice's user interface, 
implementing enhancement requests and solving the most annoying UX 
issues. I will try to solve as many issues as I can during GSoC.


I'm very thankful to the GSoC and LibreOffice to provide this great 
opportunity.


--
Regards,
Bayram Çiçek

___
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: Branch 'libreoffice-7-1-4' - cui/source

[Muhammet Kara (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dc5d49da82e8ad2d2ae32aa40e53c62817902fc7
Author: Muhammet Kara 
AuthorDate: Sat May 29 18:17:54 2021 +0300
Commit: Caolán McNamara 
CommitDate: Tue Jun 1 09:49:44 2021 +0200

tdf#136292: Fix crash on invalid JSON from the extensions API

Change-Id: I91ed555f93173dee10e87025b231560693be50b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116390
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
(cherry picked from commit e98b0891d6e0f1d6be4e4a4761bd1ab16bfab85c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116168
Reviewed-by: Xisco Fauli 
(cherry picked from commit 9a9089d0f7c205ed6428e55fb86062c715483a4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116171
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 8bd5dee65222..a80e8562c398 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -45,6 +45,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -124,7 +125,15 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
 if (rResponse.empty())
 return;
 
-aJsonDoc.load(rResponse, aConfig);
+try
+{
+aJsonDoc.load(rResponse, aConfig);
+}
+catch (const orcus::json::parse_error&)
+{
+TOOLS_WARN_EXCEPTION("cui.dialogs", "Invalid JSON file from the 
extensions API");
+return;
+}
 
 auto aDocumentRoot = aJsonDoc.get_document_root();
 if (aDocumentRoot.type() != orcus::json::node_t::object)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/source

[Muhammet Kara (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 9a9089d0f7c205ed6428e55fb86062c715483a4b
Author: Muhammet Kara 
AuthorDate: Sat May 29 18:17:54 2021 +0300
Commit: Xisco Fauli 
CommitDate: Mon May 31 09:18:26 2021 +0200

tdf#136292: Fix crash on invalid JSON from the extensions API

Change-Id: I91ed555f93173dee10e87025b231560693be50b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116390
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
(cherry picked from commit e98b0891d6e0f1d6be4e4a4761bd1ab16bfab85c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116168
Reviewed-by: Xisco Fauli 

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 8bd5dee65222..a80e8562c398 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -45,6 +45,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -124,7 +125,15 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
 if (rResponse.empty())
 return;
 
-aJsonDoc.load(rResponse, aConfig);
+try
+{
+aJsonDoc.load(rResponse, aConfig);
+}
+catch (const orcus::json::parse_error&)
+{
+TOOLS_WARN_EXCEPTION("cui.dialogs", "Invalid JSON file from the 
extensions API");
+return;
+}
 
 auto aDocumentRoot = aJsonDoc.get_document_root();
 if (aDocumentRoot.type() != orcus::json::node_t::object)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit e98b0891d6e0f1d6be4e4a4761bd1ab16bfab85c
Author: Muhammet Kara 
AuthorDate: Sat May 29 18:17:54 2021 +0300
Commit: Muhammet Kara 
CommitDate: Sun May 30 07:11:05 2021 +0200

tdf#136292: Fix crash on invalid JSON from the extensions API

Change-Id: I91ed555f93173dee10e87025b231560693be50b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116390
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 344bcf5f9ba3..5ca2d10051ec 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -52,6 +52,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -131,7 +132,15 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
 if (rResponse.empty())
 return;
 
-aJsonDoc.load(rResponse, aConfig);
+try
+{
+aJsonDoc.load(rResponse, aConfig);
+}
+catch (const orcus::json::parse_error&)
+{
+TOOLS_WARN_EXCEPTION("cui.dialogs", "Invalid JSON file from the 
extensions API");
+return;
+}
 
 auto aDocumentRoot = aJsonDoc.get_document_root();
 if (aDocumentRoot.type() != orcus::json::node_t::object)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/view/charttypes/AreaChart.cxx |3 +--
 chart2/source/view/charttypes/BarChart.cxx  |3 +--
 chart2/source/view/charttypes/NetChart.cxx  |3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 0253457e130442423210f99004d4c685fbff288f
Author: Muhammet Kara 
AuthorDate: Sat May 22 21:09:28 2021 +0300
Commit: Muhammet Kara 
CommitDate: Sun May 23 15:29:35 2021 +0200

stlFindInsert: No unnecessary search before insertion to map

Change-Id: I7d1dc5d524a8a6f43f8371250d9e6f3c9c7a2589
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115995
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/chart2/source/view/charttypes/AreaChart.cxx 
b/chart2/source/view/charttypes/AreaChart.cxx
index a658a26d04a6..9421e94e6e9e 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -664,8 +664,7 @@ void AreaChart::createShapes()
 {
 std::map< sal_Int32, double >& rLogicYSumMap = 
aLogicYSumMapByX[nIndex];
 sal_Int32 nAttachedAxisIndex = 
pSeries->getAttachedAxisIndex();
-if( 
rLogicYSumMap.find(nAttachedAxisIndex)==rLogicYSumMap.end() )
-rLogicYSumMap[nAttachedAxisIndex]=0.0;
+rLogicYSumMap.insert({nAttachedAxisIndex, 0.0});
 
 m_pPosHelper = 
(nAttachedAxisIndex);
 
diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index a1de2d065003..ccdb6a9bc58d 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -518,8 +518,7 @@ void BarChart::createShapes()
 for( auto& rXSlot : rZSlot )
 {
 sal_Int32 nAttachedAxisIndex = 
rXSlot.getAttachedAxisIndexForFirstSeries();
-if( 
aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
-aLogicYSumMap[nAttachedAxisIndex]=0.0;
+aLogicYSumMap.insert({nAttachedAxisIndex, 0.0});
 
 const sal_Int32 nSlotPoints = rXSlot.getPointCount();
 if( nPointIndex >= nSlotPoints )
diff --git a/chart2/source/view/charttypes/NetChart.cxx 
b/chart2/source/view/charttypes/NetChart.cxx
index a8a0f776dd24..da270d37de48 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -369,8 +369,7 @@ void NetChart::createShapes()
 pSeries->doSortByXValues();
 
 sal_Int32 nAttachedAxisIndex = 
pSeries->getAttachedAxisIndex();
-if( 
aLogicYSumMap.find(nAttachedAxisIndex)==aLogicYSumMap.end() )
-aLogicYSumMap[nAttachedAxisIndex]=0.0;
+aLogicYSumMap.insert({nAttachedAxisIndex, 0.0});
 
 m_pPosHelper = 
(nAttachedAxisIndex);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/customize/CommandCategoryListBox.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 60cba23bc0f5e8eafecc03c437f1133b62569fa6
Author: Muhammet Kara 
AuthorDate: Sat May 22 22:51:36 2021 +0300
Commit: Muhammet Kara 
CommitDate: Sun May 23 00:18:41 2021 +0200

tdf#116491: Customize: Hide experimental commands when not in experimental 
mode

Change-Id: Ibc88e9c90b261b5294fab8041e0b530016f45f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116006
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 5b8903f3d199..7823607114e8 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -222,6 +223,7 @@ void CommandCategoryListBox::FillFunctionsList(
 // Setup search filter parameters
 m_searchOptions.searchString = filterTerm;
 utl::TextSearch textSearch(m_searchOptions);
+const bool bInExperimentalMode = 
officecfg::Office::Common::Misc::ExperimentalMode::get();
 
 for (const auto& rInfo : xCommands)
 {
@@ -234,11 +236,17 @@ void CommandCategoryListBox::FillFunctionsList(
 = vcl::CommandInfoProvider::GetTooltipForCommand(rInfo.Command, 
aProperties, m_xFrame);
 OUString sPopupLabel = 
(vcl::CommandInfoProvider::GetPopupLabelForCommand(aProperties))
.replaceFirst("~", "");
+bool bIsExperimental
+= vcl::CommandInfoProvider::IsExperimental(rInfo.Command, 
m_sModuleLongName);
+
+// Hide experimental commands when not in experimental mode
+bool bHideExperimental = bIsExperimental && !bInExperimentalMode;
 
 // Apply the search filter
-if (!filterTerm.isEmpty() && !textSearch.searchForward(sUIName)
-&& !textSearch.searchForward(sLabel) && 
!textSearch.searchForward(sTooltipLabel)
-&& !textSearch.searchForward(sPopupLabel))
+if (bHideExperimental
+|| (!filterTerm.isEmpty() && !textSearch.searchForward(sUIName)
+&& !textSearch.searchForward(sLabel) && 
!textSearch.searchForward(sTooltipLabel)
+&& !textSearch.searchForward(sPopupLabel)))
 {
 continue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitpod.dockerfile

[Muhammet Kara (via logerrit)]

 .gitpod.dockerfile |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4b5d046ca33b2fc62dd16284c030234df62e7276
Author: Muhammet Kara 
AuthorDate: Sat May 22 19:25:02 2021 +0300
Commit: Muhammet Kara 
CommitDate: Sat May 22 19:35:47 2021 +0200

Upgrade .gitpod.dockerfile to Ubuntu focal

and add vnc support

Change-Id: Ibf037eb8fb4f3c2b9389d60d675728f57c994373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115992
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index e0a9d97efe1d..9768b2986a23 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -1,10 +1,10 @@
-FROM gitpod/workspace-full
+FROM gitpod/workspace-full-vnc
 
-RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco main 
restricted >> /etc/apt/sources.list" \
- && sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco-updates 
main restricted >> /etc/apt/sources.list" \
- && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
main restricted >> /etc/apt/sources.list" \
- && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
universe >> /etc/apt/sources.list" \
- && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
multiverse >> /etc/apt/sources.list" \
+RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ focal main 
restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ focal-updates 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security 
universe >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ focal-security 
multiverse >> /etc/apt/sources.list" \
  && sudo apt-get update \
  && sudo apt-get install -y \
 build-essential git libkrb5-dev graphviz nasm \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Looking for projects to be improved on github

[Muhammet Kara]

Hi Anmol,

LibreOffice core repo on GitHub is only a mirror. The actual development 
flow takes place on our code review platform: https://gerrit.libreoffice.org


To start contributing to LibreOffice, you may follow the steps here: 
https://wiki.documentfoundation.org/Development/GetInvolved


Best,
Muhammet


On 11/23/20 5:35 PM, Anmol Hira wrote:

Dear Sir,
My name is Anmol Hira. I have done a diploma in computer science in  
2018 and after that, I have done an internship in my college as a 
software developer intern. I have also participated in counselling for 
B.Tech in 2nd year in GURU GOBIND SINGH INDERPRASTHA UNIVERSITY,DELHI.


I want some guidance from you. Can you tell me what can I do to 
improve your software on GITHUB, Please?. Feel free to contact me.


From Anmol Hira
Contact Email- anmol.hira...@gmail.com 

___
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: Branch 'distro/collabora/cp-6.4' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 121bbf069a0c2dd5990c8da89a3fc060ae83cb92
Author: Muhammet Kara 
AuthorDate: Wed Mar 18 13:56:43 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Nov 13 16:31:58 2020 +0100

Sidebar tdf#92768: Fix title & subtitle checkboxes on the ChartDeck

Turns out the 2nd part of tdf#92768 was not implemented yet, so it is
still necessary to remove the title/subtitle for good, otherwise we set
the "Visibility" property, but nothing actually reads that when
rendering.

So the titles now work as they did before the regression. An uncheck action
removes the title/subtitle, and a check action just makes the existing
title/subtitle visible or creates a new one if it doesn't exist

Change-Id: I23122d1be2d95af878b824ba194bd1aeed5f4f89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90692
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105640
    Reviewed-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index ac48b0a7e9cb..14fd14dad5d5 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -592,7 +592,9 @@ void 
ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV
 }
 else
 {
-TitleHelper::hideTitle(eTitle, mxModel);
+// TODO tdf#92768 use TitleHelper::hideTitle() here once there is
+// rendering suport for the property "Visible"
+TitleHelper::removeTitle(eTitle, mxModel);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5858f628829ccd14e4915c138d798e03dba20edc
Author: Muhammet Kara 
AuthorDate: Wed Mar 18 13:56:43 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Fri Nov 13 14:34:14 2020 +0100

Sidebar tdf#92768: Fix title & subtitle checkboxes on the ChartDeck

Turns out the 2nd part of tdf#92768 was not implemented yet, so it is
still necessary to remove the title/subtitle for good, otherwise we set
the "Visibility" property, but nothing actually reads that when
rendering.

So the titles now work as they did before the regression. An uncheck action
removes the title/subtitle, and a check action just makes the existing
title/subtitle visible or creates a new one if it doesn't exist

Change-Id: I23122d1be2d95af878b824ba194bd1aeed5f4f89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90692
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105737
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 4158924fbfb0..c380459cfd9f 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -663,7 +663,9 @@ void 
ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV
 }
 else
 {
-TitleHelper::hideTitle(eTitle, mxModel);
+// TODO tdf#92768 use TitleHelper::hideTitle() here once there is
+// rendering suport for the property "Visible"
+TitleHelper::removeTitle(eTitle, mxModel);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-blame-ignore-revs

[Muhammet Kara (via logerrit)]

 .git-blame-ignore-revs |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8fbee94f42708c664d424883e9acfea43f3612ed
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 22:33:43 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 22:35:07 2020 +0200

put clang-format commits to .git-blame-ignore-revs

Change-Id: Icaddc983c153e021fa9bdd4e4b7c974648e346dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104509
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 8e3b1412..2cfc555cf365 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -36,3 +36,7 @@ b86ca947115f2ef61dd71c7a43e7a3ec1f1cf3b0
 6dc2e26e0103137863f4e2d8c1f0c6511b164b66
 7da92c6fff9549ebbea5e527b72ffd89faa46f71
 261cd2301d0cb581de2238913bd99e2041ad6eda
+2242774bc8a35cda736d65d0f4b647cf394ca6ee
+11485a500196af7a2533787f4faf32e14693f480
+e190529f40988bbeb23b7b3abaeca6900f96213f
+35fa77d0137350e69b17418e2bc33f1fa0be2efb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 cui/source/customize/SvxToolbarConfigPage.cxx |  474 --
 cui/source/inc/SvxToolbarConfigPage.hxx   |   53 +-
 solenv/clang-format/excludelist   |2 
 3 files changed, 255 insertions(+), 274 deletions(-)

New commits:
commit 35fa77d0137350e69b17418e2bc33f1fa0be2efb
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 19:48:16 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 20:57:51 2020 +0200

clang-format customize/SvxToolbarConfigPage

Change-Id: If9b3fcbaa8e900d73c8dd0e727b4059c3b30ac01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104485
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 740fa426feb0..57f78dcd6161 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -42,15 +42,19 @@
 
 #include 
 
-SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rSet)
+SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage,
+   weld::DialogController* pController,
+   const SfxItemSet& rSet)
 : SvxConfigPage(pPage, pController, rSet)
 {
 m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn");
 m_xGearBtn->show();
 m_xContainer->set_help_id(HID_SVX_CONFIG_TOOLBAR);
 
-m_xContentsListBox.reset(new 
SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this));
-m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(*this, 
m_xContentsListBox->get_widget()));
+m_xContentsListBox.reset(
+new 
SvxToolbarEntriesListBox(m_xBuilder->weld_tree_view("toolcontents"), this));
+m_xDropTargetHelper.reset(
+new SvxConfigPageFunctionDropTarget(*this, 
m_xContentsListBox->get_widget()));
 
 weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
 Size aSize(m_xFunctions->get_size_request());
@@ -58,44 +62,38 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* 
pPage, weld::DialogC
 
 rTreeView.set_hexpand(true);
 rTreeView.set_vexpand(true);
-rTreeView.set_help_id( HID_SVX_CONFIG_TOOLBAR_CONTENTS );
+rTreeView.set_help_id(HID_SVX_CONFIG_TOOLBAR_CONTENTS);
 rTreeView.show();
 
-rTreeView.connect_changed(
-LINK( this, SvxToolbarConfigPage, SelectToolbarEntry ) );
-rTreeView.connect_popup_menu( LINK( this, SvxToolbarConfigPage, 
ContentContextMenuHdl ) );
+rTreeView.connect_changed(LINK(this, SvxToolbarConfigPage, 
SelectToolbarEntry));
+rTreeView.connect_popup_menu(LINK(this, SvxToolbarConfigPage, 
ContentContextMenuHdl));
 
 m_xFunctions->get_widget().connect_popup_menu(
-LINK( this, SvxToolbarConfigPage, FunctionContextMenuHdl ) );
+LINK(this, SvxToolbarConfigPage, FunctionContextMenuHdl));
 
-m_xTopLevelListBox->set_help_id ( HID_SVX_TOPLEVELLISTBOX );
-m_xSaveInListBox->set_help_id( HID_SVX_SAVE_IN );
-m_xMoveUpButton->set_help_id( HID_SVX_UP_TOOLBAR_ITEM );
-m_xMoveDownButton->set_help_id( HID_SVX_DOWN_TOOLBAR_ITEM );
-m_xDescriptionField->set_help_id ( HID_SVX_DESCFIELD );
+m_xTopLevelListBox->set_help_id(HID_SVX_TOPLEVELLISTBOX);
+m_xSaveInListBox->set_help_id(HID_SVX_SAVE_IN);
+m_xMoveUpButton->set_help_id(HID_SVX_UP_TOOLBAR_ITEM);
+m_xMoveDownButton->set_help_id(HID_SVX_DOWN_TOOLBAR_ITEM);
+m_xDescriptionField->set_help_id(HID_SVX_DESCFIELD);
 
-m_xCommandCategoryListBox->connect_changed(
-LINK( this, SvxToolbarConfigPage, SelectCategory ) );
+m_xCommandCategoryListBox->connect_changed(LINK(this, 
SvxToolbarConfigPage, SelectCategory));
 
-m_xGearBtn->connect_selected(
-LINK( this, SvxToolbarConfigPage, GearHdl ) );
+m_xGearBtn->connect_selected(LINK(this, SvxToolbarConfigPage, GearHdl));
 
-m_xMoveUpButton->connect_clicked( LINK( this, SvxToolbarConfigPage, 
MoveHdl) );
-m_xMoveDownButton->connect_clicked( LINK( this, SvxToolbarConfigPage, 
MoveHdl) );
+m_xMoveUpButton->connect_clicked(LINK(this, SvxToolbarConfigPage, 
MoveHdl));
+m_xMoveDownButton->connect_clicked(LINK(this, SvxToolbarConfigPage, 
MoveHdl));
 // Always enable Up and Down buttons
 // added for issue i53677 by shizhoubo
 m_xMoveDownButton->set_sensitive(true);
 m_xMoveUpButton->set_sensitive(true);
 
-m_xAddCommandButton->connect_clicked( LINK( this, SvxToolbarConfigPage, 
AddCommandHdl ) );
-m_xRemoveCommandButton->connect_clicked( LINK( this, SvxToolbarConfigPage, 
RemoveCommandHdl ) );
+m_xAddCommandButton->connect_clicked(LINK(this, SvxToolbarConfigPage, 
AddCommandHdl));
+m_xRemoveCommandButton->connect_clicked(L

[Libreoffice-commits] core.git: cui/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 cui/source/customize/SvxMenuConfigPage.cxx |  245 ++---
 cui/source/inc/SvxMenuConfigPage.hxx   |   47 ++---
 solenv/clang-format/excludelist|2 
 3 files changed, 144 insertions(+), 150 deletions(-)

New commits:
commit e190529f40988bbeb23b7b3abaeca6900f96213f
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 18:55:37 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 20:53:59 2020 +0200

clang-format customize/SvxMenuConfigPage

Change-Id: I9ad8012d31c8e727fa4c8c840f15a93ca47541cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104483
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index d3fed61015a2..3181a78bbb07 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -36,13 +36,15 @@
 
 #include 
 
-SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rSet, bool bIsMenuBar)
+SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, 
weld::DialogController* pController,
+ const SfxItemSet& rSet, bool bIsMenuBar)
 : SvxConfigPage(pPage, pController, rSet)
 , m_bIsMenuBar(bIsMenuBar)
 {
 m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn");
 m_xGearBtn->show();
-m_xContentsListBox.reset(new 
SvxMenuEntriesListBox(m_xBuilder->weld_tree_view("menucontents"), this));
+m_xContentsListBox.reset(
+new SvxMenuEntriesListBox(m_xBuilder->weld_tree_view("menucontents"), 
this));
 weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
 m_xDropTargetHelper.reset(new SvxConfigPageFunctionDropTarget(*this, 
rTreeView));
 rTreeView.connect_size_allocate(LINK(this, SvxMenuConfigPage, 
MenuEntriesSizeAllocHdl));
@@ -53,36 +55,32 @@ SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* 
pPage, weld::DialogControl
 rTreeView.set_vexpand(true);
 rTreeView.show();
 
-rTreeView.connect_changed(
-LINK( this, SvxMenuConfigPage, SelectMenuEntry ) );
-rTreeView.connect_popup_menu( LINK( this, SvxMenuConfigPage, 
ContentContextMenuHdl ) );
+rTreeView.connect_changed(LINK(this, SvxMenuConfigPage, SelectMenuEntry));
+rTreeView.connect_popup_menu(LINK(this, SvxMenuConfigPage, 
ContentContextMenuHdl));
 
 m_xFunctions->get_widget().connect_popup_menu(
-LINK( this, SvxMenuConfigPage, FunctionContextMenuHdl ) );
+LINK(this, SvxMenuConfigPage, FunctionContextMenuHdl));
 
 m_xGearBtn->connect_selected(LINK(this, SvxMenuConfigPage, GearHdl));
 
 m_xCommandCategoryListBox->connect_changed(LINK(this, SvxMenuConfigPage, 
SelectCategory));
 
-m_xMoveUpButton->connect_clicked( LINK( this, SvxConfigPage, MoveHdl) );
-m_xMoveDownButton->connect_clicked( LINK( this, SvxConfigPage, MoveHdl) );
+m_xMoveUpButton->connect_clicked(LINK(this, SvxConfigPage, MoveHdl));
+m_xMoveDownButton->connect_clicked(LINK(this, SvxConfigPage, MoveHdl));
 
-m_xAddCommandButton->connect_clicked( LINK( this, SvxMenuConfigPage, 
AddCommandHdl ) );
-m_xRemoveCommandButton->connect_clicked( LINK( this, SvxMenuConfigPage, 
RemoveCommandHdl ) );
+m_xAddCommandButton->connect_clicked(LINK(this, SvxMenuConfigPage, 
AddCommandHdl));
+m_xRemoveCommandButton->connect_clicked(LINK(this, SvxMenuConfigPage, 
RemoveCommandHdl));
 
-m_xInsertBtn->connect_selected(
-LINK( this, SvxMenuConfigPage, InsertHdl ) );
-m_xModifyBtn->connect_selected(
-LINK( this, SvxMenuConfigPage, ModifyItemHdl ) );
-m_xResetBtn->connect_clicked(
-LINK( this, SvxMenuConfigPage, ResetMenuHdl ) );
+m_xInsertBtn->connect_selected(LINK(this, SvxMenuConfigPage, InsertHdl));
+m_xModifyBtn->connect_selected(LINK(this, SvxMenuConfigPage, 
ModifyItemHdl));
+m_xResetBtn->connect_clicked(LINK(this, SvxMenuConfigPage, ResetMenuHdl));
 
 // These operations are not possible on menus/context menus yet
 m_xModifyBtn->remove_item("changeIcon");
 m_xModifyBtn->remove_item("resetIcon");
 m_xModifyBtn->remove_item("restoreItem");
 
-if ( !bIsMenuBar )
+if (!bIsMenuBar)
 {
 //TODO: Remove this when the gear button is implemented for context 
menus
 m_xGearBtn->set_sensitive(false);
@@ -102,7 +100,8 @@ void SvxMenuConfigPage::ListModified()
 pEntries->clear();
 
 for (int i = 0; i < m_xContentsListBox->n_children(); ++i)
-
pEntries->push_back(reinterpret_cast(m_xContentsListBox->get_id(i).toInt64()));
+pEntries->push_back(
+
reinterpret_cast(m_xContentsListBox->get_id(i).toInt64()));
 
 GetSaveInData()->SetModified();
 GetTopLevelSelecti

[Libreoffice-commits] core.git: cui/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 cui/source/customize/SvxConfigPageHelper.cxx |  224 ---
 cui/source/inc/SvxConfigPageHelper.hxx   |   77 +++--
 solenv/clang-format/excludelist  |2 
 3 files changed, 132 insertions(+), 171 deletions(-)

New commits:
commit 11485a500196af7a2533787f4faf32e14693f480
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 17:15:45 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 17:43:53 2020 +0200

clang-format customize/SvxConfigPageHelper

Change-Id: Ia802bfc4a6cd8d970fbb3c37a55959729ea19257
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104481
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/SvxConfigPageHelper.cxx 
b/cui/source/customize/SvxConfigPageHelper.cxx
index 033219f4d9a0..d54bb7cdaf1a 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -27,52 +27,43 @@
 #include 
 #include 
 
-static sal_Int16 theImageType =
-css::ui::ImageType::COLOR_NORMAL |
-css::ui::ImageType::SIZE_DEFAULT;
+static sal_Int16 theImageType = css::ui::ImageType::COLOR_NORMAL | 
css::ui::ImageType::SIZE_DEFAULT;
 
-void SvxConfigPageHelper::RemoveEntry( SvxEntries* pEntries, SvxConfigEntry 
const * pChildEntry )
+void SvxConfigPageHelper::RemoveEntry(SvxEntries* pEntries, SvxConfigEntry 
const* pChildEntry)
 {
 SvxEntries::iterator iter = pEntries->begin();
 
-while ( iter != pEntries->end() )
+while (iter != pEntries->end())
 {
-if ( pChildEntry == *iter )
+if (pChildEntry == *iter)
 {
-pEntries->erase( iter );
+pEntries->erase(iter);
 break;
 }
 ++iter;
 }
 }
 
-OUString SvxConfigPageHelper::replaceSaveInName( const OUString& rMessage, 
const OUString& rSaveInName )
+OUString SvxConfigPageHelper::replaceSaveInName(const OUString& rMessage,
+const OUString& rSaveInName)
 {
 OUString name = rMessage.replaceFirst("%SAVE IN SELECTION%", rSaveInName);
 
 return name;
 }
 
-OUString SvxConfigPageHelper::stripHotKey( const OUString& str )
-{
-return str.replaceFirst("~", "");
-}
+OUString SvxConfigPageHelper::stripHotKey(const OUString& str) { return 
str.replaceFirst("~", ""); }
 
-OUString SvxConfigPageHelper::replaceSixteen( const OUString& str, sal_Int32 
nReplacement )
+OUString SvxConfigPageHelper::replaceSixteen(const OUString& str, sal_Int32 
nReplacement)
 {
-return str.replaceAll( OUString::number( 16 ), OUString::number( 
nReplacement ));
+return str.replaceAll(OUString::number(16), 
OUString::number(nReplacement));
 }
 
-sal_Int16 SvxConfigPageHelper::GetImageType()
-{
-return theImageType;
-}
+sal_Int16 SvxConfigPageHelper::GetImageType() { return theImageType; }
 
 void SvxConfigPageHelper::InitImageType()
 {
-theImageType =
-css::ui::ImageType::COLOR_NORMAL |
-css::ui::ImageType::SIZE_DEFAULT;
+theImageType = css::ui::ImageType::COLOR_NORMAL | 
css::ui::ImageType::SIZE_DEFAULT;
 
 if (SvtMiscOptions().GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE)
 {
@@ -84,30 +75,29 @@ void SvxConfigPageHelper::InitImageType()
 }
 }
 
-css::uno::Reference< css::graphic::XGraphic > SvxConfigPageHelper::GetGraphic(
-const css::uno::Reference< css::ui::XImageManager >& xImageManager,
-const OUString& rCommandURL )
+css::uno::Reference
+SvxConfigPageHelper::GetGraphic(const 
css::uno::Reference& xImageManager,
+const OUString& rCommandURL)
 {
-css::uno::Reference< css::graphic::XGraphic > result;
+css::uno::Reference result;
 
-if ( xImageManager.is() )
+if (xImageManager.is())
 {
 // TODO handle large graphics
-css::uno::Sequence< css::uno::Reference< css::graphic::XGraphic > > 
aGraphicSeq;
+css::uno::Sequence> 
aGraphicSeq;
 
-css::uno::Sequence aImageCmdSeq { rCommandURL };
+css::uno::Sequence aImageCmdSeq{ rCommandURL };
 
 try
 {
-aGraphicSeq =
-xImageManager->getImages( GetImageType(), aImageCmdSeq );
+aGraphicSeq = xImageManager->getImages(GetImageType(), 
aImageCmdSeq);
 
-if ( aGraphicSeq.hasElements() )
+if (aGraphicSeq.hasElements())
 {
-result =  aGraphicSeq[0];
+result = aGraphicSeq[0];
 }
 }
-catch ( css::uno::Exception& )
+catch (css::uno::Exception&)
 {
 // will return empty XGraphic
 }
@@ -116,22 +106,19 @@ css::uno::Reference< css::graphic::XGraphic > 
SvxConfigPageHelper::GetGraphic(
 return result;
 }
 
-OUString
-SvxConfigPageHelper::generateCustomName(
-const OUSt

[Libreoffice-commits] core.git: cui/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 cui/source/customize/CommandCategoryListBox.cxx |  309 +---
 cui/source/inc/CommandCategoryListBox.hxx   |   50 ++-
 solenv/clang-format/excludelist |2 
 3 files changed, 196 insertions(+), 165 deletions(-)

New commits:
commit 2242774bc8a35cda736d65d0f4b647cf394ca6ee
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 16:21:59 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 16:08:31 2020 +0200

clang-format CommandCategoryListBox

Change-Id: If7ae64a0b9be01b3fa73310a4d9834ae3c151c10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104479
Reviewed-by: Yusuf Keten 
Reviewed-by: Muhammet Kara 
Tested-by: Jenkins

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 1337c3dd48dd..5b8903f3d199 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -51,39 +51,36 @@
 #include  //for SaveInData
 
 CommandCategoryListBox::CommandCategoryListBox(std::unique_ptr 
xControl)
-: pStylesInfo( nullptr )
+: pStylesInfo(nullptr)
 , m_xControl(std::move(xControl))
 {
 //Initialize search util
 m_searchOptions.AlgorithmType2 = css::util::SearchAlgorithms2::ABSOLUTE;
 m_searchOptions.transliterateFlags |= TransliterationFlags::IGNORE_CASE;
 m_searchOptions.searchFlag |= (css::util::SearchFlags::REG_NOT_BEGINOFLINE
-| css::util::SearchFlags::REG_NOT_ENDOFLINE);
+   | 
css::util::SearchFlags::REG_NOT_ENDOFLINE);
 }
 
-CommandCategoryListBox::~CommandCategoryListBox()
-{
-ClearAll();
-}
+CommandCategoryListBox::~CommandCategoryListBox() { ClearAll(); }
 
 void CommandCategoryListBox::ClearAll()
 {
 // Clear objects from m_aGroupInfo vector to avoid memory leak
-for (const auto & It : m_aGroupInfo)
+for (const auto& It : m_aGroupInfo)
 {
-if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
+if (It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject)
 {
 SfxStyleInfo_Impl* pStyle = 
static_cast(It->pObject);
 delete pStyle;
 }
-else if ( It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject )
+else if (It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject)
 {
 OUString* pScriptURI = static_cast(It->pObject);
 delete pScriptURI;
 }
-else if ( It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && 
It->pObject)
+else if (It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && It->pObject)
 {
-css::uno::XInterface* xi = static_cast(It->pObject);
+css::uno::XInterface* xi = 
static_cast(It->pObject);
 if (xi != nullptr)
 {
 xi->release();
@@ -95,10 +92,9 @@ void CommandCategoryListBox::ClearAll()
 m_xControl->clear();
 }
 
-void CommandCategoryListBox::Init(
-const css::uno::Reference< css::uno::XComponentContext >& xContext,
-const css::uno::Reference< css::frame::XFrame >& xFrame,
-const OUString& sModuleLongName)
+void CommandCategoryListBox::Init(const 
css::uno::Reference& xContext,
+  const 
css::uno::Reference& xFrame,
+  const OUString& sModuleLongName)
 {
 // User will not see incomplete UI
 m_xControl->freeze();
@@ -108,9 +104,10 @@ void CommandCategoryListBox::Init(
 m_xFrame = xFrame;
 
 m_sModuleLongName = sModuleLongName;
-m_xGlobalCategoryInfo = css::ui::theUICategoryDescription::get( m_xContext 
);
-
m_xModuleCategoryInfo.set(m_xGlobalCategoryInfo->getByName(m_sModuleLongName), 
css::uno::UNO_QUERY_THROW);
-m_xUICmdDescription   = css::frame::theUICommandDescription::get( 
m_xContext );
+m_xGlobalCategoryInfo = css::ui::theUICategoryDescription::get(m_xContext);
+
m_xModuleCategoryInfo.set(m_xGlobalCategoryInfo->getByName(m_sModuleLongName),
+  css::uno::UNO_QUERY_THROW);
+m_xUICmdDescription = css::frame::theUICommandDescription::get(m_xContext);
 
 // Support style commands
 css::uno::Reference xController;
@@ -125,16 +122,20 @@ void CommandCategoryListBox::Init(
 
 try
 {
-css::uno::Reference< css::frame::XDispatchInformationProvider > 
xProvider(m_xFrame, css::uno::UNO_QUERY_THROW);
-css::uno::Sequence< sal_Int16 > lGroups = 
xProvider->getSupportedCommandGroups();
+css::uno::Reference 
xProvider(
+m_xFrame, css::uno::UNO_QUERY_THROW);
+css::uno::Sequence lGroups = 
xProvider->getSupportedCommandGroups();
 
 sal_Int32 nGroupsLength = lGroups.getLength();
 
-if ( nGroupsLength > 0 )
+  

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3371e11d23635c69f242507a33b60daf2c21b433
Author: Muhammet Kara 
AuthorDate: Sun Oct 18 01:35:25 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Oct 18 01:18:46 2020 +0200

tdf#137460: Additions: Fix crash on error 404

Change-Id: Id1eb6d43add5d5d9c9f6c09a1e5a4137462f596e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104473
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index ad8f5de0928b..cf9a605d5970 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -123,6 +123,7 @@ std::string curlGet(const OString& rURL)
 if (http_code != 200)
 {
 SAL_WARN("cui.dialogs", "Download failed. Error code: " << http_code);
+response_body.clear();
 }
 
 if (cc != CURLE_OK)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc|3 ++-
 cui/source/dialogs/AdditionsDialog.cxx |   19 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 627e13079adb5ff6281530c9584da9065d6410ab
Author: Muhammet Kara 
AuthorDate: Fri Sep 11 00:44:03 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Sep 11 10:26:38 2020 +0200

Additions: Clean-up and localize labels

Change-Id: I7073df0d277399745a9c7e0de4d240121ce7b37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102410
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d1b39a67e541..92f5b665c7ee 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -393,11 +393,12 @@
 #define RID_SVXSTR_DELETEUSERCOLOR2 
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
 
 #define RID_SVXSTR_ADDITIONS_INSTALLBUTTON  
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
+#define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
+#define RID_SVXSTR_ADDITIONS_INSTALLING 
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
 #define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
 #define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
-#define RID_SVXSTR_ADDITIONS_NORESULTS  
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
 #define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
 #endif
 
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index fcae696e7e5f..c9b70b2bf908 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -408,7 +408,8 @@ void SearchAndParseThread::CheckInstalledExtensions()
 else
 {
 rInfo->m_xButtonInstall->set_sensitive(false);
-rInfo->m_xButtonInstall->set_label("Installed");
+rInfo->m_xButtonInstall->set_label(
+CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
 }
 }
 }
@@ -756,14 +757,14 @@ IMPL_LINK_NOARG(AdditionsItem, ShowMoreHdl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void)
 {
-m_xButtonInstall->set_label("Installing");
+m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLING));
 m_xButtonInstall->set_sensitive(false);
 OUString aExtensionFile;
 bool bResult = getExtensionFile(aExtensionFile); // info vector json data
 
 if (!bResult)
 {
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 
 SAL_INFO("cui.dialogs", "Couldn't get the extension file.");
@@ -778,36 +779,36 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, 
void)
 {
 m_pParentDialog->m_xExtensionManager->addExtension(
 aExtensionFile, uno::Sequence(), "user", 
xAbortChannel, xCmdEnv);
-m_xButtonInstall->set_label("Installed");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
 }
 catch (const ucb::CommandFailedException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension 
CommandFailedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 }
 catch (const ucb::CommandAbortedException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension 
CommandAbortedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 }
 catch (const deployment::DeploymentException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension DeploymentException 
occurred.");
-m_xButtonInstall->set_label(&q

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/dialogs/hlmarkwn.cxx |4 ++--
 cui/source/dialogs/insdlg.cxx   |2 +-
 cui/source/tabpages/numfmt.cxx  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 55a6ecb44d45afc5033969c0c8b0245497477aed
Author: Muhammet Kara 
AuthorDate: Thu Sep 10 23:32:50 2020 +0300
Commit: Muhammet Kara 
CommitDate: Thu Sep 10 23:56:08 2020 +0200

Replace sal_uLong with proper types in cui

Change-Id: I0724105f0d058651d47e6d62bc20e497af37242f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102408
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index bac63d088f73..ab28675b4932 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -285,13 +285,13 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< 
container::XNameAccess >
 {
 int nEntries=0;
 const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
-const sal_uLong nLinks = aNames.getLength();
+const sal_Int32 nLinks = aNames.getLength();
 const OUString* pNames = aNames.getConstArray();
 
 const OUString aProp_LinkDisplayName( "LinkDisplayName" );
 const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" );
 const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" );
-for( sal_uLong i = 0; i < nLinks; i++ )
+for( sal_Int32 i = 0; i < nLinks; i++ )
 {
 uno::Any aAny;
 OUString aLink( *pNames++ );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 4f34b461eba5..273d3c065f73 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -156,7 +156,7 @@ short SvInsertOleDlg::run()
 
 // fill listbox and select default
 m_xLbObjecttype->freeze();
-for ( sal_uLong i = 0; i < m_pServers->Count(); i++ )
+for ( size_t i = 0; i < m_pServers->Count(); i++ )
 m_xLbObjecttype->append_text((*m_pServers)[i].GetHumanName());
 m_xLbObjecttype->thaw();
 m_xLbObjecttype->select(0);
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index c9826d2a7c3e..c4a15bd6b70b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1198,7 +1198,7 @@ void 
SvxNumberFormatTabPage::SelFormatHdl_Impl(weld::Widget* pLb)
 // Format-ListBox 
 if (pLb == m_xLbFormat.get())
 {
-sal_uLong nSelPos = m_xLbFormat->get_selected_index();
+int nSelPos = m_xLbFormat->get_selected_index();
 short nFmtLbSelPos = static_cast(nSelPos);
 
 OUString aFormat = pNumFmtShell->GetFormat4Entry(nFmtLbSelPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source

[Muhammet Kara (via logerrit)]

 xmloff/source/draw/sdxmlexp.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 1b135d95623eb455ce4e633b032ba2226a8b8c94
Author: Muhammet Kara 
AuthorDate: Tue Sep 8 19:04:16 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Sep 9 08:36:57 2020 +0200

Remove unnecessary search before insert

Change-Id: Ie6ba54a61b59879bd047343cc9857d9937cc76c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102269
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index d5b8463b0d6e..dbb761e9ddec 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2400,13 +2400,11 @@ void SdXMLExport::addDataStyle(const sal_Int32 
nNumberFormat, bool bTimeFormat )
 
 if( bTimeFormat )
 {
-if( maUsedTimeStyles.count( nFormat ) == 0 )
-maUsedTimeStyles.insert( nFormat );
+maUsedTimeStyles.insert( nFormat );
 }
 else
 {
-if( maUsedDateStyles.count( nFormat ) == 0 )
-maUsedDateStyles.insert( nFormat );
+maUsedDateStyles.insert( nFormat );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-22'

[Muhammet Kara (via logerrit)]

Tag 'cp-6.2-22' created by Andras Timar  at 
2020-08-05 08:52 +

cp-6.2-22

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.2-22'

[Muhammet Kara (via logerrit)]

Tag 'co-6.2-22' created by Andras Timar  at 
2020-08-05 08:53 +

co-6.2-22

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-21'

[Muhammet Kara (via logerrit)]

Tag 'cp-6.2-21' created by Andras Timar  at 
2020-07-29 09:42 +

cp-6.2-21

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.2-21'

[Muhammet Kara (via logerrit)]

Tag 'co-6.2-21' created by Andras Timar  at 
2020-07-28 08:09 +

co-6.2-21

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-20'

[Muhammet Kara (via logerrit)]

Tag 'cp-6.2-20' created by Andras Timar  at 
2020-07-21 09:01 +

cp-6.2-20

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
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' - scp2/source setup_native/source

[Muhammet Kara (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit c88186145cb2c16a0e32bcdaab523a656a50edb9
Author: Muhammet Kara 
AuthorDate: Wed Jul 1 23:07:00 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jul 2 20:38:39 2020 +0200

Add Turkish (tr) dictionary

Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97670
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 50d5b1a0fdf7..0610c31bb188 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -716,6 +716,15 @@ File gid_File_Extension_Dictionary_Th
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-tr.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 509f4b401572..0c1db4fd4aaf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -676,6 +676,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Tr
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+Files = (gid_File_Extension_Dictionary_Tr);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "tr";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Uk
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
 Files = (gid_File_Extension_Dictionary_Uk);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 88f25615d061..5f7609eba8d9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -340,6 +340,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
 en-US = "Ukrainian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index bcf4813c356e..f3efd5afa4bf 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1107,6 +1107,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Tr"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2014-2018 by Harun Resit Zafer, Muhammet Kara"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Tr dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 881ba99246e0..89dd8978e5c2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -83,6 +83,7 @@ sr-Latn = "sr"
 sw = "sw"
 te = "te"
 th = "th"
+tr = "tr"
 uk = "uk,ru"
 vi = "vi,fr"
 zh-TW = "EMPTY"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.2-19'

[Muhammet Kara (via logerrit)]

Tag 'co-6.2-19' created by Andras Timar  at 
2020-07-02 07:13 +

co-6.2-19

Changes since cp-6.2-18-1:
---
 0 files changed
---
___
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' - scp2/source setup_native/source

[Muhammet Kara (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit f023b24c1e18bb22d49529d165070b5d4e9925a0
Author: Muhammet Kara 
AuthorDate: Wed Jul 1 23:07:00 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jul 2 09:04:49 2020 +0200

Add Turkish (tr) dictionary

Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97588
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0f34c027d85d..238aadd28c09 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -715,6 +715,15 @@ File gid_File_Extension_Dictionary_Th
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-tr.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 509f4b401572..0c1db4fd4aaf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -676,6 +676,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Tr
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+Files = (gid_File_Extension_Dictionary_Tr);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "tr";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Uk
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
 Files = (gid_File_Extension_Dictionary_Uk);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 88f25615d061..5f7609eba8d9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -340,6 +340,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
 en-US = "Ukrainian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 4a0772262793..02a4cdc6f77c 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1103,6 +1103,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Tr"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2014-2018 by Harun Resit Zafer, Muhammet Kara"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Tr dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 881ba99246e0..89dd8978e5c2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -83,6 +83,7 @@ sr-Latn = "sr"
 sw = "sw"
 te = "te"
 th = "th"
+tr = "tr"
 uk = "uk,ru"
 vi = "vi,fr"
 zh-TW = "EMPTY"
___
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' - scp2/source setup_native/source

[Muhammet Kara (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit 51ad2499a01e26e9201bd2f3250a48309826e7ad
Author: Muhammet Kara 
AuthorDate: Wed Jul 1 23:07:00 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jul 2 09:05:07 2020 +0200

Add Turkish (tr) dictionary

Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97589
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 50d5b1a0fdf7..0610c31bb188 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -716,6 +716,15 @@ File gid_File_Extension_Dictionary_Th
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-tr.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 509f4b401572..0c1db4fd4aaf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -676,6 +676,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Tr
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+Files = (gid_File_Extension_Dictionary_Tr);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "tr";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Uk
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
 Files = (gid_File_Extension_Dictionary_Uk);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 88f25615d061..5f7609eba8d9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -340,6 +340,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
 en-US = "Ukrainian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 5e9c51b0c4a0..196095c54deb 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1109,6 +1109,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Tr"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2014-2018 by Harun Resit Zafer, Muhammet Kara"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Tr dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 881ba99246e0..89dd8978e5c2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -83,6 +83,7 @@ sr-Latn = "sr"
 sw = "sw"
 te = "te"
 th = "th"
+tr = "tr"
 uk = "uk,ru"
 vi = "vi,fr"
 zh-TW = "EMPTY"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source setup_native/source

[Muhammet Kara (via logerrit)]

 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 5 files changed, 42 insertions(+)

New commits:
commit 42f7b3605351a9026f2ce6e4a71cba0444b06569
Author: Muhammet Kara 
AuthorDate: Wed Jul 1 23:07:00 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jul 2 09:04:02 2020 +0200

Add Turkish (tr) dictionary

Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97661
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 50d5b1a0fdf7..0610c31bb188 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -716,6 +716,15 @@ File gid_File_Extension_Dictionary_Th
 End
 #endif
 
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-tr.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 509f4b401572..0c1db4fd4aaf 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -676,6 +676,17 @@ Module gid_Module_Root_Extension_Dictionary_Th
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Tr
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+Files = (gid_File_Extension_Dictionary_Tr);
+InstallOrder = "2000";
+Sortkey = "505";
+Spellcheckerlanguage = "tr";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Uk
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
 Files = (gid_File_Extension_Dictionary_Uk);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 88f25615d061..5f7609eba8d9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -340,6 +340,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
 en-US = "Ukrainian"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index bcf4813c356e..f3efd5afa4bf 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -1107,6 +1107,21 @@ destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
 
+Start
+module = "gid_Module_Root_Extension_Dictionary_Tr"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-tr"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2014-2018 by Harun Resit Zafer, Muhammet Kara"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Tr dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
 Start
 module = "gid_Module_Root_Extension_Dictionary_Uk"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-uk"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt 
b/setup_native/source/packinfo/spellchecker_selection.txt
index 881ba99246e0..89dd8978e5c2 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -83,6 +83,7 @@ sr-Latn = "sr"
 sw = "sw"
 te = "te"
 th = "th"
+tr = "tr"
 uk = "uk,ru"
 vi = "vi,fr"
 zh-TW = "EMPTY"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-6.2' - source/tr

[Muhammet Kara (via logerrit)]

 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: Branch 'distro/collabora/cp-6.2' - translations

[Muhammet Kara (via logerrit)]

 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: Branch 'libreoffice-7-0' - include/sfx2 sfx2/source

[Muhammet Kara (via logerrit)]

 include/sfx2/strings.hrc|1 +
 sfx2/source/doc/objserv.cxx |   32 
 2 files changed, 33 insertions(+)

New commits:
commit 49109fa3e450017acd32d119c07f6f27056d75e3
Author: Muhammet Kara 
AuthorDate: Mon Jun 29 22:38:16 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jul 1 01:37:12 2020 +0200

Resolves tdf#130436: Crash on redaction without Draw

Change-Id: Iaa418e9ad5c6e9ba1892cbb428a8a381f52c4246
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97458
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
(cherry picked from commit be85a4d7cc7c15472de9d1584837d5bff7640bf9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97505
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 0c76294bd1f5..4faaf048a6e4 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -208,6 +208,7 @@
 #define STR_REDACTION_JSON_FILE_FILTER  
NC_("STR_REDACTION_JSON_FILE_FILTER", "Target Set (*.json)")
 #define STR_REDACTION_EDIT_TARGET   
NC_("STR_REDACTION_EDIT_TARGET", "Edit Target")
 #define STR_REDACTION_TARGET_ADD_ERROR  
NC_("STR_REDACTION_TARGET_ADD_ERROR", "An error occurred while adding new 
target. Please report this incident.")
+#define STR_REDACTION_NO_DRAW_WARNING   
NC_("STR_REDACTION_NO_DRAW_WARNING", "Draw module is needed for redaction. 
Please make sure you have LibreOffice Draw installed and working correctly.")
 
 #define STR_SFX_FILEDLG_ACTUALVERSION   
NC_("STR_SFX_FILEDLG_ACTUALVERSION", "Current version")
 #define STR_SFX_EXPLORERFILE_EXPORT 
NC_("STR_SFX_EXPLORERFILE_EXPORT", "Export")
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 7e367a88e53e..4f4eebd34a55 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -532,6 +533,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 case SID_AUTOREDACTDOC:
 {
+// Actual redaction takes place on a newly generated Draw document
+if 
(!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
+std::unique_ptr 
xBox(Application::CreateMessageDialog(
+pDialogParent, VclMessageType::Warning, VclButtonsType::Ok,
+SfxResId(STR_REDACTION_NO_DRAW_WARNING)));
+
+xBox->run();
+
+return;
+}
+
 SfxAutoRedactDialog aDlg(pDialogParent);
 sal_Int16 nResult = aDlg.run();
 
@@ -556,6 +569,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 uno::Reference< lang::XComponent > xSourceDoc( xModel );
 
+// Actual redaction takes place on a newly generated Draw document
+if 
(!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
+std::unique_ptr 
xBox(Application::CreateMessageDialog(
+pDialogParent, VclMessageType::Warning, VclButtonsType::Ok,
+SfxResId(STR_REDACTION_NO_DRAW_WARNING)));
+
+xBox->run();
+
+return;
+}
+
 DocumentToGraphicRenderer aRenderer(xSourceDoc, false);
 
 // Get the page margins of the original doc
@@ -576,6 +601,13 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 uno::Reference xDesktop = 
css::frame::Desktop::create(comphelper::getProcessComponentContext());
 uno::Reference xComponent = 
xDesktop->loadComponentFromURL("private:factory/sdraw", "_default", 0, {});
 
+if (!xComponent.is())
+{
+SAL_WARN("sfx.doc", "SID_REDACTDOC: Failed to load new draw 
component. loadComponentFromURL returned an empty reference.");
+
+return;
+}
+
 // Add the doc pages to the new draw document
 SfxRedactionHelper::addPagesToDraw(xComponent, nPages, aMetaFiles, 
aPageSizes, aPageMargins, aRedactionTargets, bIsAutoRedact);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Muhammet Kara (via logerrit)]

 include/sfx2/strings.hrc|1 +
 sfx2/source/doc/objserv.cxx |   32 
 2 files changed, 33 insertions(+)

New commits:
commit be85a4d7cc7c15472de9d1584837d5bff7640bf9
Author: Muhammet Kara 
AuthorDate: Mon Jun 29 22:38:16 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jun 30 21:37:26 2020 +0200

Resolves tdf#130436: Crash on redaction without Draw

Change-Id: Iaa418e9ad5c6e9ba1892cbb428a8a381f52c4246
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97458
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index e845c514049a..c5e61d9ce440 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -208,6 +208,7 @@
 #define STR_REDACTION_JSON_FILE_FILTER  
NC_("STR_REDACTION_JSON_FILE_FILTER", "Target Set (*.json)")
 #define STR_REDACTION_EDIT_TARGET   
NC_("STR_REDACTION_EDIT_TARGET", "Edit Target")
 #define STR_REDACTION_TARGET_ADD_ERROR  
NC_("STR_REDACTION_TARGET_ADD_ERROR", "An error occurred while adding new 
target. Please report this incident.")
+#define STR_REDACTION_NO_DRAW_WARNING   
NC_("STR_REDACTION_NO_DRAW_WARNING", "Draw module is needed for redaction. 
Please make sure you have LibreOffice Draw installed and working correctly.")
 
 #define STR_SFX_FILEDLG_ACTUALVERSION   
NC_("STR_SFX_FILEDLG_ACTUALVERSION", "Current version")
 #define STR_SFX_EXPLORERFILE_EXPORT 
NC_("STR_SFX_EXPLORERFILE_EXPORT", "Export")
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 85406b99ace3..349cac3ac4d0 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -601,6 +602,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 case SID_AUTOREDACTDOC:
 {
+// Actual redaction takes place on a newly generated Draw document
+if 
(!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
+std::unique_ptr 
xBox(Application::CreateMessageDialog(
+pDialogParent, VclMessageType::Warning, VclButtonsType::Ok,
+SfxResId(STR_REDACTION_NO_DRAW_WARNING)));
+
+xBox->run();
+
+return;
+}
+
 SfxAutoRedactDialog aDlg(pDialogParent);
 sal_Int16 nResult = aDlg.run();
 
@@ -625,6 +638,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 uno::Reference< lang::XComponent > xSourceDoc( xModel );
 
+// Actual redaction takes place on a newly generated Draw document
+if 
(!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
+std::unique_ptr 
xBox(Application::CreateMessageDialog(
+pDialogParent, VclMessageType::Warning, VclButtonsType::Ok,
+SfxResId(STR_REDACTION_NO_DRAW_WARNING)));
+
+xBox->run();
+
+return;
+}
+
 DocumentToGraphicRenderer aRenderer(xSourceDoc, false);
 
 // Get the page margins of the original doc
@@ -645,6 +670,13 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 uno::Reference xDesktop = 
css::frame::Desktop::create(comphelper::getProcessComponentContext());
 uno::Reference xComponent = 
xDesktop->loadComponentFromURL("private:factory/sdraw", "_default", 0, {});
 
+if (!xComponent.is())
+{
+SAL_WARN("sfx.doc", "SID_REDACTDOC: Failed to load new draw 
component. loadComponentFromURL returned an empty reference.");
+
+return;
+}
+
 // Add the doc pages to the new draw document
 SfxRedactionHelper::addPagesToDraw(xComponent, nPages, aMetaFiles, 
aPageSizes, aPageMargins, aRedactionTargets, bIsAutoRedact);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |   53 ---
 1 file changed, 22 insertions(+), 31 deletions(-)

New commits:
commit 3dcb6b042fbd96e58d2809add3b131c1db5b9a82
Author: Muhammet Kara 
AuthorDate: Mon Jun 29 14:24:32 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Jun 29 21:42:08 2020 +0200

Welcome: Use localStorage instead of cookies

Change-Id: I0ab431f065dbe8d76d1e7ff18023be744c590dc8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97400
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 7f24d3a55..354175074 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -415,13 +415,7 @@ L.Map.include({
},
beforeClose: function () {
if (!calledFromMenu) {
-   var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
-   // Cookie will not expire for a year, 
and it will not be sent to other domains
-   var cookiePath = '/loleaflet';
-   if (window.socketProxy)
-   cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Lax; path=' + cookiePath;
-   document.cookie = WSDVerCookie;
+   
localStorage.setItem('WSDWelcomeVersion', map._socket.WSDServer.Version);
}
map.focus();
map.enable(true);
@@ -449,41 +443,38 @@ L.Map.include({
map._showWelcomeDialogVex(data, calledFromMenu);
})
.fail(function() {
-   // Welcome dialog disabled in loolwsd.xml or 
nonexistant for some other reason
-   // Let's check back in a day (60 x 60 x 24 = 
86400 seconds)
-   var cookiePath = '/loleaflet';
-   if (window.socketProxy)
-   cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
-   document.cookie = welcomeDisabledCookie;
+   var currentDate = new Date();
+   localStorage.setItem('WSDWelcomeDisabled', 
'true');
+   localStorage.setItem('WSDWelcomeDisabledDate', 
currentDate.toDateString());
 
if (calledFromMenu)
map._showWelcomeDialogVex(_('We are 
sorry, the information about the latest updates is not available.'));
});
},
 
-   getCookie: function(name) {
-   var cookies = document.cookie.split(';');
-   for (var i = 0; i < cookies.length; i++) {
-   var cookie = cookies[i].trim();
-   if (cookie.indexOf(name) === 0) {
-   return cookie;
-   }
-   }
-
-   return '';
-   },
-
shouldWelcome: function() {
if (!window.enableWelcomeMessage || L.Browser.cypressTest)
return false;
 
-   var currentVerCookie = this.getCookie('WSDWelcomeVersion');
-   var newVerCookie = 'WSDWelcomeVersion=' + 
this._socket.WSDServer.Version;
-   var welcomeDisabledCookie = 
this.getCookie('WSDWelcomeDisabled');
-   var isWelcomeDisabled = welcomeDisabledCookie === 
'WSDWelcomeDisabled=true';
+   var storedVersion = localStorage.getItem('WSDWelcomeVersion');
+   var currentVersion = this._socket.WSDServer.Version;
+   var welcomeDisabledCookie = 
localStorage.getItem('WSDWelcomeDisabled');
+   var welcomeDisabledDate = 
localStorage.getItem('WSDWelcomeDisabledDate');
+   var isWelcomeDisabled = false;
+
+   if (welcomeDisabledCookie && welcomeDisabledDate) {
+   // Check if we are stil in the same day
+   var currentDate = new Date();
+   if (welcomeDisabledDate === currentDate.toDateString())
+   isWelcomeDisabled = true;
+   else {
+   //Values expired. Clear the local values
+   localStorage

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |   53 ---
 1 file changed, 22 insertions(+), 31 deletions(-)

New commits:
commit d4841aef011f8bb6dd1e07989fbbb8a95347
Author: Muhammet Kara 
AuthorDate: Mon Jun 29 14:24:32 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Jun 29 16:20:11 2020 +0200

Welcome: Use localStorage instead of cookies

Change-Id: I0ab431f065dbe8d76d1e7ff18023be744c590dc8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97380
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 6f76e0540..fe67909f0 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -415,13 +415,7 @@ L.Map.include({
},
beforeClose: function () {
if (!calledFromMenu) {
-   var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
-   // Cookie will not expire for a year, 
and it will not be sent to other domains
-   var cookiePath = '/loleaflet';
-   if (window.socketProxy)
-   cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Lax; path=' + cookiePath;
-   document.cookie = WSDVerCookie;
+   
localStorage.setItem('WSDWelcomeVersion', map._socket.WSDServer.Version);
}
map.focus();
map.enable(true);
@@ -449,41 +443,38 @@ L.Map.include({
map._showWelcomeDialogVex(data, calledFromMenu);
})
.fail(function() {
-   // Welcome dialog disabled in loolwsd.xml or 
nonexistant for some other reason
-   // Let's check back in a day (60 x 60 x 24 = 
86400 seconds)
-   var cookiePath = '/loleaflet';
-   if (window.socketProxy)
-   cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
-   document.cookie = welcomeDisabledCookie;
+   var currentDate = new Date();
+   localStorage.setItem('WSDWelcomeDisabled', 
'true');
+   localStorage.setItem('WSDWelcomeDisabledDate', 
currentDate.toDateString());
 
if (calledFromMenu)
map._showWelcomeDialogVex(_('We are 
sorry, the information about the latest updates is not available.'));
});
},
 
-   getCookie: function(name) {
-   var cookies = document.cookie.split(';');
-   for (var i = 0; i < cookies.length; i++) {
-   var cookie = cookies[i].trim();
-   if (cookie.indexOf(name) === 0) {
-   return cookie;
-   }
-   }
-
-   return '';
-   },
-
shouldWelcome: function() {
if (!window.enableWelcomeMessage || L.Browser.cypressTest)
return false;
 
-   var currentVerCookie = this.getCookie('WSDWelcomeVersion');
-   var newVerCookie = 'WSDWelcomeVersion=' + 
this._socket.WSDServer.Version;
-   var welcomeDisabledCookie = 
this.getCookie('WSDWelcomeDisabled');
-   var isWelcomeDisabled = welcomeDisabledCookie === 
'WSDWelcomeDisabled=true';
+   var storedVersion = localStorage.getItem('WSDWelcomeVersion');
+   var currentVersion = this._socket.WSDServer.Version;
+   var welcomeDisabledCookie = 
localStorage.getItem('WSDWelcomeDisabled');
+   var welcomeDisabledDate = 
localStorage.getItem('WSDWelcomeDisabledDate');
+   var isWelcomeDisabled = false;
+
+   if (welcomeDisabledCookie && welcomeDisabledDate) {
+   // Check if we are stil in the same day
+   var currentDate = new Date();
+   if (welcomeDisabledDate === currentDate.toDateString())
+   isWelcomeDisabled = true;
+   else {
+   //Values expired. Clear the local values
+   localStorage.removeItem('WSDWelc

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/customize/SvxMenuConfigPage.cxx|3 +++
 cui/source/customize/SvxToolbarConfigPage.cxx |3 +++
 cui/source/customize/cfg.cxx  |1 +
 3 files changed, 7 insertions(+)

New commits:
commit e4e69bb6751ffdc53d8a4d8869249545c9eb64f0
Author: Muhammet Kara 
AuthorDate: Fri Jun 26 02:09:34 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Jun 26 09:16:10 2020 +0200

Customize: Update description box on auto select

When you open the dialog, select a category, or
enter a search/filter term, the first entry on the
functions list was selected automatically but
the description box was not updated properly.

Change-Id: I23737c540ab67af3e79694365b8c8c31c4f60ed3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97188
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 90f421013fba..ca685311e8d3 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -145,6 +145,7 @@ void SvxMenuConfigPage::Init()
 comphelper::getProcessComponentContext(),
 m_xFrame, m_aModuleId);
 m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
OUString(), GetSaveInData());
+SelectFunctionHdl(m_xFunctions->get_widget());
 }
 
 IMPL_LINK_NOARG(SvxMenuConfigPage, SelectMenuEntry, weld::TreeView&, void)
@@ -347,6 +348,8 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, SelectCategory, 
weld::ComboBox&, void)
 OUString aSearchTerm( m_xSearchEdit->get_text() );
 
 m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
aSearchTerm, GetSaveInData());
+
+SelectFunctionHdl(m_xFunctions->get_widget());
 }
 
 IMPL_LINK_NOARG( SvxMenuConfigPage, AddCommandHdl, weld::Button&, void )
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 57d1baa0268b..ea17c407c0f2 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -277,6 +277,7 @@ void SvxToolbarConfigPage::Init()
 comphelper::getProcessComponentContext(),
 m_xFrame, m_aModuleId);
 m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
OUString(), GetSaveInData());
+SelectFunctionHdl(m_xFunctions->get_widget());
 }
 
 SaveInData* SvxToolbarConfigPage::CreateSaveInData(
@@ -425,6 +426,8 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, SelectCategory, 
weld::ComboBox&, void )
 OUString aSearchTerm(m_xSearchEdit->get_text());
 
 m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
aSearchTerm, GetSaveInData());
+
+SelectFunctionHdl(m_xFunctions->get_widget());
 }
 
 IMPL_LINK_NOARG( SvxToolbarConfigPage, AddCommandHdl, weld::Button&, void )
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 94ed598c1bf3..401f48f7a664 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1605,6 +1605,7 @@ IMPL_LINK_NOARG(SvxConfigPage, ImplUpdateDataHdl, Timer*, 
void)
 {
 OUString aSearchTerm(m_xSearchEdit->get_text());
 m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), 
aSearchTerm, GetSaveInData());
+SelectFunctionHdl(m_xFunctions->get_widget());
 }
 
 IMPL_LINK_NOARG(SvxConfigPage, SearchUpdateHdl, weld::Entry&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2a20ea216a60d1ed970dd538925f84997fc6c7f0
Author: Muhammet Kara 
AuthorDate: Thu Jun 11 01:35:15 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Jun 15 15:25:33 2020 +0200

Relax the cookie for the Welcome message

Change-Id: Ia58b6a0125ece8eb4c3a6ea14c03c7c33dfc655a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96351
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 2f6f28ad6..89c191294 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -411,7 +411,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=' + cookiePath;
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Lax; path=' + cookiePath;
document.cookie = WSDVerCookie;
}
map.focus();
@@ -445,7 +445,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=' + cookiePath;
+   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
document.cookie = welcomeDisabledCookie;
 
if (calledFromMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building LO from source

[Muhammet Kara]

Hi Ismet,

On 6/12/20 3:04 PM, Ismet Bahadir wrote:

Thank you everyone,

Sorry for the spam e-mails. I'm trying to get a hold of this. As you 
suggested, I installed a new CentOS. This is the os-release result:


NAME="CentOS Linux"
VERSION="8 (Core)"
ID="centos"
ID_LIKE="rhel fedora"
VERSION_ID="8"
PLATFORM_ID="platform:el8"
PRETTY_NAME="CentOS Linux 8 (Core)"
ANSI_COLOR="0;31"
CPE_NAME="cpe:/o:centos:centos:8"
HOME_URL="https://www.centos.org/;
BUG_REPORT_URL="https://bugs.centos.org/;

CENTOS_MANTISBT_PROJECT="CentOS-8"
CENTOS_MANTISBT_PROJECT_VERSION="8"
REDHAT_SUPPORT_PRODUCT="centos"
REDHAT_SUPPORT_PRODUCT_VERSION="8"

However, this command fails: "*dnf builddep libreoffice*"



How does it fail?




Is it OK to use Ubuntu? I was able to install all dependencies under 
Ubuntu.


BTW, this is the autogen.sh command I want to use. Is there any oddity?

*./autogen.sh --with-distro=LibreOfficeLinux --with-package-format=deb 
--enable-epm --without-java --disable-postgresql-sdbc 
--disable-gstreamer --without-java --disable-postgresql-sdbc 
--disable-gstreamer --without-junit --without-help --without-doxygen 
--disable-odk --enable-debug --without-krb5 
--without-gssapi./autogen.sh --with-distro=LibreOfficeLinux 
--with-package-format=deb --enable-epm --without-java 
--disable-postgresql-sdbc --disable-gstreamer --without-java 
--disable-postgresql-sdbc --disable-gstreamer --without-junit 
--without-help --without-doxygen --disable-odk --enable-debug 
--without-krb5 --without-gssapi*



Except from the (accidental?) double paste, I see repeating params like 
'*--disable-gstreamer*' at 2 different places. And I would make sure I 
really need all the '--without-*' and "--disable-*" params. Some might 
impact certain functionalities/features or extensions.


Best,
Muhammet



*
*
Regards

-- Original Message --
From: "Mike Kaganski" >
To: "Ismet Bahadir" >; "Stephan Bergmann" 
mailto:sberg...@redhat.com>>; 
libreoffice@lists.freedesktop.org 


Sent: 12-Jun-20 2:53:42 PM
Subject: Re: Building LO from source


On 12.06.2020 8:40, Ismet Bahadir wrote:

How can I exclude some of the apps such as "Draw"? Is it possible that
each app has its own DEB installation file so that I won't be installing
it if I skip its DEB file? Or, is there a parameter for excluding apps?

We have a concept of "installed" apps - using
SvtModuleOptions::IsModuleInstalled, which is initialized from factory
configurations (SvtModuleOptions_Impl::impl_Read). Likely it only needs
some configuration setting to have all components installed (making sure
that required functionality is there), but disabled on UI level.
--
Best regards,
Mike Kaganski


___
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] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit af22ce14c3ee656f3ee246425acefe73238f563e
Author: Muhammet Kara 
AuthorDate: Thu Jun 11 01:35:15 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Jun 11 10:22:28 2020 +0200

Relax the cookie for the Welcome message

Change-Id: Ia58b6a0125ece8eb4c3a6ea14c03c7c33dfc655a

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..1ce90a3ba 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -411,7 +411,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=' + cookiePath;
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Lax; path=' + cookiePath;
document.cookie = WSDVerCookie;
}
map.focus();
@@ -445,7 +445,7 @@ L.Map.include({
var cookiePath = '/loleaflet';
if (window.socketProxy)
cookiePath = window.host + 
window.serviceRoot + cookiePath;
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=' + cookiePath;
+   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Lax; path=' + cookiePath;
document.cookie = welcomeDisabledCookie;
 
if (calledFromMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/uiconfig sw/qa

[Muhammet Kara (via logerrit)]

 chart2/uiconfig/ui/sidebarelements.ui   |   92 
 sw/qa/extras/ooxmlexport/data/tdf133643.doc |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx  |   18 +
 3 files changed, 60 insertions(+), 50 deletions(-)

New commits:
commit d2205a26b96ed321c869f6eb7c955648c83dd805
Author: Muhammet Kara 
AuthorDate: Mon Jun 8 23:00:23 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Jun 10 09:41:56 2020 +0200

Give the legend checkbox a label

Change-Id: I95e8910e96335a03ebad6dd46255a902df2c47a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95860
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index 22b1ff60c87e..d136ea8774cf 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -100,74 +100,66 @@
 vertical
 6
 
-  
+  
+Show legend
+True
+True
+False
+Show Legend
+True
+0
+True
+  
+  
+False
+True
+0
+  
+
+
+  
 True
 False
+6
 
-  
+  
 True
-True
-False
-Show Legend
-5
+False
+end
+4
+_Placement:
 True
-0
-True
+end
   
   
-0
-0
+False
+True
+0
   
 
 
-  
+  
+100
 True
 False
-6
-
-  
-True
-False
-end
-_Placement:
-True
-end
-  
-  
-False
-True
-0
-  
-
-
-  
-100
-True
-False
-
-  Right
-  Top
-  Bottom
-  Left
-
-  
-  
-False
-True
-3
-  
-
+
+  Right
+  Top
+  Bottom
+  Left
+
   
   
-1
-0
+False
+True
+3
   
 
   
   
 False
 True
-0
+1
   
 
 
@@ -183,7 +175,7 @@
   
 False
 True
-1
+2
   
 
   
commit fb4109bbf816c9b915b255b7ff69060423337a62
Author: Xisco Fauli 
AuthorDate: Tue Jun 9 19:55:18 2020 +0200
Commit: Xisco Fauli 
CommitDate: Wed Jun 10 09:41:51 2020 +0200

tdf#133643: sw: Add unittest

Change-Id

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.hxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 792d76df2a1ea3068e755302540a083ec3c8cb78
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 19:39:47 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:14:59 2020 +0200

ChartTypePanel: Remove unused vars

Change-Id: I6a19fa269efaf008345b48341d1c501e1c7e7d17
Reviewed-on: https://gerrit.libreoffice.org/82244
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/82812
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94898
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx 
b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 4932658a982a..abd655d02971 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -109,12 +109,6 @@ private:
 DECL_LINK(SelectMainTypeHdl, weld::ComboBox&, void);
 DECL_LINK(SelectSubTypeHdl, SvtValueSet*, void);
 
-//ui controls
-//std::unique_ptr  mpChartTypeLabel;
-//std::unique_ptr m_pMainTypeList;
-//VclPtr m_pMainTypeList;
-//VclPtr m_pSubTypeList;
-
 vcl::EnumContext maContext;
 
 css::uno::Reference mxModel;
___
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' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |   10 +-
 chart2/source/controller/sidebar/ChartTypePanel.hxx |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit b1040e4a404cb64ea068161d910bbec3daec24d6
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 19:31:58 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:14:26 2020 +0200

Rename getCurrentParamter() as getCurrentParameter()

Change-Id: I0116b4526fea377130b1d1e101d30b3107af3c81
Reviewed-on: https://gerrit.libreoffice.org/82243
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/82811
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94897
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index f58bdfd53264..6de33352b051 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -172,7 +172,7 @@ IMPL_LINK_NOARG(ChartTypePanel, SelectSubTypeHdl, 
SvtValueSet*, void)
 {
 if (m_pCurrentMainType)
 {
-ChartTypeParameter aParameter(getCurrentParamter());
+ChartTypeParameter aParameter(getCurrentParameter());
 m_pCurrentMainType->adjustParameterToSubType(aParameter);
 fillAllControls(aParameter, false);
 commitToModel(aParameter);
@@ -317,7 +317,7 @@ uno::Reference 
ChartTypePanel::getCurrentTempla
 {
 if (m_pCurrentMainType && m_xChartModel.is())
 {
-ChartTypeParameter aParameter(getCurrentParamter());
+ChartTypeParameter aParameter(getCurrentParameter());
 m_pCurrentMainType->adjustParameterToSubType(aParameter);
 uno::Reference xTemplateManager(
 m_xChartModel->getChartTypeManager(), uno::UNO_QUERY);
@@ -371,7 +371,7 @@ void ChartTypePanel::fillAllControls(const 
ChartTypeParameter& rParameter,
 m_nChangingCalls--;
 }
 
-ChartTypeParameter ChartTypePanel::getCurrentParamter() const
+ChartTypeParameter ChartTypePanel::getCurrentParameter() const
 {
 ChartTypeParameter aParameter;
 aParameter.nSubTypeIndex = 
static_cast(m_xSubTypeList->GetSelectedItemId());
@@ -389,7 +389,7 @@ void ChartTypePanel::stateChanged()
 return;
 m_nChangingCalls++;
 
-ChartTypeParameter aParameter(getCurrentParamter());
+ChartTypeParameter aParameter(getCurrentParameter());
 if (m_pCurrentMainType)
 {
 m_pCurrentMainType->adjustParameterToSubType(aParameter);
@@ -426,7 +426,7 @@ void ChartTypePanel::commitToModel(const 
ChartTypeParameter& rParameter)
 
 void ChartTypePanel::selectMainType()
 {
-ChartTypeParameter aParameter(getCurrentParamter());
+ChartTypeParameter aParameter(getCurrentParameter());
 
 if (m_pCurrentMainType)
 {
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx 
b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 223712fe7fc0..4932658a982a 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -99,7 +99,7 @@ private:
 ChartTypeDialogController* getSelectedMainType();
 void showAllControls(ChartTypeDialogController& rTypeController);
 void fillAllControls(const ChartTypeParameter& rParameter, bool 
bAlsoResetSubTypeList = true);
-ChartTypeParameter getCurrentParamter() const;
+ChartTypeParameter getCurrentParameter() const;
 
 virtual void stateChanged() override;
 
___
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' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |   18 ++
 chart2/source/controller/sidebar/ChartTypePanel.hxx |2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit f7ed40b0fba269b1e4f8e45e7d0965716c2c9fef
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 18:59:26 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:12:50 2020 +0200

Add SplineResourceGroup to ChartTypePanel

Change-Id: I229eb1cc4963c04968ed9ac32b65847dbfd602c3
Reviewed-on: https://gerrit.libreoffice.org/82807
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94895
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 1e2a2c903269..d70a21bacad7 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,7 +71,8 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 , mbModelValid(true)
 , m_pDim3DLookResourceGroup(new Dim3DLookResourceGroup(m_xBuilder.get()))
 , m_pStackingResourceGroup(new StackingResourceGroup(m_xBuilder.get()))
-//, m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), 
pController->getDialog()) )
+, m_pSplineResourceGroup(
+  new SplineResourceGroup(m_xBuilder.get(), 
pController->GetChartFrame()))
 , m_pGeometryResourceGroup(new GeometryResourceGroup(m_xBuilder.get()))
 , m_pSortByXValuesResourceGroup(new 
SortByXValuesResourceGroup(m_xBuilder.get()))
 , m_xChartModel(mxModel, css::uno::UNO_QUERY_THROW)
@@ -135,7 +137,7 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 
 m_pDim3DLookResourceGroup->setChangeListener(this);
 m_pStackingResourceGroup->setChangeListener(this);
-//m_pSplineResourceGroup->setChangeListener( this );
+m_pSplineResourceGroup->setChangeListener(this);
 m_pGeometryResourceGroup->setChangeListener(this);
 m_pSortByXValuesResourceGroup->setChangeListener(this);
 
@@ -156,7 +158,7 @@ void ChartTypePanel::dispose()
 //delete all resource helpers
 m_pDim3DLookResourceGroup.reset();
 m_pStackingResourceGroup.reset();
-//m_pSplineResourceGroup.reset();
+m_pSplineResourceGroup.reset();
 m_pGeometryResourceGroup.reset();
 m_pSortByXValuesResourceGroup.reset();
 m_xSubTypeListWin.reset();
@@ -234,7 +236,7 @@ void ChartTypePanel::Initialize()
 m_xSubTypeList->Hide();
 m_pDim3DLookResourceGroup->showControls(false);
 m_pStackingResourceGroup->showControls(false, false);
-//m_pSplineResourceGroup->showControls( false );
+m_pSplineResourceGroup->showControls(false);
 m_pGeometryResourceGroup->showControls(false);
 m_pSortByXValuesResourceGroup->showControls(false);
 }
@@ -344,8 +346,8 @@ void 
ChartTypePanel::showAllControls(ChartTypeDialogController& rTypeController)
 m_pDim3DLookResourceGroup->showControls(bShow);
 bShow = rTypeController.shouldShow_StackingControl();
 m_pStackingResourceGroup->showControls(bShow, false);
-/*bShow = rTypeController.shouldShow_SplineControl();
-m_pSplineResourceGroup->showControls( bShow );*/
+bShow = rTypeController.shouldShow_SplineControl();
+m_pSplineResourceGroup->showControls(bShow);
 bShow = rTypeController.shouldShow_GeometryControl();
 m_pGeometryResourceGroup->showControls(bShow);
 bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
@@ -364,7 +366,7 @@ void ChartTypePanel::fillAllControls(const 
ChartTypeParameter& rParameter,
 
m_xSubTypeList->SelectItem(static_cast(rParameter.nSubTypeIndex));
 m_pDim3DLookResourceGroup->fillControls(rParameter);
 m_pStackingResourceGroup->fillControls(rParameter);
-//m_pSplineResourceGroup->fillControls( rParameter );
+m_pSplineResourceGroup->fillControls(rParameter);
 m_pGeometryResourceGroup->fillControls(rParameter);
 m_pSortByXValuesResourceGroup->fillControls(rParameter);
 m_nChangingCalls--;
@@ -376,7 +378,7 @@ ChartTypeParameter ChartTypePanel::getCurrentParamter() 
const
 aParameter.nSubTypeIndex = 
static_cast(m_xSubTypeList->GetSelectedItemId());
 m_pDim3DLookResourceGroup->fillParameter(aParameter);
 m_pStackingResourceGroup->fillParameter(aParameter);
-//m_pSplineResourceGroup->fillParameter( aParameter );
+m_pSplineResourceGroup->fillParameter(aParameter);
 m_pGeometryResourceGroup->fillParameter(aParameter);
 m_pSortByXValuesResourceGroup->fillParameter(aParameter);
 return aParameter;
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx 
b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index d

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |1 -
 chart2/source/controller/sidebar/ChartTypePanel.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit c99f056984882e1a4ca6810f5a7142418b468949
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 19:22:28 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:13:31 2020 +0200

Remove unused var m_xChartTypeLabel

Change-Id: I3de7eb4e438021f9522e581c60a84fb7fcc168c7
Reviewed-on: https://gerrit.libreoffice.org/82242
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/82810
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94896
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index d70a21bacad7..f58bdfd53264 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -80,7 +80,6 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 , m_pCurrentMainType(nullptr)
 , m_nChangingCalls(0)
 , m_aTimerTriggeredControllerLock(m_xChartModel)
-, m_xChartTypeLabel(m_xBuilder->weld_label("lbl_chartType"))
 , m_xMainTypeList(m_xBuilder->weld_combo_box("cmb_chartType"))
 , m_xSubTypeList(new 
SvtValueSet(m_xBuilder->weld_scrolled_window("subtypewin")))
 , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", 
*m_xSubTypeList))
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx 
b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 60ddb85d925d..223712fe7fc0 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -142,7 +142,6 @@ private:
 
 TimerTriggeredControllerLock m_aTimerTriggeredControllerLock;
 
-std::unique_ptr m_xChartTypeLabel;
 std::unique_ptr m_xMainTypeList;
 std::unique_ptr m_xSubTypeList;
 std::unique_ptr m_xSubTypeListWin;
___
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' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |   57 ++--
 chart2/source/controller/sidebar/ChartTypePanel.hxx |8 +-
 2 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit b0fad9e9bc0e6a024157c0b048d40acbc24434c6
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 18:05:20 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:11:35 2020 +0200

Add more resource groups to ChartTypePanel

Change-Id: I64c1d8b418f9abb537b4f23c3b31aa0e48bd3faa
Reviewed-on: https://gerrit.libreoffice.org/82119
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/82801
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94894
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 1774d6a9961b..1e2a2c903269 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -69,6 +69,10 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 , mxListener(new ChartSidebarModifyListener(this))
 , mbModelValid(true)
 , m_pDim3DLookResourceGroup(new Dim3DLookResourceGroup(m_xBuilder.get()))
+, m_pStackingResourceGroup(new StackingResourceGroup(m_xBuilder.get()))
+//, m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), 
pController->getDialog()) )
+, m_pGeometryResourceGroup(new GeometryResourceGroup(m_xBuilder.get()))
+, m_pSortByXValuesResourceGroup(new 
SortByXValuesResourceGroup(m_xBuilder.get()))
 , m_xChartModel(mxModel, css::uno::UNO_QUERY_THROW)
 , m_aChartTypeDialogControllerList(0)
 , m_pCurrentMainType(nullptr)
@@ -130,6 +134,10 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 }
 
 m_pDim3DLookResourceGroup->setChangeListener(this);
+m_pStackingResourceGroup->setChangeListener(this);
+//m_pSplineResourceGroup->setChangeListener( this );
+m_pGeometryResourceGroup->setChangeListener(this);
+m_pSortByXValuesResourceGroup->setChangeListener(this);
 
 Initialize();
 }
@@ -142,18 +150,15 @@ void ChartTypePanel::dispose()
 
css::uno::UNO_QUERY_THROW);
 xBroadcaster->removeModifyListener(mxListener);
 
-/*mpChartTypeLabel.clear();
-m_pMainTypeList.clear();
-m_pSubTypeList.clear();*/
-
-//delete all resource helpers
-//m_pDim3DLookResourceGroup.reset();
-
 //delete all dialog controller
 m_aChartTypeDialogControllerList.clear();
 
-//delete all resource helper
+//delete all resource helpers
 m_pDim3DLookResourceGroup.reset();
+m_pStackingResourceGroup.reset();
+//m_pSplineResourceGroup.reset();
+m_pGeometryResourceGroup.reset();
+m_pSortByXValuesResourceGroup.reset();
 m_xSubTypeListWin.reset();
 m_xSubTypeList.reset();
 
@@ -228,10 +233,10 @@ void ChartTypePanel::Initialize()
 {
 m_xSubTypeList->Hide();
 m_pDim3DLookResourceGroup->showControls(false);
-/*m_pStackingResourceGroup->showControls( false, false );
-m_pSplineResourceGroup->showControls( false );
-m_pGeometryResourceGroup->showControls( false );
-m_pSortByXValuesResourceGroup->showControls( false );*/
+m_pStackingResourceGroup->showControls(false, false);
+//m_pSplineResourceGroup->showControls( false );
+m_pGeometryResourceGroup->showControls(false);
+m_pSortByXValuesResourceGroup->showControls(false);
 }
 }
 
@@ -337,14 +342,14 @@ void 
ChartTypePanel::showAllControls(ChartTypeDialogController& rTypeController)
 
 bool bShow = rTypeController.shouldShow_3DLookControl();
 m_pDim3DLookResourceGroup->showControls(bShow);
-/*bShow = rTypeController.shouldShow_StackingControl();
-m_pStackingResourceGroup->showControls( bShow, false );
-bShow = rTypeController.shouldShow_SplineControl();
-m_pSplineResourceGroup->showControls( bShow );
+bShow = rTypeController.shouldShow_StackingControl();
+m_pStackingResourceGroup->showControls(bShow, false);
+/*bShow = rTypeController.shouldShow_SplineControl();
+m_pSplineResourceGroup->showControls( bShow );*/
 bShow = rTypeController.shouldShow_GeometryControl();
-m_pGeometryResourceGroup->showControls( bShow );
+m_pGeometryResourceGroup->showControls(bShow);
 bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
-m_pSortByXValuesResourceGroup->showControls( bShow );*/
+m_pSortByXValuesResourceGroup->showControls(bShow);
 rTypeController.showExtraControls(m_xBuilder.get());
 }
 
@@ -358,10 +363,10 @@ void ChartTypePanel::fillAllControls(const 
ChartTypeParameter& rParameter,
 }
 
m_xSubTypeList->SelectItem(static

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - chart2/source chart2/uiconfig

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/Chart2PanelFactory.cxx |   10 
 chart2/source/controller/sidebar/ChartTypePanel.cxx |  309 +---
 chart2/source/controller/sidebar/ChartTypePanel.hxx |   43 +-
 chart2/uiconfig/ui/sidebartype.ui   |  203 ++
 4 files changed, 277 insertions(+), 288 deletions(-)

New commits:
commit 933baef357663c75a035290aea30df5fafc01b89
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 11:13:03 2019 +0300
Commit: Muhammet Kara 
CommitDate: Wed May 27 00:10:07 2020 +0200

chart2: Weld ChartTypePanel

Change-Id: I8ed178ffe0d880b362f98b9754bce40b20942bd7
Reviewed-on: https://gerrit.libreoffice.org/82768
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94893
Tested-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx 
b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 33e5c75d7f82..a4235233f1bb 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -86,7 +86,15 @@ Reference SAL_CALL 
ChartPanelFactory::createUIElement (
 if (rsResourceURL.endsWith("/ElementsPanel"))
 pPanel = ChartElementsPanel::Create( pParentWindow, xFrame, 
pController );
 else if (rsResourceURL.endsWith("/TypePanel"))
-pPanel = ChartTypePanel::Create( pParentWindow, xFrame, 
pController );
+{
+//pPanel = ChartTypePanel::Create( pParentWindow, xFrame, 
pController );
+VclPtrInstance ppPanel(pParentWindow, xFrame, 
pController);
+xElement = sfx2::sidebar::SidebarPanelBase::Create(
+rsResourceURL,
+xFrame,
+ppPanel,
+css::ui::LayoutSize(-1,-1,-1));
+}
 else if (rsResourceURL.endsWith("/SeriesPanel"))
 pPanel = ChartSeriesPanel::Create(pParentWindow, xFrame, 
pController);
 else if (rsResourceURL.endsWith("/AxisPanel"))
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 9539095e26c5..1774d6a9961b 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -37,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -51,147 +53,43 @@
 #include 
 #include 
 
-//Borrowed from vcl/inc/bitmaps.hlst
-#define IMG_ERROR "dbaccess/res/exerror.png"
-#define IMG_INFO "dbaccess/res/exinfo.png"
-#define IMG_WARN "dbaccess/res/exwarning.png"
-
 using namespace css;
 using namespace css::uno;
 
 namespace chart
 {
-enum
-{
-POS_3DSCHEME_SIMPLE = 0,
-POS_3DSCHEME_REALISTIC = 1
-};
-
-class Dim3DLookResourceGroup_unwelded : public ChangingResource
-{
-public:
-explicit Dim3DLookResourceGroup_unwelded(VclBuilderContainer* pWindow);
-
-void showControls(bool bShow);
-
-void fillControls(const ChartTypeParameter& rParameter);
-void fillParameter(ChartTypeParameter& rParameter);
-
-private:
-DECL_LINK(Dim3DLookCheckHdl, CheckBox&, void);
-DECL_LINK(SelectSchemeHdl, ListBox&, void);
-
-private:
-VclPtr m_pCB_3DLook;
-VclPtr m_pLB_Scheme;
-};
-
-Dim3DLookResourceGroup_unwelded::Dim3DLookResourceGroup_unwelded(VclBuilderContainer*
 pWindow)
-: ChangingResource()
-{
-pWindow->get(m_pCB_3DLook, "3dlook");
-pWindow->get(m_pLB_Scheme, "3dscheme");
-
-m_pCB_3DLook->SetToggleHdl(LINK(this, Dim3DLookResourceGroup_unwelded, 
Dim3DLookCheckHdl));
-m_pLB_Scheme->SetSelectHdl(LINK(this, Dim3DLookResourceGroup_unwelded, 
SelectSchemeHdl));
-}
-
-void Dim3DLookResourceGroup_unwelded::showControls(bool bShow)
-{
-m_pCB_3DLook->Show(bShow);
-m_pLB_Scheme->Show(bShow);
-}
-
-void Dim3DLookResourceGroup_unwelded::fillControls(const ChartTypeParameter& 
rParameter)
-{
-m_pCB_3DLook->Check(rParameter.b3DLook);
-m_pLB_Scheme->Enable(rParameter.b3DLook);
-
-if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple)
-m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_SIMPLE);
-else if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic)
-m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_REALISTIC);
-else
-m_pLB_Scheme->SetNoSelection();
-}
-
-void Dim3DLookResourceGroup_unwelded::fillParameter(ChartTypeParameter& 
rParameter)
-{
-rParameter.b3DLook = m_pCB_3DLook->IsChecked();
-const sal_Int32 nPos = m_pLB_Scheme->GetSelectedEntryPos();
-if (nPos == POS_3DSCHEME_SIMPLE)
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
-else if (nPos == POS_3DSCHEME_REALISTIC)
-rPa

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 sc/inc/drawpage.hxx |2 -
 sc/inc/globalnames.hxx  |2 -
 sc/inc/refupdatecontext.hxx |7 +--
 sc/inc/simplerangelist.hxx  |2 -
 sc/inc/undorangename.hxx|5 +-
 sc/inc/warnpassword.hxx |2 -
 sc/qa/extras/scarealinkobj.cxx  |4 +-
 sc/qa/extras/sctabviewobj.cxx   |6 +--
 sc/qa/unit/datacache.cxx|3 -
 sc/qa/unit/pivottable_filters_test.cxx  |   48 +---
 sc/qa/unit/ucalc.hxx|   41 
 sc/source/filter/inc/orcusfiltersimpl.hxx   |3 +
 sc/source/filter/inc/rtfimp.hxx |2 -
 sc/source/filter/orcus/orcusfiltersimpl.cxx |   13 +++---
 sc/source/ui/app/typemap.cxx|2 -
 sc/source/ui/drawfunc/futext2.cxx   |2 -
 sc/source/ui/inc/PivotLayoutTreeList.hxx|3 +
 sc/source/ui/inc/PivotLayoutTreeListData.hxx|2 -
 sc/source/ui/inc/auditsh.hxx|2 -
 sc/source/ui/inc/colorformat.hxx|6 +--
 sc/source/ui/inc/corodlg.hxx|3 +
 sc/source/ui/inc/crdlg.hxx  |1 
 sc/source/ui/inc/dapidata.hxx   |4 +-
 sc/source/ui/inc/datatableview.hxx  |6 +--
 sc/source/ui/inc/drformsh.hxx   |2 -
 sc/source/ui/inc/editfield.hxx  |1 
 sc/source/ui/inc/lbseldlg.hxx   |2 -
 sc/source/ui/inc/mediash.hxx|4 +-
 sc/source/ui/inc/mergecellsdialog.hxx   |1 
 sc/source/ui/inc/namecrea.hxx   |3 +
 sc/source/ui/inc/namepast.hxx   |2 -
 sc/source/ui/inc/oleobjsh.hxx   |3 -
 sc/source/ui/inc/pgbrksh.hxx|1 
 sc/source/ui/inc/pivotsh.hxx|2 -
 sc/source/ui/inc/subtdlg.hxx|1 
 sc/source/ui/inc/warnbox.hxx|1 
 sc/source/ui/inc/xmlsourcedlg.hxx   |5 +-
 sc/source/ui/optdlg/calcoptionsdlg.hxx  |4 +-
 sc/source/ui/sidebar/CellBorderStyleControl.hxx |4 +-
 sc/source/ui/sidebar/CellLineStyleControl.hxx   |4 +-
 solenv/clang-format/blacklist   |   40 
 41 files changed, 111 insertions(+), 140 deletions(-)

New commits:
commit 21875558f6c478f07d68ff39e025d7ffd451674f
Author: Muhammet Kara 
AuthorDate: Sun May 24 03:03:37 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon May 25 01:35:57 2020 +0200

clang-format sc with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I2d37d9c94116d2823f9a21024bdb7ff1a6207d5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94744
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index b8edefe25acf..09e607ea88b8 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -35,7 +35,7 @@ public:
 
 virtual ScDrawPage* CloneSdrPage(SdrModel& rTargetModel) const override;
 
-virtual css::uno::Reference< css::uno::XInterface > createUnoPage() 
override;
+virtual css::uno::Reference createUnoPage() override;
 };
 
 #endif
diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index fb4c2dad4e2b..91745dae742a 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_GLOBALNAMES_HXX
 #define INCLUDED_SC_INC_GLOBALNAMES_HXX
 
-#define STR_DB_LOCAL_NONAME  "__Anonymous_Sheet_DB__"
+#define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__"
 #define STR_DB_GLOBAL_NONAME "__Anonymous_DB__"
 
 #define STR_GLOBAL_RANGE_NAME "__Global_Range_Name__"
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 39a46f6ac0ac..b8baf8622ebc 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -19,8 +19,8 @@
 
 class ScDocument;
 
-namespace sc {
-
+namespace sc
+{
 struct ColumnBlockPosition;
 class ColumnBlockPositionSet;
 
@@ -86,7 +86,7 @@ struct RefUpdateContext
 bool isInserted() const;
 bool isDeleted() const;
 
-void setBlockPositionReference( ColumnBlockPositionSet* blockPos );
+void setBlockPositionReference(ColumnBlockPositionSet* blockPos);
 ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
 };
 
@@ -159,7 +159,6 @@ struct SetFormulaDirtyContext
 
 SetFormulaDirtyContext();
 };
-
 }
 
 #endif
diff --git a/sc/inc/simplerangelist.h

[Libreoffice-commits] core.git: solenv/clang-format

[Muhammet Kara (via logerrit)]

 solenv/clang-format/blacklist |4 
 1 file changed, 4 deletions(-)

New commits:
commit ccbcaac09f5e0e6c103d57f83aee629b3092c4a0
Author: Muhammet Kara 
AuthorDate: Sun May 24 02:44:57 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun May 24 08:38:33 2020 +0200

Remove clang-format conformant files from the blacklist

Change-Id: I48afc12427e25424b275c1f0d0484ec300948b3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94743
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 6c5a6a477d3e..119728d0a667 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6459,7 +6459,6 @@ include/sfx2/tbxctrl.hxx
 include/sfx2/templatedlg.hxx
 include/sfx2/templatelocalview.hxx
 include/sfx2/templateproperties.hxx
-include/sfx2/templdlg.hxx
 include/sfx2/thumbnailview.hxx
 include/sfx2/titledockwin.hxx
 include/sfx2/tplpitem.hxx
@@ -9417,7 +9416,6 @@ sc/qa/extras/scnamedrangeobj.cxx
 sc/qa/extras/scoutlineobj.cxx
 sc/qa/extras/scsubtotalfieldobj.cxx
 sc/qa/extras/sctablesheetobj.cxx
-sc/qa/extras/sctablesheetsobj.cxx
 sc/qa/extras/sctabviewobj.cxx
 sc/qa/perf/scperfobj.cxx
 sc/qa/unit/bugfix-test.cxx
@@ -9441,7 +9439,6 @@ sc/qa/unit/functions_test.hxx
 sc/qa/unit/functions_test_old.cxx
 sc/qa/unit/functions_text.cxx
 sc/qa/unit/helper/csv_handler.hxx
-sc/qa/unit/helper/debughelper.hxx
 sc/qa/unit/helper/qahelper.cxx
 sc/qa/unit/helper/qahelper.hxx
 sc/qa/unit/helper/shared_test_impl.hxx
@@ -15452,7 +15449,6 @@ sw/source/uibase/inc/javaedit.hxx
 sw/source/uibase/inc/label.hxx
 sw/source/uibase/inc/labelcfg.hxx
 sw/source/uibase/inc/labimg.hxx
-sw/source/uibase/inc/labimp.hxx
 sw/source/uibase/inc/labrec.hxx
 sw/source/uibase/inc/langhelper.hxx
 sw/source/uibase/inc/listsh.hxx
___
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' - 6 commits - bridges/source sd/uiconfig sfx2/source sw/source vcl/uiconfig

[Muhammet Kara (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |7 -
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |  117 +-
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |1 
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |4 
 sd/uiconfig/simpress/ui/tabledesignpanel.ui   |1 
 sfx2/source/sidebar/DeckLayouter.cxx  |8 -
 sw/source/uibase/dochdl/swdtflvr.cxx  |3 
 vcl/uiconfig/theme_definitions/ios/definition.xml |7 -
 8 files changed, 107 insertions(+), 41 deletions(-)

New commits:
commit 2b6397882c3d3e22b6a80154008b509a9541b42d
Author: Muhammet Kara 
AuthorDate: Tue Dec 10 18:59:36 2019 +0300
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

Sidebar: Don't expand table design styles vertically

Otherwise, they become veeery high in Online.

Change-Id: I2572eb6ac94ad5e46aa596095cd718aef63eed6c
Reviewed-on: https://gerrit.libreoffice.org/84868
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui 
b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
index 2e215515dd7c..28833b46e9ea 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
@@ -113,7 +113,6 @@
 True
 False
 True
-True
   
   
 0
commit 28c19dafdeec7e367569febfaeb63bc3cb10af52
Author: Ashod Nakashian 
AuthorDate: Sun Dec 8 11:26:27 2019 -0500
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

sidebar: no scrollbar in LOK

Scrolling in LOK is done in the client. We render
the sidebar as long as the original height is
(the minimum that will fit all panels) and scroll
in the client. For that, we keep the scrollbar
disabled when layouting the Deck.

Reviewed-on: https://gerrit.libreoffice.org/84720
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
(cherry picked from commit 09ddec08eaa0af1ca6a5f8a376abae9e62fe2607)

Change-Id: If0d813b04af679768f80ee88fc976bce9cde46d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85785
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 652268567753..bc1bf6e93986 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -179,8 +180,8 @@ tools::Rectangle LayoutPanels (
 nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
 }
 
-if (nTotalMinimumHeight > nAvailableHeight
-&& ! bShowVerticalScrollBar)
+if (nTotalMinimumHeight > nAvailableHeight && !bShowVerticalScrollBar
+&& !comphelper::LibreOfficeKit::isActive())
 {
 // Not enough space, even when all panels are shrunk to their
 // minimum height.
@@ -524,7 +525,8 @@ void DistributeHeights (
 // There are no panels with unrestricted height.
 return;
 }
-const sal_Int32 nAdditionalHeightPerPanel (nRemainingHeightToDistribute / 
nNoMaximumCount);
+
+const sal_Int32 nAdditionalHeightPerPanel(nRemainingHeightToDistribute / 
nNoMaximumCount);
 // Handle rounding error.
 sal_Int32 nAdditionalHeightForFirstPanel (nRemainingHeightToDistribute
 - nNoMaximumCount*nAdditionalHeightPerPanel);
commit 4fc6d01047d71128617ac3e359a1fcad379a9280
Author: Dennis Francis 
AuthorDate: Fri Feb 7 12:08:21 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

Classify shape(s) selections as 'complex'...

in isComplex() of XTransferable2 implementation SwTransferable.
This method is used by online via doc_getSelectionType() to determine the
type of selection. In writer this method used to classify shape objects as
non-complex which translates to 'text' in online, so if a shape is selected
in online, the js code there would treat it as text. This is problematic
when you want to send the correct align uno commands based on selection 
type.
So returning true in isComplex() for writer would correctly treat the shape
selections as 'complex' in online Writer.

Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index f6e5990b1b3d..26567bca7743 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cx

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8eb191036287084034f4d127bbdf3d147330ebf9
Author: Muhammet Kara 
AuthorDate: Mon May 4 17:09:26 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon May 4 17:26:35 2020 +0200

Welcome: prevent the welcome message being circumvented

* Repro:
- Open a document on a welcome-message-enabled system
- You'll get the message at this point, don't accept it
- Close the app or browser, or navigate away
- Open the file again
-> No message, session opens

* Now the cookie is created only when the dialog is closed

Change-Id: Ifa3eb45a24747212a3b741c7a5277e16c70ed44e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93426
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 61d63eed3..c30abc500 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -345,7 +345,7 @@ L.Map.include({
},
 
// show the actual welcome dialog with the given data
-   _showWelcomeDialogVex: function(data) {
+   _showWelcomeDialogVex: function(data, calledFromMenu) {
var w;
var iw = window.innerWidth;
var hasDismissBtn = window.enableWelcomeMessageButton;
@@ -400,6 +400,12 @@ L.Map.include({
$('.vex-overlay').css({ 'pointer-events': 
'none'});
},
beforeClose: function () {
+   if (!calledFromMenu) {
+   var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
+   // Cookie will not expire for a year, 
and it will not be sent to other domains
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=/loleaflet';
+   document.cookie = WSDVerCookie;
+   }
map.focus();
map.enable(true);
}
@@ -414,13 +420,7 @@ L.Map.include({
var map = this;
$.get(welcomeLocation)
.done(function(data) {
-   map._showWelcomeDialogVex(data);
-   if (!calledFromMenu) {
-   var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
-   // Cookie will not expire for a year, 
and it will not be sent to other domains
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=/loleaflet';
-   document.cookie = WSDVerCookie;
-   }
+   map._showWelcomeDialogVex(data, calledFromMenu);
})
.fail(function() {
// Welcome dialog disabled in loolwsd.xml or 
nonexistant for some other reason
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |   30 ++
 1 file changed, 26 insertions(+), 4 deletions(-)

New commits:
commit fca73e16b92e7b2932c6ae98566f548e52165f48
Author: Muhammet Kara 
AuthorDate: Sat Apr 18 00:36:08 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Apr 21 00:23:32 2020 +0200

Welcome: Add the dismiss/accept button

Now that we have the value of window.enableWelcomeMessageButton
coming from the loolwsd.xml, we can optionally enable/disable
the dismiss/accept button.

Using vex.dialog.open instead of vex.open to be able to
have the 'buttons' option.

Because the vex-dialog-message class displays the message
all-bold (very ugly) on mobile, we change it to vex-content,
just after opening the dialog.

We also limit the max height of the dialog to avoid double
scroll-bars.

Change-Id: I0c4d1cba303da49d23342a74538c7f340c4bcf1b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92465
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8def69a6b..61d63eed3 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -348,6 +348,8 @@ L.Map.include({
_showWelcomeDialogVex: function(data) {
var w;
var iw = window.innerWidth;
+   var hasDismissBtn = window.enableWelcomeMessageButton;
+
if (iw < 768) {
w = iw - 30;
}
@@ -358,21 +360,41 @@ L.Map.include({
w = iw / 5 + 590;
}
 
+   if (hasDismissBtn) {
+   var ih = window.innerHeight;
+   var h = ih / 2;
+   if (iw < 768) {
+   h = ih - 170; // Hopefully enough padding to 
avoid extra scroll-bar on mobile,
+   }
+   var containerDiv = '';
+   containerDiv += data;
+   containerDiv += '';
+   data = containerDiv;
+   }
+
// show the dialog
var map = this;
-   vex.open({
-   unsafeContent: data,
-   showCloseButton: true,
+   vex.dialog.open({
+   unsafeMessage: data,
+   showCloseButton: !hasDismissBtn,
escapeButtonCloses: false,
overlayClosesOnClick: false,
closeAllOnPopState: false,
-   buttons: {},
+   focusFirstInput: false, // Needed to avoid auto-scroll 
to the bottom
+   buttons: !hasDismissBtn ? {} : [
+   $.extend({}, vex.dialog.buttons.YES, { text: 
_('I understand the risks') }),
+   ],
afterOpen: function() {
var $vexContent = $(this.contentEl);
this.contentEl.style.width = w + 'px';
map.enable(false);
 
$vexContent.attr('tabindex', -1);
+   // Work-around to avoid the ugly all-bold 
dialog message on mobile
+   if (window.mode.isMobile()) {
+   var dlgMsg = 
document.getElementsByClassName('vex-dialog-message')[0];
+   dlgMsg.setAttribute('class', 
'vex-content');
+   }
$vexContent.focus();
// workaround for 
https://github.com/HubSpot/vex/issues/43
$('.vex-overlay').css({ 'pointer-events': 
'none'});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: configure.ac ios/config.h.in loleaflet/html loolwsd.xml.in wsd/FileServer.cpp wsd/LOOLWSD.cpp

[Muhammet Kara (via logerrit)]

 configure.ac |8 +++-
 ios/config.h.in  |4 
 loleaflet/html/loleaflet.html.m4 |2 ++
 loolwsd.xml.in   |1 +
 wsd/FileServer.cpp   |5 +
 wsd/LOOLWSD.cpp  |1 +
 6 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit f507302993b67e251a0d040c5d96770a6b8b6a98
Author: Muhammet Kara 
AuthorDate: Mon Apr 20 21:02:57 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Apr 20 20:35:08 2020 +0200

Welcome: Add config for enabling the dismiss button

Change-Id: Ia2fbf066493d91a2b10866e66d11332b5cfc10fa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92593
Reviewed-by: Tor Lillqvist 
Reviewed-by: Muhammet Kara 
Tested-by: Jenkins CollaboraOffice 

diff --git a/configure.ac b/configure.ac
index 725f13725..a7bd6a57c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,9 +601,15 @@ AC_SUBST(MAX_DOCUMENTS)
 ENABLE_WELCOME_MESSAGE=false
 AS_IF([test "$enable_welcome_message" = "yes"],
   [ENABLE_WELCOME_MESSAGE="true"])
-AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should
 the Release notes message on startup should be enabled be default?])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should
 the Release notes message on startup be enabled by default?])
 AC_SUBST(ENABLE_WELCOME_MESSAGE)
 
+ENABLE_WELCOME_MESSAGE_BUTTON=false
+AS_IF([test "$enable_welcome_message_button" = "yes"],
+  [ENABLE_WELCOME_MESSAGE_BUTTON="true"])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE_BUTTON],["$ENABLE_WELCOME_MESSAGE_BUTTON"],[Should
 the Release notes message on startup should have a dismiss button instead of 
an x button to close by default?])
+AC_SUBST(ENABLE_WELCOME_MESSAGE_BUTTON)
+
 VEREIGN_URL=
 if test "$enable_vereign" = "yes"; then
 VEREIGN_URL="https://app.vereign.com;
diff --git a/ios/config.h.in b/ios/config.h.in
index f80b2ae5f..18ec2613d 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -23,6 +23,10 @@
*/
 #define ENABLE_WELCOME_MESSAGE "false"
 
+/* Should the Release notes message on startup have a dismiss button instead 
of an x button to close by default?
+   */
+#define ENABLE_WELCOME_MESSAGE_BUTTON "false"
+
 /* Define to 1 if you have the  header file. */
 #define HAVE_DLFCN_H 0
 
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index c8d51f0f0..945449d9f 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -235,6 +235,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessHeader = '';
   window.loleafletLogging = 'true';
   window.enableWelcomeMessage = false;
+  window.enableWelcomeMessageButton = false;
   window.outOfFocusTimeoutSecs = 100;
   window.idleTimeoutSecs = 100;
   window.reuseCookies = '';
@@ -248,6 +249,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessHeader = '%ACCESS_HEADER%';
   window.loleafletLogging = '%LOLEAFLET_LOGGING%';
   window.enableWelcomeMessage = %ENABLE_WELCOME_MSG%;
+  window.enableWelcomeMessageButton = %ENABLE_WELCOME_MSG_BTN%;
   window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
   window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
   window.reuseCookies = '%REUSE_COOKIES%';
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index d22ec7e98..087ea3bdc 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -116,6 +116,7 @@
 
 
   @ENABLE_WELCOME_MESSAGE@
+  @ENABLE_WELCOME_MESSAGE_BUTTON@
   
 
 
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 5a973bc01..432a09b1c 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -741,6 +741,11 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 enableWelcomeMessage = "true";
 Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG%"), 
enableWelcomeMessage);
 
+std::string enableWelcomeMessageButton = "false";
+if (config.getBool("welcome.enable_button", false))
+enableWelcomeMessageButton = "true";
+Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG_BTN%"), 
enableWelcomeMessageButton);
+
 // Capture cookies so we can optionally reuse them for the storage 
requests.
 {
 NameValueCollection cookies;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index d54788d49..379e960fe 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -942,6 +942,7 @@ void LOOLWSD::initialize(Application& self)
 { "trace.path[@snapshot]", "false" },
 { "trace[@enable]", "false" },
 { "welcome.enable", ENABLE_WELCOME_MESSAGE },
+{ "welcome.enable_button", ENABLE_W

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1c296d5947df4c7a17a6035c4406df917c1c2f79
Author: Muhammet Kara 
AuthorDate: Mon Apr 20 17:18:08 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Apr 20 16:36:04 2020 +0200

Welcome: Prevent a million cookies during development

By default, cookies are stored with full path of
the web app, and we have an extension made of the
hash of the build. So each new commit means a new
web app for the browser, causing many cookies stored,
and the welcome dialog being shown after each commit.

From now on, we will be storing our cookies to the
'/loleaflet' path.

Change-Id: I4cb25ab0a53c4743cb929a7f6c20ab019da29409
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92575
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 3ed636444..8def69a6b 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -396,14 +396,14 @@ L.Map.include({
if (!calledFromMenu) {
var WSDVerCookie = 'WSDWelcomeVersion=' 
+ map._socket.WSDServer.Version;
// Cookie will not expire for a year, 
and it will not be sent to other domains
-   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict';
+   WSDVerCookie += '; max-age=31536000; 
SameSite=Strict; path=/loleaflet';
document.cookie = WSDVerCookie;
}
})
.fail(function() {
// Welcome dialog disabled in loolwsd.xml or 
nonexistant for some other reason
// Let's check back in a day (60 x 60 x 24 = 
86400 seconds)
-   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict';
+   var welcomeDisabledCookie = 
'WSDWelcomeDisabled=true; max-age=86400; SameSite=Strict; path=/loleaflet';
document.cookie = welcomeDisabledCookie;
 
if (calledFromMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit c7003bed305651adb12b713eb0ad61b9c54ea52a
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 23:01:54 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Apr 17 20:18:27 2020 +0200

Move uno:Text param from core to online - core part

Change-Id: Idf51a688a868c2d140fcf5eb54e1bfdefc3690b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92394
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
(cherry picked from commit d9a0e2fe5bf95bf0bfba424a3625d7f952884932)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92304
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b8228bfe8639..11fa55b9c23d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3647,10 +3647,6 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 ExecuteOrientationChange();
 return;
 }
-else if (gImpl && aCommand == ".uno:Text")
-{
-aCommand = ".uno:Text?CreateDirectly:bool=true";
-}
 
 // handle potential interaction
 if (gImpl && aCommand == ".uno:Save")
___
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' - desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit d9a0e2fe5bf95bf0bfba424a3625d7f952884932
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 23:01:54 2020 +0300
Commit: Muhammet Kara 
CommitDate: Thu Apr 16 23:12:37 2020 +0200

Move uno:Text param from core to online - core part

Change-Id: Idf51a688a868c2d140fcf5eb54e1bfdefc3690b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92394
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 146f65889a1a..daf2eb90b8bc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3646,10 +3646,6 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 ExecuteOrientationChange();
 return;
 }
-else if (gImpl && aCommand == ".uno:Text")
-{
-aCommand = ".uno:Text?CreateDirectly:bool=true";
-}
 
 // handle potential interaction
 if (gImpl && aCommand == ".uno:Save")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/images loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/images/lc_inserttextbox.svg|1 +
 loleaflet/src/control/Control.Menubar.js |4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e2a6737a5b46f6b4020687a6ba34b7bf157afe1b
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 22:22:04 2020 +0300
Commit: Muhammet Kara 
CommitDate: Thu Apr 16 23:12:06 2020 +0200

Move uno:Text param from core to online - online part

Change-Id: I3d3e9bf4496d9c327a437acb5d0e4e65dfe2d3c8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92391
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/images/lc_inserttextbox.svg 
b/loleaflet/images/lc_inserttextbox.svg
new file mode 100644
index 0..e766b7390
--- /dev/null
+++ b/loleaflet/images/lc_inserttextbox.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>A
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 3d3f8307c..b0c042d9e 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -690,7 +690,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:TableMenu'), id: 
'inserttable', type: 'action'},
{name: _UNO('.uno:HyperlinkDialog'), 
id: 'inserthyperlink', type: 'action'},
{name: _UNO('.uno:ShapesMenu'), id: 
'insertshape', type: 'action'},
-   {uno: '.uno:Text'},
+   {name: _UNO('.uno:Text', 
'presentation'), id: 'inserttextbox', type: 'action'},
{name: _UNO('.uno:InsertField', 
'text'), id: 'insertfield', type: 'menu', menu: [
{uno: 
'.uno:InsertDateFieldFix'},
{uno: 
'.uno:InsertDateFieldVar'},
@@ -1211,6 +1211,8 @@ L.Control.Menubar = L.Control.extend({
$('#toolbar-search').show();
$('#mobile-edit-button').hide();
L.DomUtil.get('search-input').focus();
+   } else if (id === 'inserttextbox') {
+   
this._map.sendUnoCommand('.uno:Text?CreateDirectly:bool=true');
}
// Inform the host if asked
if (postmessage)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - 2 commits - configure.ac loleaflet/html loleaflet/src loolwsd.xml.in wsd/FileServer.cpp

[Muhammet Kara (via logerrit)]

 configure.ac |   10 ++
 loleaflet/html/loleaflet.html.m4 |2 ++
 loleaflet/src/control/Toolbar.js |5 -
 loolwsd.xml.in   |2 +-
 wsd/FileServer.cpp   |5 +
 5 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit c234fe777964d659aacff085ce75d883d7230e5b
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 00:59:43 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Thu Apr 16 14:30:32 2020 +0200

Welcome: Pass welcome value from loolwsd.xml to the JS side

Now we have window.enableWelcomeMessage on the JS side to avoid any
queries at all when the feature is disabled.

Change-Id: I8420089f775bfbf5bcd557c7c720172fbce8c22e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92338
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92356
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 12407c34b..553f1cca5 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -234,6 +234,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessTokenTTL = '';
   window.accessHeader = '';
   window.loleafletLogging = 'true';
+  window.enableWelcomeMessage = false;
   window.outOfFocusTimeoutSecs = 100;
   window.idleTimeoutSecs = 100;
   window.reuseCookies = '';
@@ -246,6 +247,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessTokenTTL = '%ACCESS_TOKEN_TTL%';
   window.accessHeader = '%ACCESS_HEADER%';
   window.loleafletLogging = '%LOLEAFLET_LOGGING%';
+  window.enableWelcomeMessage = %ENABLE_WELCOME_MSG%;
   window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
   window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
   window.reuseCookies = '%REUSE_COOKIES%';
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index e6f1a7e6f..4e17dece2 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -424,12 +424,15 @@ L.Map.include({
},
 
shouldWelcome: function() {
+   if (!window.enableWelcomeMessage || L.Browser.cypressTest)
+   return false;
+
var currentVerCookie = this.getCookie('WSDWelcomeVersion');
var newVerCookie = 'WSDWelcomeVersion=' + 
this._socket.WSDServer.Version;
var welcomeDisabledCookie = 
this.getCookie('WSDWelcomeDisabled');
var isWelcomeDisabled = welcomeDisabledCookie === 
'WSDWelcomeDisabled=true';
 
-   if (currentVerCookie !== newVerCookie && !isWelcomeDisabled && 
!L.Browser.cypressTest) {
+   if (currentVerCookie !== newVerCookie && !isWelcomeDisabled) {
return true;
}
 
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 9c4bd8ba4..12a37eabf 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -737,6 +737,11 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 const std::string idleTimeoutSecs= 
config.getString("per_view.idle_timeout_secs", "900");
 Poco::replaceInPlace(preprocess, std::string("%IDLE_TIMEOUT_SECS%"), 
idleTimeoutSecs);
 
+std::string enableWelcomeMessage = "false";
+if (config.getBool("welcome.enable", false))
+enableWelcomeMessage = "true";
+Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG%"), 
enableWelcomeMessage);
+
 // Capture cookies so we can optionally reuse them for the storage 
requests.
 {
 NameValueCollection cookies;
commit 96c6ef66d75d303559b748c17f8d1414113e1e70
Author: Jan Holesovsky 
AuthorDate: Wed Apr 15 16:17:31 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 16 14:30:16 2020 +0200

Welcome: Add ./configure of the welcome message default.

Change-Id: I090c7d657d2b0a696117f64f25c11ffb249fb272
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92277
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92355
Tested-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index 092998061..6ba0b045c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,6 +258,11 @@ AC_ARG_WITH([max-documents],
  AS_HELP_STRING([--with-max-documents],
[Set the limit on the total number of documents. 
Def: 10, Min: 2.]))
 
+AC_ARG_ENABLE(welcome-message,
+AS_HELP_STRING([--enable-welcome-message],
+[Enables welcome message on version update. Can be changed later in 
loolwsd.xml.])
+)
+
 AC_ARG_WITH([sanitizer],
  AS_HELP_STRING([--with-sanitizer],
[Enable one or more compatible sanitizers. E.g.

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   13 -
 loleaflet/src/control/Toolbar.js |   76 +++
 loleaflet/src/layer/tile/TileLayer.js|3 +
 3 files changed, 91 insertions(+), 1 deletion(-)

New commits:
commit 750a7d6ef1f5de0c4c72826a80aaad08f692e020
Author: Muhammet Kara 
AuthorDate: Mon Mar 30 14:30:20 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Thu Apr 16 14:18:53 2020 +0200

Welcome: Add Welcome dialog

 * Whenever a new version of Online is deployed,
   users will be shown a welcome dialog with latest updates,
   release notes etc.
 * Location of the content for the welcome dialog can be
   set up in loolwsd.xml, and that file will be served to
   the client by loolwsd (That part handled in a prior patch)
 * If the welcome dialog is disabled in the config, or the welcome
   file (at welcome/welcome-$LANG.html by default) does not exist,
   then we will disable the checks for a week
 * A command to show the welcome dialog has also been added under
   the help menu as 'Latest Updates'

Change-Id: I490f4ed92920bbcc9308a53014a3fb5a1d477a54
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92266
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92206
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 919a4ab3f..de54731bd 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -240,6 +240,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -341,6 +342,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -457,6 +459,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -509,6 +512,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ShowResolvedAnnotations', 
'text'), id: 'showresolved', type: 'action'},
]
},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action'},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -555,6 +559,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FullScreen', 'presentation'), id: 
'fullscreen', type: 'action', mobileapp: false},
{uno: '.uno:SpellOnline'},
{name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action'},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -618,6 +623,7 @@ L.Control.Menubar = L.Control.extend({
]},
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 
'fullscreen', type: 'action

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 69b0df7578c6c7aa203dbf355c38e3cb91c09506
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 12:49:01 2020 +0300
Commit: Muhammet Kara 
CommitDate: Thu Apr 16 13:45:53 2020 +0200

Welcome: Re-add the Latest Updates to the menu

Since we now have the window.enableWelcomeMessage value

Change-Id: I2870c9d0ab025182788e1f6e131b0f8ef260c299
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92351
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8d77a6dc3..3d3f8307c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -241,6 +241,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -342,6 +343,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -458,6 +460,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -510,6 +513,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ShowResolvedAnnotations', 
'text'), id: 'showresolved', type: 'action'},
]
},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -556,6 +560,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FullScreen', 'presentation'), id: 
'fullscreen', type: 'action', mobileapp: false},
{uno: '.uno:SpellOnline'},
{name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -619,6 +624,7 @@ L.Control.Menubar = L.Control.extend({
]},
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 
'fullscreen', type: 'action', mobileapp: false},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action', iosapp: false},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -706,7 +712,7 @@ L.Control.Menubar = L.Control.extend({
'downloadas-odp', 'downloadas-ppt', 'downloadas-pptx', 
'print', // file menu
'downloadas-ods', 'downloadas-xls', 'downloadas-xlsx', 
'closedocument', // file menu
'fullscreen', 'zoomin', 'zoomout', 'zoomreset', 
'showresolved', // view menu
-   'about', 'keyboard-shortcuts', 'online-help', 
'report-an-issue' // help menu

[Libreoffice-commits] online.git: loleaflet/html loleaflet/src wsd/FileServer.cpp

[Muhammet Kara (via logerrit)]

 loleaflet/html/loleaflet.html.m4 |2 ++
 loleaflet/src/control/Toolbar.js |5 -
 wsd/FileServer.cpp   |5 +
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit aaf1fa4fc610323fd539d1480ef057e123f98790
Author: Muhammet Kara 
AuthorDate: Thu Apr 16 00:59:43 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Thu Apr 16 11:37:08 2020 +0200

Welcome: Pass welcome value from loolwsd.xml to the JS side

Now we have window.enableWelcomeMessage on the JS side to avoid any
queries at all when the feature is disabled.

Change-Id: I8420089f775bfbf5bcd557c7c720172fbce8c22e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92338
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index dca62ada1..c8d51f0f0 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -234,6 +234,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessTokenTTL = '';
   window.accessHeader = '';
   window.loleafletLogging = 'true';
+  window.enableWelcomeMessage = false;
   window.outOfFocusTimeoutSecs = 100;
   window.idleTimeoutSecs = 100;
   window.reuseCookies = '';
@@ -246,6 +247,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.accessTokenTTL = '%ACCESS_TOKEN_TTL%';
   window.accessHeader = '%ACCESS_HEADER%';
   window.loleafletLogging = '%LOLEAFLET_LOGGING%';
+  window.enableWelcomeMessage = %ENABLE_WELCOME_MSG%;
   window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
   window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
   window.reuseCookies = '%REUSE_COOKIES%';
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index e6f1a7e6f..4e17dece2 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -424,12 +424,15 @@ L.Map.include({
},
 
shouldWelcome: function() {
+   if (!window.enableWelcomeMessage || L.Browser.cypressTest)
+   return false;
+
var currentVerCookie = this.getCookie('WSDWelcomeVersion');
var newVerCookie = 'WSDWelcomeVersion=' + 
this._socket.WSDServer.Version;
var welcomeDisabledCookie = 
this.getCookie('WSDWelcomeDisabled');
var isWelcomeDisabled = welcomeDisabledCookie === 
'WSDWelcomeDisabled=true';
 
-   if (currentVerCookie !== newVerCookie && !isWelcomeDisabled && 
!L.Browser.cypressTest) {
+   if (currentVerCookie !== newVerCookie && !isWelcomeDisabled) {
return true;
}
 
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 027655dc9..5a973bc01 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -736,6 +736,11 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 const std::string idleTimeoutSecs= 
config.getString("per_view.idle_timeout_secs", "900");
 Poco::replaceInPlace(preprocess, std::string("%IDLE_TIMEOUT_SECS%"), 
idleTimeoutSecs);
 
+std::string enableWelcomeMessage = "false";
+if (config.getBool("welcome.enable", false))
+enableWelcomeMessage = "true";
+Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG%"), 
enableWelcomeMessage);
+
 // Capture cookies so we can optionally reuse them for the storage 
requests.
 {
 NameValueCollection cookies;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   13 -
 loleaflet/src/control/Toolbar.js |   76 +++
 loleaflet/src/layer/tile/TileLayer.js|3 +
 3 files changed, 91 insertions(+), 1 deletion(-)

New commits:
commit 7e9cd6e09310b337ed1040fae6c301f0e495dab1
Author: Muhammet Kara 
AuthorDate: Mon Mar 30 14:30:20 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Thu Apr 16 11:30:50 2020 +0200

Welcome: Add Welcome dialog

 * Whenever a new version of Online is deployed,
   users will be shown a welcome dialog with latest updates,
   release notes etc.
 * Location of the content for the welcome dialog can be
   set up in loolwsd.xml, and that file will be served to
   the client by loolwsd (That part handled in a prior patch)
 * If the welcome dialog is disabled in the config, or the welcome
   file (at welcome/welcome-$LANG.html by default) does not exist,
   then we will disable the checks for a week
 * A command to show the welcome dialog has also been added under
   the help menu as 'Latest Updates'

Change-Id: I490f4ed92920bbcc9308a53014a3fb5a1d477a54
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92266
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8d77a6dc3..1d31eee93 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -241,6 +241,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -342,6 +343,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -458,6 +460,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Online Help'), id: 'online-help', 
type: 'action', iosapp: false},
{name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action', iosapp: false},
{name: _('Report an issue'), id: 
'report-an-issue', type: 'action', iosapp: false},
+   {name: _('Latest Updates'), id: 
'latest-updates', type: 'action'},
{name: _('About'), id: 'about', type: 'action'}]
},
{name: _('Last modification'), id: 'last-mod', type: 
'action', tablet: false}
@@ -510,6 +513,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ShowResolvedAnnotations', 
'text'), id: 'showresolved', type: 'action'},
]
},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action'},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -556,6 +560,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:FullScreen', 'presentation'), id: 
'fullscreen', type: 'action', mobileapp: false},
{uno: '.uno:SpellOnline'},
{name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'},
+   {name: _('Latest Updates'), id: 'latest-updates', type: 
'action'},
{name: _('About'), id: 'about', type: 'action'},
],
 
@@ -619,6 +624,7 @@ L.Control.Menubar = L.Control.extend({
]},
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 
'fullscreen', type: 'action', mobileapp: false},
+   {name: _('Latest Updates'), id: 'latest-updates', type

[Libreoffice-commits] core.git: cui/inc

[Muhammet Kara (via logerrit)]

 cui/inc/tipoftheday.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a504ed789272b932556f563f013bce3552d75109
Author: Muhammet Kara 
AuthorDate: Wed Mar 25 02:44:25 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Mar 25 07:58:47 2020 +0100

Fixes to the Tip Of The Day messages from weblate feedback

Fixes suggested by SteenRønnow

Change-Id: I21e9ec2084baff3fb4cbbf9a3cadcf63662c1da6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91021
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f2ee42151018..bbceb25af47a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -149,7 +149,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME it is very easy to 
install a new dictionary: they are supplied as extensions."), 
"https://extensions.libreoffice.org/extensions?getCategories=Dictionary;, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has a portable version which 
gives you mobility. Even without administrator rights on your computer you can 
install %PRODUCTNAME Portable to your hard drive too."), 
"http://www.libreoffice.org/download/portable-versions/;, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Writer lets you number your footnotes per 
page, chapter, document: Tools ▸ Footnotes and Endnotes ▸ Footnotes tab ▸ 
Counting."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with 
the text cursor at the same editing position it was when you saved it? Add 
First or Last name in Check Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ 
First/last name."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Your Writer document does not reopen with 
the text cursor at the same editing position it was when you saved it? Add 
First or Last name in Tools ▸ Options ▸ %PRODUCTNAME ▸ User Data ▸ First/last 
name."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Citation management? Use a 3rd party 
extension."), 
"https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to insert a value in the same place on 
several sheets? Select the sheets: hold down %MOD1 key and click their tabs 
before entering."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to hide some text in a document? 
Select the text. Insert ▸ Section, and select “Hide”."), 
"modules/swriter/ui/editsectiondialog/hide", "tipoftheday_w.png"},  // online 
help is different 
https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/hidden_text.html#hd_id3148675
@@ -207,7 +207,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet ▸ Fill Cells ▸ Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/02140700.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you 
define “Go to page” interactions and to have a summary more explicit than 
Slide1, Slide2…"), "", "tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text 
to be displayed before the chapter number. For example, type “Chapter ” to 
display “Chapter 1”"), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Transpose a writer table? Copy and paste in 
Calc, transpose with copy/paste special then copy/paste special ▸ Formatted 
text in Writer."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Transpose a Writer table? Copy and paste in 
Calc, transpose with copy/paste special then copy/paste special ▸ Formatted 
text in Writer."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "To get the “Vertical Text” tool in the 
Drawing toolbar, check Tools ▸ Options ▸ Language Settings ▸ Languages ▸ 
Default languages ▸ Asian (and make the button visible with right-click)."), 
"", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "To quickly zoom in on range selection, 
right click on the zoom part of the status bar and choose Optimal."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can sign existing PDF files and also 
verify those signatures."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/guide/digital_signatures.html;,
 ""}, //local help missing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc

[Muhammet Kara (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af2567c45e4f69b2d28d1d9aef52b661c7568231
Author: Muhammet Kara 
AuthorDate: Wed Mar 25 02:29:38 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Mar 25 01:15:14 2020 +0100

Fix a tip of the day message

Reported by Tuomas Hietala on our weblate instance

Change-Id: I699fa4c231d4a4ad4f474fe72183f89104c1a532
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91014
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 2d4c59a74b4a..83f3a2e14973 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -62,7 +62,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "To remove several hyperlinks at once, 
select the text with the hyperlinks, then right-click and use “Remove 
Hyperlink”."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "To zoom a selection to fit the entire 
window in Draw, use the / (divide key) on the number pad."), "", 
"tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Click a column field (row) PivotTable and 
press F12 to group data. Choices adapt to content: Date (month, quarter, year), 
number (classes)"), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can restarts the slide show after a 
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "", 
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can restart the slide show after a 
pause specified at Slide Show ▸ Slide Show Settings ▸ Loop and repeat."), "", 
"tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "To distribute some text in multi-columns 
select the text and apply Format ▸ Columns."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use View ▸ Value Highlighting to display 
cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected 
cells/grey background."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/0308.html;,
 "tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a 
presentation template: View ▸ Master Slide and Slide ▸ New Master (or per 
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc

[Muhammet Kara (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c10125b34db96d54d899ca5c539d7389825d9e69
Author: Muhammet Kara 
AuthorDate: Wed Mar 25 02:35:08 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Mar 25 01:15:41 2020 +0100

Remove extra space from the ToTD message

TOTD: Tip Of The Day

Fix suggested by vpanter on weblate instance

Change-Id: I545819bf7581b45776cdc07aa3731e2a69885082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91015
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 83f3a2e14973..f2ee42151018 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -137,7 +137,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the 
toolbar to get quick access to favorite and recent characters to insert."), "", 
""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Choose “Hierarchical View” in the Styles 
sidebar to see the relation between styles."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in 
your document consistent. Choose one from the predefined per Styles (F11) or  
via Table ▸ AutoFormat."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in 
your document consistent. Choose one from the predefined per Styles (F11) or 
via Table ▸ AutoFormat."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Configure use of the %MOD1 key to open 
hyperlinks? Tools ▸ Options ▸ %PRODUCTNAME ▸ Security ▸ Options ▸ “%MOD1+click 
required to open hyperlinks”."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "You would like to view the calculation of 
individual elements of a formula, select the respective elements and press 
F9."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can protect cells with Format ▸ Cells ▸ 
Protection. To prevent insert, delete, rename, move/copy of sheets use Tools ▸ 
Protect Sheet."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/guide/cell_protect.html;,
 "tipoftheday_c.png"}, //local help missing
___
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' - chart2/uiconfig

[Muhammet Kara (via logerrit)]

 chart2/uiconfig/ui/sidebarelements.ui |   41 +-
 1 file changed, 21 insertions(+), 20 deletions(-)

New commits:
commit d23e6ecb497eb10156e2f77906c9364de6cfb4ed
Author: Muhammet Kara 
AuthorDate: Wed Mar 18 18:27:55 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Mar 18 17:25:17 2020 +0100

Give the legend checkbox a label

So that we don't see a nameless checkbox on Online mobile

Change-Id: I95e8910e96335a03ebad6dd46255a902df2c47a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90707
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index c4ec4cd49e2d..9db51b35a5d7 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -9,9 +9,9 @@
   
 True
 False
+6
 vertical
 6
-6
 
   
 True
@@ -97,22 +97,6 @@
   
 True
 False
-
-  
-Show Legend
-True
-True
-False
-True
-0
-True
-5
-  
-  
-0
-0
-  
-
 
   
 True
@@ -123,6 +107,7 @@
 True
 False
 end
+4
 _Placement:
 True
 end
@@ -149,12 +134,28 @@
   
 False
 True
-3
+1
   
 
   
   
-1
+0
+1
+  
+
+
+  
+Show legend
+True
+True
+False
+Show Legend
+True
+0
+True
+  
+  
+0
 0
   
 
___
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' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ced5dfbef64feaf24309eecd58e3ab9d8df860b
Author: Muhammet Kara 
AuthorDate: Wed Mar 18 13:56:43 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Mar 18 13:52:27 2020 +0100

Sidebar: Fix title & subtitle checkboxes on the ChartDeck

They now work as they did before the regression. An uncheck action
removes the title/subtitle, and a check action just makes the existing
title/subtitle visible or creates a new one if it doesn't exist

Change-Id: I23122d1be2d95af878b824ba194bd1aeed5f4f89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90692
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 2f9d7ebaec27..28bc8c1a5469 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -599,7 +599,7 @@ void 
ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV
 }
 else
 {
-TitleHelper::hideTitle(eTitle, mxModel);
+TitleHelper::removeTitle(eTitle, mxModel);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Muhammet Kara (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9374a2883537d41d6994e5a77fd45bb5fbe9a0d7
Author: Muhammet Kara 
AuthorDate: Mon Mar 16 10:58:06 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 16 13:39:55 2020 +0100

Jump view to cursor on switching tab

Change-Id: I76baf85858b46ba23ad6b6dd01d8716027cc43f2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90548
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 2bb1a8215..52660885a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1061,6 +1061,11 @@ L.TileLayer = L.GridLayer.extend({
horizontalDirection = sign(this._cellCursor.getWest() - 
this._prevCellCursor.getWest());
verticalDirection = sign(this._cellCursor.getNorth() - 
this._prevCellCursor.getNorth());
}
+   else if (!this._isEmptyRectangle(this._cellCursor)) {
+   // This is needed for jumping view to cursor position 
on tab switch
+   horizontalDirection = sign(this._cellCursor.getWest() - 
L.Point(0, 0));
+   verticalDirection = sign(this._cellCursor.getNorth() - 
L.Point(0, 0));
+   }
 
var onPgUpDn = false;
if (!this._isEmptyRectangle(this._cellCursor) && 
!this._prevCellCursor.equals(this._cellCursor)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitpod.yml

[Muhammet Kara (via logerrit)]

 .gitpod.yml |4 
 1 file changed, 4 insertions(+)

New commits:
commit aed83675d184a9e3a3acb9e072d166e9834b35c6
Author: Muhammet Kara 
AuthorDate: Mon Mar 9 15:56:02 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 9 15:54:14 2020 +0100

Install C++ VSCode extension for Gitpod

Change-Id: I631e050316acdcbb42dfbb5e6476a4e8e7cc0f8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90221
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.gitpod.yml b/.gitpod.yml
index 3cce5cbf7661..d58da0084cac 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,2 +1,6 @@
 image:
   file: .gitpod.dockerfile
+
+vscode:
+  extensions:
+- ms-vscode.cpptools@0.26.2:Pq/tmf2WN3SanVzB4xZc1g==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .gitpod.dockerfile .gitpod.yml

[Muhammet Kara (via logerrit)]

 .gitpod.dockerfile |   13 +
 .gitpod.yml|2 ++
 2 files changed, 15 insertions(+)

New commits:
commit 053752f8947361ee59b55e8150f681c7fd65aa9a
Author: Muhammet Kara 
AuthorDate: Mon Mar 9 03:50:53 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 9 13:00:32 2020 +0100

Initial commit for Gitpodifying LibreOffice core

After this commit, it will be possible to automatically
create a Gitpod instance from the core repo, simply
by giving its address.

The instance will have all the build dependencies
and the latest core repo cloned. It is suggested to limit
the thread number by 4 by using the autogen.input file.
Otherwise, your compiler processes might get killed during
the build.

'Gitpod launches ready-to-code dev environments
for your GitHub or GitLab project with a single click.'

Change-Id: I7a0e07be6b36063f0527cb03ef032df3412afc7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90197
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
new file mode 100644
index ..e0a9d97efe1d
--- /dev/null
+++ b/.gitpod.dockerfile
@@ -0,0 +1,13 @@
+FROM gitpod/workspace-full
+
+RUN sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco main 
restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://archive.ubuntu.com/ubuntu/ disco-updates 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
main restricted >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
universe >> /etc/apt/sources.list" \
+ && sudo sh -c "echo deb-src http://security.ubuntu.com/ubuntu/ disco-security 
multiverse >> /etc/apt/sources.list" \
+ && sudo apt-get update \
+ && sudo apt-get install -y \
+build-essential git libkrb5-dev graphviz nasm \
+ && sudo apt-get build-dep -y libreoffice \
+ && sudo rm -rf /var/lib/apt/lists/*
+
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index ..3cce5cbf7661
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,2 @@
+image:
+  file: .gitpod.dockerfile
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-blame-ignore-revs

[Muhammet Kara (via logerrit)]

 .git-blame-ignore-revs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f61fa885ed929e7d4aea4d84b2ddadea4825eb18
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 19:25:21 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 22:59:48 2020 +0100

put clang-format commit to .git-blame-ignore-revs

Change-Id: Ic820d7c1a21de3244f94cb4af2dfb83d7fb128d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90169
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 4aef23f3cf23..8e3b1412 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,4 +1,5 @@
 # clang-format
+472d5cfb11bc68779f9e1754a22e4d93725ea255
 a334f77792dfff92e3c97f7f61f59d01fc9338cf
 233c8aec16faf9302acb3625adcd1df026d59412
 f31b00b1a43f0d2fab2762ada230cd6dc267b6a4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 cui/source/customize/acccfg.cxx | 1645 
 cui/source/inc/acccfg.hxx   |  149 +--
 solenv/clang-format/blacklist   |2 
 3 files changed, 900 insertions(+), 896 deletions(-)

New commits:
commit 472d5cfb11bc68779f9e1754a22e4d93725ea255
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 19:16:24 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 21:57:08 2020 +0100

remove acccfg.{cxx,hxx} from clang-format blacklist

Change-Id: Iaa85fe6332f057642dfd01eee7a1d2b1e27c49b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90168
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 98f67d601025..7e0a4820fc2e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 // include own files
 
 #include 
@@ -35,7 +34,6 @@
 #include 
 #include 
 
-
 // include interface declarations
 #include 
 #include 
@@ -67,713 +65,712 @@
 
 using namespace css;
 
-static const char FOLDERNAME_UICONFIG   [] = "Configurations2";
-
-static const char MEDIATYPE_PROPNAME[] = "MediaType";
-
-static const sal_uInt16 KEYCODE_ARRAY[] =
-{
-KEY_F1,
-KEY_F2,
-KEY_F3,
-KEY_F4,
-KEY_F5,
-KEY_F6,
-KEY_F7,
-KEY_F8,
-KEY_F9,
-KEY_F10,
-KEY_F11,
-KEY_F12,
-KEY_F13,
-KEY_F14,
-KEY_F15,
-KEY_F16,
-
-KEY_DOWN,
-KEY_UP,
-KEY_LEFT,
-KEY_RIGHT,
-KEY_HOME,
-KEY_END,
-KEY_PAGEUP,
-KEY_PAGEDOWN,
-KEY_RETURN,
-KEY_ESCAPE,
-KEY_BACKSPACE,
-KEY_INSERT,
-KEY_DELETE,
-
-KEY_OPEN,
-KEY_CUT,
-KEY_COPY,
-KEY_PASTE,
-KEY_UNDO,
-KEY_REPEAT,
-KEY_FIND,
-KEY_PROPERTIES,
-KEY_FRONT,
-KEY_CONTEXTMENU,
-KEY_MENU,
-KEY_HELP,
-
-KEY_SHIFT | KEY_F1,
-KEY_SHIFT | KEY_F2,
-KEY_SHIFT | KEY_F3,
-KEY_SHIFT | KEY_F4,
-KEY_SHIFT | KEY_F5,
-KEY_SHIFT | KEY_F6,
-KEY_SHIFT | KEY_F7,
-KEY_SHIFT | KEY_F8,
-KEY_SHIFT | KEY_F9,
-KEY_SHIFT | KEY_F10,
-KEY_SHIFT | KEY_F11,
-KEY_SHIFT | KEY_F12,
-KEY_SHIFT | KEY_F13,
-KEY_SHIFT | KEY_F14,
-KEY_SHIFT | KEY_F15,
-KEY_SHIFT | KEY_F16,
-
-KEY_SHIFT | KEY_DOWN,
-KEY_SHIFT | KEY_UP,
-KEY_SHIFT | KEY_LEFT,
-KEY_SHIFT | KEY_RIGHT,
-KEY_SHIFT | KEY_HOME,
-KEY_SHIFT | KEY_END,
-KEY_SHIFT | KEY_PAGEUP,
-KEY_SHIFT | KEY_PAGEDOWN,
-KEY_SHIFT | KEY_RETURN,
-KEY_SHIFT | KEY_SPACE,
-KEY_SHIFT | KEY_ESCAPE,
-KEY_SHIFT | KEY_BACKSPACE,
-KEY_SHIFT | KEY_INSERT,
-KEY_SHIFT | KEY_DELETE,
-KEY_SHIFT | KEY_EQUAL,
-
-KEY_MOD1 | KEY_0,
-KEY_MOD1 | KEY_1,
-KEY_MOD1 | KEY_2,
-KEY_MOD1 | KEY_3,
-KEY_MOD1 | KEY_4,
-KEY_MOD1 | KEY_5,
-KEY_MOD1 | KEY_6,
-KEY_MOD1 | KEY_7,
-KEY_MOD1 | KEY_8,
-KEY_MOD1 | KEY_9,
-KEY_MOD1 | KEY_A,
-KEY_MOD1 | KEY_B,
-KEY_MOD1 | KEY_C,
-KEY_MOD1 | KEY_D,
-KEY_MOD1 | KEY_E,
-KEY_MOD1 | KEY_F,
-KEY_MOD1 | KEY_G,
-KEY_MOD1 | KEY_H,
-KEY_MOD1 | KEY_I,
-KEY_MOD1 | KEY_J,
-KEY_MOD1 | KEY_K,
-KEY_MOD1 | KEY_L,
-KEY_MOD1 | KEY_M,
-KEY_MOD1 | KEY_N,
-KEY_MOD1 | KEY_O,
-KEY_MOD1 | KEY_P,
-KEY_MOD1 | KEY_Q,
-KEY_MOD1 | KEY_R,
-KEY_MOD1 | KEY_S,
-KEY_MOD1 | KEY_T,
-KEY_MOD1 | KEY_U,
-KEY_MOD1 | KEY_V,
-KEY_MOD1 | KEY_W,
-KEY_MOD1 | KEY_X,
-KEY_MOD1 | KEY_Y,
-KEY_MOD1 | KEY_Z,
-KEY_MOD1 | KEY_SEMICOLON,
-KEY_MOD1 | KEY_QUOTERIGHT,
-KEY_MOD1 | KEY_BRACKETLEFT,
-KEY_MOD1 | KEY_BRACKETRIGHT,
-KEY_MOD1 | KEY_POINT,
-KEY_MOD1 | KEY_COMMA,
-KEY_MOD1 | KEY_TILDE,
-KEY_MOD1 | KEY_TAB,
-
-KEY_MOD1 | KEY_F1,
-KEY_MOD1 | KEY_F2,
-KEY_MOD1 | KEY_F3,
-KEY_MOD1 | KEY_F4,
-KEY_MOD1 | KEY_F5,
-KEY_MOD1 | KEY_F6,
-KEY_MOD1 | KEY_F7,
-KEY_MOD1 | KEY_F8,
-KEY_MOD1 | KEY_F9,
-KEY_MOD1 | KEY_F10,
-KEY_MOD1 | KEY_F11,
-KEY_MOD1 | KEY_F12,
-KEY_MOD1 | KEY_F13,
-KEY_MOD1 | KEY_F14,
-KEY_MOD1 | KEY_F15,
-KEY_MOD1 | KEY_F16,
-
-KEY_MOD1 | KEY_DOWN,
-KEY_MOD1 | KEY_UP,
-KEY_MOD1 | KEY_LEFT,
-KEY_MOD1 | KEY_RIGHT,
-KEY_MOD1 | KEY_HOME,
-KEY_MOD1 | KEY_END,
-KEY_MOD1 | KEY_PAGEUP,
-KEY_MOD1 | KEY_PAGEDOWN,
-KEY_MOD1 | KEY_RETURN,
-KEY_MOD1 | KEY_SPACE,
-KEY_MOD1 | KEY_BACKSPACE,
-KEY_MOD1 | KEY_INSERT,
-KEY_MOD1 | KEY_DELETE,
-
-KEY_MOD1 | KEY_ADD,
-KEY_MOD1 | KEY_SUBTRACT,
-KEY_MOD1 | KEY_MULTIPLY,
-KEY_MOD1 | KEY_DIVIDE,
-KEY_MOD1 | KEY_EQUAL,
-
-KEY_SHIFT | KEY_MOD1 | KEY_0,
-KEY_SHIFT | KEY_MOD1 | KEY_1,
-KEY_SHIFT | KEY_MOD1 | KEY_2,
-KEY_SHIFT | KEY_MOD1 | KEY_3,
-KEY_SHIFT | KEY_MOD1 | KEY_4,
-KEY_SHIFT | KEY_MOD1 | KEY_5,
-KEY_SHIFT | KEY_MOD1 | KEY_6,
-

[Libreoffice-commits] core.git: cui/source

[Muhammet Kara (via logerrit)]

 cui/source/inc/CommandCategoryListBox.hxx |6 ++
 cui/source/inc/CustomNotebookbarGenerator.hxx |5 +
 cui/source/inc/SvxConfigPageHelper.hxx|5 +
 cui/source/inc/SvxMenuConfigPage.hxx  |6 ++
 cui/source/inc/SvxNotebookbarConfigPage.hxx   |6 ++
 cui/source/inc/SvxToolbarConfigPage.hxx   |6 ++
 cui/source/inc/acccfg.hxx |5 +
 cui/source/inc/cfg.hxx|6 ++
 cui/source/inc/dialmgr.hxx|6 ++
 9 files changed, 15 insertions(+), 36 deletions(-)

New commits:
commit e00bb5e0586e795946f7bf2ea2066152dde3d727
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 13:27:36 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 16:52:30 2020 +0100

Use 'pragma once' in Customize dialog headers

Change-Id: I93bffad0f550cc2b12e6fb65879767573485943f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90154
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/inc/CommandCategoryListBox.hxx 
b/cui/source/inc/CommandCategoryListBox.hxx
index 4075d1e22839..059c1474f1cd 100644
--- a/cui/source/inc/CommandCategoryListBox.hxx
+++ b/cui/source/inc/CommandCategoryListBox.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX
-#define INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX
+
+#pragma once
 
 #include 
 #include "cfgutil.hxx"
@@ -77,6 +77,4 @@ public:
 void set_visible(bool bVisible) {m_xControl->set_visible(bVisible);}
 };
 
-#endif // INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/inc/CustomNotebookbarGenerator.hxx 
b/cui/source/inc/CustomNotebookbarGenerator.hxx
index 879c4dba522c..b06848dbb955 100644
--- a/cui/source/inc/CustomNotebookbarGenerator.hxx
+++ b/cui/source/inc/CustomNotebookbarGenerator.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CUI_SOURCE_INC_CUSTOMNOTEBOOKBARGENERATOR_HXX
-#define INCLUDED_CUI_SOURCE_INC_CUSTOMNOTEBOOKBARGENERATOR_HXX
+#pragma once
 
 #include 
 #include 
@@ -40,6 +39,4 @@ public:
 OUString sNotebookbarConfigType);
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SvxConfigPageHelper.hxx 
b/cui/source/inc/SvxConfigPageHelper.hxx
index 8aaba7ae90e2..8beed6069be3 100644
--- a/cui/source/inc/SvxConfigPageHelper.hxx
+++ b/cui/source/inc/SvxConfigPageHelper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CUI_SOURCE_INC_SVXCONFIGPAGEHELPER_HXX
-#define INCLUDED_CUI_SOURCE_INC_SVXCONFIGPAGEHELPER_HXX
+#pragma once
 
 #include 
 
@@ -87,6 +86,4 @@ public:
 
 };
 
-#endif // INCLUDED_CUI_SOURCE_INC_SVXCONFIGPAGEHELPER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx 
b/cui/source/inc/SvxMenuConfigPage.hxx
index b5b09b726419..50124e46ab10 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX
-#define INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX
+
+#pragma once
 
 #include 
 #include 
@@ -69,6 +69,4 @@ public:
 bool docConfig ) override;
 };
 
-#endif // INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SvxNotebookbarConfigPage.hxx 
b/cui/source/inc/SvxNotebookbarConfigPage.hxx
index 3c657db3ca84..47870949d9aa 100644
--- a/cui/source/inc/SvxNotebookbarConfigPage.hxx
+++ b/cui/source/inc/SvxNotebookbarConfigPage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CUI_SOURCE_INC_SVXNOTEBOOKBARCONFIGPAGE_HXX
-#define INCLUDED_CUI_SOURCE_INC_SVXNOTEBOOKBARCONFIGPAGE_HXX
+
+#pragma once
 
 #include 
 #include 
@@ -84,6 +84,4 @@ public:
 virtual ~SvxNotebookbarEntriesListBox() override;
 };
 
-#endif // INCLUDED_CUI_SOURCE_INC_SVXNOTEBOOKBARCONFIGPAGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx 
b/cui/source/inc/SvxToolbarConfigPage.hxx
index f367fea9ed5f..5902cdf4b268 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/license

[Libreoffice-commits] core.git: solenv/clang-format toolkit/source tools/qa uui/source

[Muhammet Kara (via logerrit)]

 solenv/clang-format/blacklist  |8 
 toolkit/source/controls/controlmodelcontainerbase_internal.hxx |2 +-
 tools/qa/cppunit/test_bigint.cxx   |8 
 uui/source/authfallbackdlg.hxx |3 +--
 uui/source/filechanged.hxx |1 +
 uui/source/lockcorrupt.hxx |1 +
 uui/source/lockfailed.hxx  |1 +
 7 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit f31af3ed40fba2376eb19238d3e158e91b6d1b29
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 12:57:44 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 15:27:45 2020 +0100

clang-format toolkit, tools, uui with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I4952f350f4d22913ea94689b902ffa26c223ff96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90152
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b43214b3a6e3..c77925195833 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -15859,7 +15859,6 @@ toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/btndlg.hxx
 toolkit/inc/helper/imagealign.hxx
 toolkit/inc/helper/scrollabledialog.hxx
-toolkit/inc/helper/servicenames.hxx
 toolkit/inc/helper/tkresmgr.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
@@ -15890,7 +15889,6 @@ toolkit/source/awt/vclxwindows_internal.hxx
 toolkit/source/controls/accessiblecontrolcontext.cxx
 toolkit/source/controls/animatedimages.cxx
 toolkit/source/controls/controlmodelcontainerbase.cxx
-toolkit/source/controls/controlmodelcontainerbase_internal.hxx
 toolkit/source/controls/dialogcontrol.cxx
 toolkit/source/controls/eventcontainer.cxx
 toolkit/source/controls/filectrl.cxx
@@ -15930,13 +15928,11 @@ toolkit/source/helper/formpdfexport.cxx
 toolkit/source/helper/imagealign.cxx
 toolkit/source/helper/listenermultiplexer.cxx
 toolkit/source/helper/property.cxx
-toolkit/source/helper/servicenames.cxx
 toolkit/source/helper/tkresmgr.cxx
 toolkit/source/helper/unopropertyarrayhelper.cxx
 toolkit/source/helper/unowrapper.cxx
 toolkit/source/helper/vclunohelper.cxx
 tools/inc/poly.h
-tools/qa/cppunit/test_bigint.cxx
 tools/qa/cppunit/test_color.cxx
 tools/qa/cppunit/test_date.cxx
 tools/qa/cppunit/test_fract.cxx
@@ -16512,9 +16508,7 @@ uui/qa/unit/uui-dialogs-test.cxx
 uui/source/alreadyopen.cxx
 uui/source/alreadyopen.hxx
 uui/source/authfallbackdlg.cxx
-uui/source/authfallbackdlg.hxx
 uui/source/filechanged.cxx
-uui/source/filechanged.hxx
 uui/source/fltdlg.cxx
 uui/source/fltdlg.hxx
 uui/source/getcontinuations.hxx
@@ -16528,9 +16522,7 @@ uui/source/iahndl.cxx
 uui/source/iahndl.hxx
 uui/source/interactionhandler.cxx
 uui/source/lockcorrupt.cxx
-uui/source/lockcorrupt.hxx
 uui/source/lockfailed.cxx
-uui/source/lockfailed.hxx
 uui/source/logindlg.cxx
 uui/source/logindlg.hxx
 uui/source/loginerr.hxx
diff --git a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx 
b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx
index 2a70aaa9d2ad..c65cabc8ad34 100644
--- a/toolkit/source/controls/controlmodelcontainerbase_internal.hxx
+++ b/toolkit/source/controls/controlmodelcontainerbase_internal.hxx
@@ -23,7 +23,7 @@
 #include 
 
 HELPER
-OUString getPhysicalLocation( const css::uno::Any& rbase, const css::uno::Any& 
rUrl );
+OUString getPhysicalLocation(const css::uno::Any& rbase, const css::uno::Any& 
rUrl);
 
 #endif // 
INCLUDED_TOOLKIT_SOURCE_CONTROLS_CONTROLMODELCONTAINERBASE_INTERNAL_HXX
 
diff --git a/tools/qa/cppunit/test_bigint.cxx b/tools/qa/cppunit/test_bigint.cxx
index ef147961dbf4..ed3ab3cc3b63 100644
--- a/tools/qa/cppunit/test_bigint.cxx
+++ b/tools/qa/cppunit/test_bigint.cxx
@@ -24,7 +24,6 @@
 
 namespace tools
 {
-
 class BigIntTest : public CppUnit::TestFixture
 {
 public:
@@ -80,7 +79,8 @@ void BigIntTest::testConstructionFromLongLong()
 
 // positive number not fitting to long
 {
-BigInt bi(static_cast(std::numeric_limits::max()) + 
static_cast(1));
+BigInt bi(static_cast(std::numeric_limits::max())
+  + static_cast(1));
 CPPUNIT_ASSERT(bi.IsSet());
 CPPUNIT_ASSERT(!bi.IsZero());
 CPPUNIT_ASSERT(!bi.IsNeg());
@@ -89,7 +89,8 @@ void BigIntTest::testConstructionFromLongLong()
 
 // negative number not fitting to long
 {
-BigInt bi(static_cast(std::numeric_limits::min()) - 
static_cast(1));
+BigInt bi

[Libreoffice-commits] core.git: solenv/clang-format xmloff/inc xmloff/source

[Muhammet Kara (via logerrit)]

 solenv/clang-format/blacklist|   12 
 xmloff/inc/SchXMLImport.hxx  |   15 ---
 xmloff/inc/anim.hxx  |6 --
 xmloff/inc/animations.hxx|3 +--
 xmloff/inc/enummaps.hxx  |2 +-
 xmloff/inc/prstylecond.hxx   |2 +-
 xmloff/source/draw/layerexp.hxx  |2 +-
 xmloff/source/table/table.hxx|2 +-
 xmloff/source/text/XMLLineNumberingExport.hxx|1 -
 xmloff/source/transform/PropType.hxx |2 +-
 xmloff/source/transform/PropertyActionsOASIS.hxx |2 +-
 xmloff/source/transform/PropertyActionsOOo.hxx   |2 +-
 xmloff/source/transform/TransformerAction.hxx|1 -
 13 files changed, 20 insertions(+), 32 deletions(-)

New commits:
commit f9b31a49027a8fa5e8fa094a3b62866832426466
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 12:43:48 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 12:06:07 2020 +0100

clang-format xmloff with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: Ia2b85f00fc182798176d0af686b37f0df59ecb3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90151
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9caa70d31144..204cd1a4031b 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17870,7 +17870,6 @@ xmloff/inc/RDFaExportHelper.hxx
 xmloff/inc/RDFaImportHelper.hxx
 xmloff/inc/SchXMLAutoStylePoolP.hxx
 xmloff/inc/SchXMLExport.hxx
-xmloff/inc/SchXMLImport.hxx
 xmloff/inc/StyleMap.hxx
 xmloff/inc/TransGradientStyle.hxx
 xmloff/inc/WordWrapPropertyHdl.hxx
@@ -17908,18 +17907,14 @@ xmloff/inc/XMLTextColumnsContext.hxx
 xmloff/inc/XMLTextColumnsExport.hxx
 xmloff/inc/XMLTextColumnsPropertyHandler.hxx
 xmloff/inc/XMLTextHeaderFooterContext.hxx
-xmloff/inc/anim.hxx
 xmloff/inc/animationimport.hxx
-xmloff/inc/animations.hxx
 xmloff/inc/animimp.hxx
-xmloff/inc/enummaps.hxx
 xmloff/inc/facreg.hxx
 xmloff/inc/fasttokenhandler.hxx
 xmloff/inc/forms/form_handler_factory.hxx
 xmloff/inc/forms/property_handler.hxx
 xmloff/inc/forms/property_ids.hxx
 xmloff/inc/propimp0.hxx
-xmloff/inc/prstylecond.hxx
 xmloff/inc/txtflde.hxx
 xmloff/inc/txtfldi.hxx
 xmloff/inc/txtlists.hxx
@@ -18039,7 +18034,6 @@ xmloff/source/draw/descriptionimp.hxx
 xmloff/source/draw/eventimp.cxx
 xmloff/source/draw/eventimp.hxx
 xmloff/source/draw/layerexp.cxx
-xmloff/source/draw/layerexp.hxx
 xmloff/source/draw/layerimp.cxx
 xmloff/source/draw/layerimp.hxx
 xmloff/source/draw/numithdl.cxx
@@ -18258,7 +18252,6 @@ xmloff/source/style/xmltabe.cxx
 xmloff/source/style/xmltabi.cxx
 xmloff/source/table/XMLTableExport.cxx
 xmloff/source/table/XMLTableImport.cxx
-xmloff/source/table/table.hxx
 xmloff/source/text/XMLAnchorTypePropHdl.hxx
 xmloff/source/text/XMLAutoMarkFileContext.cxx
 xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -18323,7 +18316,6 @@ xmloff/source/text/XMLIndexTitleTemplateContext.hxx
 xmloff/source/text/XMLIndexUserSourceContext.cxx
 xmloff/source/text/XMLIndexUserSourceContext.hxx
 xmloff/source/text/XMLLineNumberingExport.cxx
-xmloff/source/text/XMLLineNumberingExport.hxx
 xmloff/source/text/XMLLineNumberingImportContext.cxx
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -18455,11 +18447,8 @@ xmloff/source/transform/ProcAddAttrTContext.cxx
 xmloff/source/transform/ProcAddAttrTContext.hxx
 xmloff/source/transform/ProcAttrTContext.cxx
 xmloff/source/transform/ProcAttrTContext.hxx
-xmloff/source/transform/PropType.hxx
 xmloff/source/transform/PropertyActionsOASIS.cxx
-xmloff/source/transform/PropertyActionsOASIS.hxx
 xmloff/source/transform/PropertyActionsOOo.cxx
-xmloff/source/transform/PropertyActionsOOo.hxx
 xmloff/source/transform/RenameElemTContext.cxx
 xmloff/source/transform/RenameElemTContext.hxx
 xmloff/source/transform/StyleOASISTContext.cxx
@@ -18467,7 +18456,6 @@ xmloff/source/transform/StyleOASISTContext.hxx
 xmloff/source/transform/StyleOOoTContext.cxx
 xmloff/source/transform/StyleOOoTContext.hxx
 xmloff/source/transform/Transformer.hxx
-xmloff/source/transform/TransformerAction.hxx
 xmloff/source/transform/TransformerActionInit.hxx
 xmloff/source/transform/TransformerActions.cxx
 xmloff/source/transform/TransformerActions.hxx
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 690038c80bf8..33b0f50d5764 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -152,20 +152,21 @@ class

[Libreoffice-commits] core.git: solenv/clang-format svx/inc svx/source

[Muhammet Kara (via logerrit)]

 solenv/clang-format/blacklist   |   12 
 svx/inc/CommonStylePreviewRenderer.hxx  |4 ++--
 svx/inc/xftshtit.hxx|2 +-
 svx/source/dialog/SafeModeDialog.hxx|1 -
 svx/source/dialog/hexcolorcontrol.cxx   |8 +++-
 svx/source/dialog/linkwarn.cxx  |2 +-
 svx/source/dialog/txenctab.cxx  |1 -
 svx/source/inc/clonelist.hxx|1 -
 svx/source/inc/svdobjuserdatalist.hxx   |2 +-
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx |7 +++
 svx/source/sidebar/paragraph/ParaSpacingWindow.hxx  |5 ++---
 svx/source/sidebar/text/TextUnderlineControl.hxx|5 ++---
 svx/source/unodraw/UnoGraphicExporter.hxx   |2 +-
 13 files changed, 16 insertions(+), 36 deletions(-)

New commits:
commit 7c48277b1c54ea30fa1a13db1b3e45d2269bd7ec
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 12:30:12 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 11:36:26 2020 +0100

clang-format svx with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I89062f4846e0ba4de7fbe799a1515665fe4449a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90146
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 5e874dc1fe9e..9caa70d31144 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -13229,7 +13229,6 @@ svtools/source/uno/wizard/wizardshell.cxx
 svtools/source/uno/wizard/wizardshell.hxx
 svx/inc/AccessibleTableShape.hxx
 svx/inc/AffineMatrixItem.hxx
-svx/inc/CommonStylePreviewRenderer.hxx
 svx/inc/DescriptionGenerator.hxx
 svx/inc/GalleryControl.hxx
 svx/inc/XPropertyTable.hxx
@@ -13359,7 +13358,6 @@ svx/inc/textchaincursor.hxx
 svx/inc/textchainflow.hxx
 svx/inc/uiobject.hxx
 svx/inc/unomlstr.hxx
-svx/inc/xftshtit.hxx
 svx/inc/xpolyimp.hxx
 svx/qa/unit/svdraw/test_SdrTextObject.cxx
 svx/qa/unit/svx-dialogs-test.cxx
@@ -13405,7 +13403,6 @@ svx/source/dialog/ClassificationDialog.cxx
 svx/source/dialog/ClassificationEditView.cxx
 svx/source/dialog/ClassificationEditView.hxx
 svx/source/dialog/SafeModeDialog.cxx
-svx/source/dialog/SafeModeDialog.hxx
 svx/source/dialog/SafeModeUI.cxx
 svx/source/dialog/SpellDialogChildWindow.cxx
 svx/source/dialog/SvxNumOptionsTabPageHelper.cxx
@@ -13436,14 +13433,12 @@ svx/source/dialog/frmsel.cxx
 svx/source/dialog/graphctl.cxx
 svx/source/dialog/grfflt.cxx
 svx/source/dialog/hdft.cxx
-svx/source/dialog/hexcolorcontrol.cxx
 svx/source/dialog/hyperdlg.cxx
 svx/source/dialog/imapdlg.cxx
 svx/source/dialog/imapimp.hxx
 svx/source/dialog/imapwnd.cxx
 svx/source/dialog/imapwnd.hxx
 svx/source/dialog/langbox.cxx
-svx/source/dialog/linkwarn.cxx
 svx/source/dialog/measctrl.cxx
 svx/source/dialog/optgrid.cxx
 svx/source/dialog/pagectrl.cxx
@@ -13469,7 +13464,6 @@ svx/source/dialog/svxruler.cxx
 svx/source/dialog/swframeexample.cxx
 svx/source/dialog/swframeposstrings.cxx
 svx/source/dialog/txencbox.cxx
-svx/source/dialog/txenctab.cxx
 svx/source/engine3d/camera3d.cxx
 svx/source/engine3d/cube3d.cxx
 svx/source/engine3d/deflt3d.cxx
@@ -13568,7 +13562,6 @@ svx/source/inc/ShapesUtil.hxx
 svx/source/inc/cell.hxx
 svx/source/inc/celltypes.hxx
 svx/source/inc/charmapacc.hxx
-svx/source/inc/clonelist.hxx
 svx/source/inc/datalistener.hxx
 svx/source/inc/datanavi.hxx
 svx/source/inc/delayedevent.hxx
@@ -13605,7 +13598,6 @@ svx/source/inc/gridcols.hxx
 svx/source/inc/sdbdatacolumn.hxx
 svx/source/inc/sqlparserclient.hxx
 svx/source/inc/svdobjplusdata.hxx
-svx/source/inc/svdobjuserdatalist.hxx
 svx/source/inc/svdoutlinercache.hxx
 svx/source/inc/svxpixelctlaccessiblecontext.hxx
 svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -13776,13 +13768,11 @@ svx/source/sidebar/media/MediaPlaybackPanel.hxx
 svx/source/sidebar/nbdtmg.cxx
 svx/source/sidebar/nbdtmgfact.cxx
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
-svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
 svx/source/sidebar/paragraph/ParaSpacingControl.cxx
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
-svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -13797,7 +13787,6 @@ svx/source/sidebar/text

[Libreoffice-commits] core.git: sd/inc sd/qa sd/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 sd/inc/Outliner.hxx  |   48 ++-
 sd/inc/SdShapeTypes.hxx  |4 +-
 sd/qa/unit/HtmlExportTest.cxx|6 ++--
 sd/source/core/typemap.cxx   |3 --
 sd/source/filter/html/buttonset.hxx  |4 +-
 sd/source/filter/xml/sdtransform.hxx |2 -
 sd/source/ui/inc/MutexOwner.hxx  |4 +-
 sd/source/ui/inc/dlg_char.hxx|4 +-
 sd/source/ui/inc/paragr.hxx  |2 -
 sd/source/ui/inc/unokywds.hxx|5 ++-
 solenv/clang-format/blacklist|   10 ---
 11 files changed, 43 insertions(+), 49 deletions(-)

New commits:
commit be22ca7cc69ba905c86e05f0413c05ca0bd42556
Author: Muhammet Kara 
AuthorDate: Sat Mar 7 12:21:32 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Mar 7 11:33:42 2020 +0100

clang-format sd with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I08c01d7069b041964614c233d452d70f332228f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90145
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 27ec4d80127d..11d79a2a1199 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -30,12 +30,13 @@ class SdrObject;
 class SdrTextObj;
 class SdDrawDocument;
 
-namespace weld {
+namespace weld
+{
 class Window;
 }
 
-namespace sd {
-
+namespace sd
+{
 class View;
 class ViewShell;
 class Window;
@@ -61,7 +62,6 @@ struct SearchSelection
 
 } // end of namespace sd
 
-
 /** The main purpose of this class is searching and replacing as well as
 spelling of impress documents.  The main part of both tasks lies in
 iterating over the pages and view modes of a document and apply the
@@ -114,8 +114,7 @@ struct SearchSelection
 queried.  This is only sufficient for searching the outline view.
 
 */
-class SdOutliner
-: public SdrOutliner
+class SdOutliner : public SdrOutliner
 {
 public:
 friend class ::sd::outliner::OutlinerContainer;
@@ -131,7 +130,7 @@ public:
 OutlinerMode::OutlineView are defined in
 editeng/outliner.hxx.
 */
-SdOutliner( SdDrawDocument* pDoc, OutlinerMode nMode );
+SdOutliner(SdDrawDocument* pDoc, OutlinerMode nMode);
 virtual ~SdOutliner() override;
 /// Forbid copy construction and copy assignment
 SdOutliner(const Outliner&) = delete;
@@ -156,7 +155,7 @@ public:
 indicated by user input to the search dialog).  A  
value
 indicates that another call to this method is required.
 */
-bool StartSearchAndReplace (const SvxSearchItem* pSearchItem);
+bool StartSearchAndReplace(const SvxSearchItem* pSearchItem);
 
 /** Iterate over the sentences in all text shapes and stop at the
 next sentence with spelling errors. While doing so the view
@@ -174,8 +173,8 @@ public:
 
 /** Starts the text conversion (hangul/hanja or Chinese 
simplified/traditional)
 for the current viewshell */
-void StartConversion( LanguageType nSourceLanguage,  LanguageType 
nTargetLanguage,
-const vcl::Font *pTargetFont, sal_Int32 nOptions, bool 
bIsInteractive );
+void StartConversion(LanguageType nSourceLanguage, LanguageType 
nTargetLanguage,
+ const vcl::Font* pTargetFont, sal_Int32 nOptions, 
bool bIsInteractive);
 
 /** This is called internally when text conversion is started.
 The position of current view mode/page/object/caret position
@@ -186,9 +185,9 @@ public:
 /** Release all resources that have been created during the conversion */
 void EndConversion();
 
-int GetIgnoreCurrentPageChangesLevel() const { return 
mnIgnoreCurrentPageChangesLevel; };
-voidIncreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel++; };
-voidDecreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel--; };
+int GetIgnoreCurrentPageChangesLevel() const { return 
mnIgnoreCurrentPageChangesLevel; };
+void IncreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel++; };
+void DecreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel--; };
 SdDrawDocument* GetDoc() const { return mpDrawDocument; }
 
 private:
@@ -197,7 +196,12 @@ private:
 
 /// Specifies whether to search and replace, to spell check or to do a
 /// text conversion.
-enum mode {SEARCH, SPELL, TEXT_CONVERSION} meMode;
+enum mode
+{
+SEARCH,
+SPELL,
+TEXT_CONVERSION
+} meMode;
 
 /// The view which displays the searched objects.
 ::sd::View* mpView;
@@ -207,7 +211,7 @@ pri

[Libreoffice-commits] core.git: solenv/clang-format

[Muhammet Kara (via logerrit)]

 solenv/clang-format/blacklist |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 497f0766c8b9578b125eaa1db68a21308d6e9396
Author: Muhammet Kara 
AuthorDate: Tue Mar 3 20:27:40 2020 +0300
Commit: Muhammet Kara 
CommitDate: Wed Mar 4 00:47:19 2020 +0100

clang-format: Remove proper files from the blacklist

Change-Id: I27c9fb174255f52305452ce8ff0ed5ecb576a771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89903
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index da0e39543459..be440c697a3f 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7820,10 +7820,8 @@ linguistic/workben/sspellimp.hxx
 lotuswordpro/inc/localtime.hxx
 lotuswordpro/inc/lwpatomholder.hxx
 lotuswordpro/inc/lwpbasetype.hxx
-lotuswordpro/inc/lwpbookmarkmgr.hxx
 lotuswordpro/inc/lwpcolor.hxx
 lotuswordpro/inc/lwpdefs.hxx
-lotuswordpro/inc/lwpdocdata.hxx
 lotuswordpro/inc/lwpfilehdr.hxx
 lotuswordpro/inc/lwpfont.hxx
 lotuswordpro/inc/lwpfoundry.hxx
@@ -7839,7 +7837,6 @@ lotuswordpro/inc/lwpobjtags.hxx
 lotuswordpro/inc/lwpoverride.hxx
 lotuswordpro/inc/lwpsvstream.hxx
 lotuswordpro/inc/lwptools.hxx
-lotuswordpro/inc/xfilter/ixfattrlist.hxx
 lotuswordpro/inc/xfilter/ixfstream.hxx
 lotuswordpro/inc/xfilter/ixfstyle.hxx
 lotuswordpro/inc/xfilter/xfannotation.hxx
@@ -7857,11 +7854,9 @@ lotuswordpro/inc/xfilter/xfcolumns.hxx
 lotuswordpro/inc/xfilter/xfconfigmanager.hxx
 lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
 lotuswordpro/inc/xfilter/xfcrossref.hxx
-lotuswordpro/inc/xfilter/xfdate.hxx
 lotuswordpro/inc/xfilter/xfdatestyle.hxx
 lotuswordpro/inc/xfilter/xfdocfield.hxx
 lotuswordpro/inc/xfilter/xfdrawgroup.hxx
-lotuswordpro/inc/xfilter/xfdrawline.hxx
 lotuswordpro/inc/xfilter/xfdrawlinestyle.hxx
 lotuswordpro/inc/xfilter/xfdrawobj.hxx
 lotuswordpro/inc/xfilter/xfdrawpath.hxx
@@ -7870,7 +7865,6 @@ lotuswordpro/inc/xfilter/xfdrawrect.hxx
 lotuswordpro/inc/xfilter/xfdrawstyle.hxx
 lotuswordpro/inc/xfilter/xfdropcap.hxx
 lotuswordpro/inc/xfilter/xfendnote.hxx
-lotuswordpro/inc/xfilter/xfendnoteconfig.hxx
 lotuswordpro/inc/xfilter/xfentry.hxx
 lotuswordpro/inc/xfilter/xffloatframe.hxx
 lotuswordpro/inc/xfilter/xffont.hxx
@@ -7885,7 +7879,6 @@ lotuswordpro/inc/xfilter/xfglobal.hxx
 lotuswordpro/inc/xfilter/xfheader.hxx
 lotuswordpro/inc/xfilter/xfheaderstyle.hxx
 lotuswordpro/inc/xfilter/xfhyperlink.hxx
-lotuswordpro/inc/xfilter/xfimage.hxx
 lotuswordpro/inc/xfilter/xfimagestyle.hxx
 lotuswordpro/inc/xfilter/xfindex.hxx
 lotuswordpro/inc/xfilter/xfinputlist.hxx
@@ -7913,7 +7906,6 @@ lotuswordpro/inc/xfilter/xfrowstyle.hxx
 lotuswordpro/inc/xfilter/xfruby.hxx
 lotuswordpro/inc/xfilter/xfrubystyle.hxx
 lotuswordpro/inc/xfilter/xfsaxstream.hxx
-lotuswordpro/inc/xfilter/xfsection.hxx
 lotuswordpro/inc/xfilter/xfsectionstyle.hxx
 lotuswordpro/inc/xfilter/xfshadow.hxx
 lotuswordpro/inc/xfilter/xfstyle.hxx
@@ -7922,7 +7914,6 @@ lotuswordpro/inc/xfilter/xfstylemanager.hxx
 lotuswordpro/inc/xfilter/xftable.hxx
 lotuswordpro/inc/xfilter/xftablestyle.hxx
 lotuswordpro/inc/xfilter/xftabstop.hxx
-lotuswordpro/inc/xfilter/xftextcontent.hxx
 lotuswordpro/inc/xfilter/xftextspan.hxx
 lotuswordpro/inc/xfilter/xftextstyle.hxx
 lotuswordpro/inc/xfilter/xftimestyle.hxx
@@ -7943,9 +7934,7 @@ lotuswordpro/source/filter/first.hxx
 lotuswordpro/source/filter/localtime.cxx
 lotuswordpro/source/filter/lwp9reader.cxx
 lotuswordpro/source/filter/lwp9reader.hxx
-lotuswordpro/source/filter/lwparrowstyles.hxx
 lotuswordpro/source/filter/lwpatomholder.cxx
-lotuswordpro/source/filter/lwpbackgroundoverride.hxx
 lotuswordpro/source/filter/lwpbackgroundstuff.cxx
 lotuswordpro/source/filter/lwpbackgroundstuff.hxx
 lotuswordpro/source/filter/lwpbasetype.cxx
@@ -7957,12 +7946,10 @@ lotuswordpro/source/filter/lwpbulletstylemgr.cxx
 lotuswordpro/source/filter/lwpbulletstylemgr.hxx
 lotuswordpro/source/filter/lwpcelllayout.cxx
 lotuswordpro/source/filter/lwpcelllayout.hxx
-lotuswordpro/source/filter/lwpchangemgr.cxx
 lotuswordpro/source/filter/lwpcharacterstyle.cxx
 lotuswordpro/source/filter/lwpcharacterstyle.hxx
 lotuswordpro/source/filter/lwpcharborderoverride.hxx
 lotuswordpro/source/filter/lwpcharsetmgr.cxx
-lotuswordpro/source/filter/lwpcharsetmgr.hxx
 lotuswordpro/source/filter/lwpcontent.cxx
 lotuswordpro/source/filter/lwpcontent.hxx
 lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -7979,7 +7966,6 @@ lotuswordpro/source/filter/lwpdrawobj.hxx
 lotuswordpro/source/filter/lwpdropcapmgr.cxx
 lotuswordpro/source/filter/lwpfilehdr.cxx
 lotuswordpro/source/filter/lwpfilter.cxx
-lotuswordpro/source/filter/lwpfilter.hxx
 lotuswordpro/source/filter/lwpfnlayout.cxx
 lotuswordpro/source/filter/lwpfnlayout.hxx
 lotuswordpro/source/filter/lwpfont.cxx
@@ -8009,7 +7995,6 @@ lotuswordpro/source/filter/lwpgrfobj.hxx
 lotuswordpro/source/filter/lwpholder.cxx
 lotuswordpro/source/filter/lwpholder.hxx
 lotuswordpro/source

[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 lotuswordpro/inc/lwpbookmarkmgr.hxx   |5 +-
 lotuswordpro/inc/lwpchangemgr.hxx |7 +--
 lotuswordpro/inc/lwpdocdata.hxx   |   11 +++-
 lotuswordpro/inc/lwpdropcapmgr.hxx|3 -
 lotuswordpro/inc/xfilter/ixfattrlist.hxx  |8 +--
 lotuswordpro/inc/xfilter/xfcontent.hxx|9 ++--
 lotuswordpro/inc/xfilter/xfdate.hxx   |8 +--
 lotuswordpro/inc/xfilter/xfdefs.hxx   |   14 +++---
 lotuswordpro/inc/xfilter/xfdrawline.hxx   |6 +-
 lotuswordpro/inc/xfilter/xfdrawpolygon.hxx|2 
 lotuswordpro/inc/xfilter/xfendnoteconfig.hxx  |3 -
 lotuswordpro/inc/xfilter/xffontfactory.hxx|8 +--
 lotuswordpro/inc/xfilter/xfimage.hxx  |8 +--
 lotuswordpro/inc/xfilter/xfparagraph.hxx  |7 +--
 lotuswordpro/inc/xfilter/xfsection.hxx|6 +-
 lotuswordpro/inc/xfilter/xftextboxstyle.hxx   |3 -
 lotuswordpro/inc/xfilter/xftextcontent.hxx|8 +--
 lotuswordpro/source/filter/bentoid.hxx|3 -
 lotuswordpro/source/filter/lwparrowstyles.hxx |   10 ++--
 lotuswordpro/source/filter/lwpbackgroundoverride.cxx  |2 
 lotuswordpro/source/filter/lwpbackgroundoverride.hxx  |7 +--
 lotuswordpro/source/filter/lwpbookmarkmgr.cxx |8 +--
 lotuswordpro/source/filter/lwpchangemgr.cxx   |   12 ++---
 lotuswordpro/source/filter/lwpcharborderoverride.cxx  |4 -
 lotuswordpro/source/filter/lwpcharsetmgr.hxx  |8 +--
 lotuswordpro/source/filter/lwpcolor.cxx   |8 +--
 lotuswordpro/source/filter/lwpfilter.hxx  |3 -
 lotuswordpro/source/filter/lwpfribsection.hxx |9 ++--
 lotuswordpro/source/filter/lwphyperlinkmgr.hxx|7 +--
 lotuswordpro/source/filter/lwpnumberingoverride.cxx   |5 +-
 lotuswordpro/source/filter/lwpobjfactory.cxx  |   40 +++---
 lotuswordpro/source/filter/lwppagehint.cxx|8 +--
 lotuswordpro/source/filter/lwpprtinfo.hxx |2 
 lotuswordpro/source/filter/lwpsdwfileloader.hxx   |5 +-
 lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx |6 +-
 lotuswordpro/source/filter/lwpsdwrect.hxx |8 +--
 lotuswordpro/source/filter/lwpusrdicts.hxx|4 -
 lotuswordpro/source/filter/lwpverdocument.cxx |9 ++--
 lotuswordpro/source/filter/lwpverdocument.hxx |3 -
 lotuswordpro/source/filter/lwpvpointer.hxx|5 +-
 lotuswordpro/source/filter/xfilter/xfbase64.hxx   |2 
 lotuswordpro/source/filter/xfilter/xffloatframe.cxx   |8 +--
 lotuswordpro/source/filter/xfilter/xffontdecl.cxx |1 
 lotuswordpro/source/filter/xfilter/xfglobal.cxx   |8 +--
 solenv/clang-format/blacklist |   22 -
 45 files changed, 154 insertions(+), 179 deletions(-)

New commits:
commit 1f84470abc6087fc6a3d01defae5043772bdd95e
Author: Muhammet Kara 
AuthorDate: Sun Mar 1 15:51:15 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Mar 2 13:26:02 2020 +0100

clang-format lotuswordpro with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I4527dcc9aaabd1fba3363c0aa2bf3217e42ef45e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89776
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/lotuswordpro/inc/lwpbookmarkmgr.hxx 
b/lotuswordpro/inc/lwpbookmarkmgr.hxx
index 926d4e391934..9dbeb344e262 100644
--- a/lotuswordpro/inc/lwpbookmarkmgr.hxx
+++ b/lotuswordpro/inc/lwpbookmarkmgr.hxx
@@ -69,11 +69,12 @@
 class LwpBookmarkMgr
 {
 public:
-void AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark);
-void AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* pMark);
+void AddXFBookmarkEnd(const OUString& sName, XFBookmarkEnd* pMark);
+void AddXFBookmarkStart(const OUString& sName, XFBookmarkStart* pMark);
 bool FindBookmark(const OUString& sName);
 ~LwpBookmarkMgr();
 LwpBookmarkMgr();
+
 private:
 std::map> m_MapStart;
 std::map> m_MapEnd;
diff --git a/lotuswordpro/inc/lwpchangemgr.hxx 
b/lotuswordpro/inc/lwpchangemgr.hxx
index bbf00ba1ad49..fb39042aa232 100644
--- a/lotuswordpro/inc/lwpchangemgr.hxx
+++ b/lotuswordpro/inc/lwpchangemgr.hxx
@@ -81,10 +81,11 @@ public:
 void SetHeadFootChange(XFContentContainer* pCont);
 ~LwpChangeMgr();
 LwpChangeMgr();
+
 private:
-std::map* m_pFribMap;
-std::map m_DocFribMap;
-std::map m_HeadFootFribMap;
+std::map* m_pFribMap;

[Libreoffice-commits] core.git: sd/inc sd/source

[Muhammet Kara (via logerrit)]

 sd/inc/strings.hrc   |1 +
 sd/source/ui/func/futext.cxx |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 5f2cf0cc76316d27c0841fda027b350b83032531
Author: Muhammet Kara 
AuthorDate: Mon Feb 24 17:03:12 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Mar 1 17:27:36 2020 +0100

lok: Set default text for new text box on mobile

Change-Id: I0b6056e9dbf5fb81d092092cc183b05120b95d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89352
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89710
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index e4a1ed418524..26ec246e19b3 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -309,6 +309,7 @@
 #define STR_PRESOBJ_TITLE_MOBILE
NC_("STR_PRESOBJ_TITLE_MOBILE", "Double-tap to add Title" )
 #define STR_PRESOBJ_OUTLINE_MOBILE  
NC_("STR_PRESOBJ_OUTLINE_MOBILE", "Double-tap to add Text" )
 #define STR_PRESOBJ_TEXT_MOBILE 
NC_("STR_PRESOBJ_TEXT_MOBILE", "Double-tap to add Text" )
+#define STR_PRESOBJ_TEXT_EDIT_MOBILE
NC_("STR_PRESOBJ_TEXT_MOBILE", "Tap to edit text" )
 #define STR_PRESOBJ_NOTESTEXT_MOBILE
NC_("STR_PRESOBJ_NOTESTEXT_MOBILE", "Double-tap to add Notes" )
 #define STR_PRESOBJ_GRAPHIC 
NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" )
 #define STR_PRESOBJ_OBJECT  
NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" )
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index f26d25504722..a6b7677debae 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -523,6 +524,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* 
pTxtObj)
 pTxtObj->AdjustTextFrameWidthAndHeight();
 
aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
 pTxtObj->SetMergedItemSet(aSet);
+if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+pTxtObj->SetText(SdResId(STR_PRESOBJ_TEXT_EDIT_MOBILE));
 }
 else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Muhammet Kara (via logerrit)]

 sc/source/ui/drawfunc/fuins2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 995e56127a789a8519c02a32ad9d032121c2bbe9
Author: Muhammet Kara 
AuthorDate: Mon Jan 13 23:42:54 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Mar 1 12:02:39 2020 +0100

lok: Unlock chart contollers after insertion on mobile view

The chart controllers were locked until the dialog finishes
its execution, but at some point, dialog is disabled for mobile
view, and seems like it was forgotten to unlock the controllers.

Change-Id: Ib1e5799f5c84ef8b3ebc0f538909b4f8b586ff1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86716
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89708
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 6606f47f5fac..80753e59c3cd 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -715,6 +715,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, 
vcl::Window* pWin, ScDrawV
 }
 }
 }
+else if( xChartModel.is() )
+xChartModel->unlockControllers();
 
 if ( bAddUndo )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 78b27dfa7022001de407b23002b202d01d219e1f
Author: Muhammet Kara 
AuthorDate: Mon Feb 24 16:04:37 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Mar 1 10:29:57 2020 +0100

lok: Create Text boxes directly

Change-Id: I281d4648d0e91f74d6f0f5880945d8e7e8659efe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89344
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89709
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 16f18e3434d9..31ca77f7d7bb 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3640,6 +3640,10 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 ExecuteOrientationChange();
 return;
 }
+else if (gImpl && aCommand == ".uno:Text")
+{
+aCommand = ".uno:Text?CreateDirectly:bool=true";
+}
 
 // handle potential interaction
 if (gImpl && aCommand == ".uno:Save")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Muhammet Kara (via logerrit)]

 sc/source/ui/view/tabvwshe.cxx |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit f92bb02f19aeae7b84a55f2c7455248304becb85
Author: Muhammet Kara 
AuthorDate: Thu Dec 19 11:35:13 2019 +0300
Commit: Muhammet Kara 
CommitDate: Sun Mar 1 01:42:37 2020 +0100

lok: Improve hyperlink insertion to cell with content

Change-Id: I520939dd5b44236cf835108ee2bc96c29f0a9677
Reviewed-on: https://gerrit.libreoffice.org/85509
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89707
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index fece06e7d8ec..d3fa448a6538 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 
 #include 
@@ -172,7 +173,11 @@ void ScTabViewShell::InsertURLField( const OUString& 
rName, const OUString& rURL
 ScInputHandler* pHdl= pScMod->GetInputHdl( 
rViewData.GetViewShell() );
 
 bool bSelectFirst = false;
-if ( !pScMod->IsEditMode() )
+bool bIsEditMode = pScMod->IsEditMode();
+int nSelInd = 1;
+OUString sSeltext(GetSelectionText());
+
+if ( !bIsEditMode )
 {
 if ( !SelectionEditable() )
 {
@@ -189,12 +194,24 @@ void ScTabViewShell::InsertURLField( const OUString& 
rName, const OUString& rURL
 EditView*   pTableView  = pHdl->GetTableView();
 OSL_ENSURE( pTopView || pTableView, "No EditView" );
 
+// Check if user selected a whole cell by single click,
+// cell has content, and user didn't change the name/text
+// of the link something different than the content via the hyperlink 
dialog.
+// If true, assign the given hyperlink to the whole content
+// instead of inserting a duplicate, or appending the url.
+if (comphelper::LibreOfficeKit::isActive() && !bIsEditMode && !bSelectFirst
+&& pTableView && !sSeltext.isEmpty() && sSeltext == rName)
+{
+nSelInd = sSeltext.getLength();
+bSelectFirst = true;
+}
+
 if ( bSelectFirst )
 {
 if ( pTopView )
 pTopView->SetSelection( ESelection(0,0,0,1) );
 if ( pTableView )
-pTableView->SetSelection( ESelection(0,0,0,1) );
+pTableView->SetSelection( ESelection(0,0,0,nSelInd) );
 }
 
 pHdl->DataChanging();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

[Muhammet Kara (via logerrit)]

 editeng/source/editeng/impedit.cxx |   41 +++--
 1 file changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 7ce29004934ae7b75dce492bde5602358eb3dc5f
Author: Muhammet Kara 
AuthorDate: Thu Dec 19 08:32:57 2019 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 29 17:22:07 2020 +0100

lok: Resolves: Calc - selecting a hyperlink doesn't show link in dialog

Change-Id: Ic4264fad8035029ba6593c91fa57efa772d394ca
Reviewed-on: https://gerrit.libreoffice.org/85468
Reviewed-by: Michael Meeks 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89705
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 842119a5b4ae..53900c16aa76 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -869,6 +869,23 @@ void ImpEditView::CalcAnchorPoint()
 }
 }
 
+namespace
+{
+
+// Build JSON message to be sent to Online
+OString buildHyperlinkJSON(const OUString& sText, const OUString& sLink)
+{
+boost::property_tree::ptree aTree;
+aTree.put("text", sText);
+aTree.put("link", sLink);
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree, false);
+
+return OString(aStream.str().c_str()).trim();
+}
+
+} // End of anon namespace
+
 void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
 {
 // No ShowCursor in an empty View ...
@@ -,12 +1128,24 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 {
 if (auto pUrlField = dynamic_cast(pFld->GetField()))
 {
-boost::property_tree::ptree aTree;
-aTree.put("text", pUrlField->GetRepresentation());
-aTree.put("link", pUrlField->GetURL());
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aTree, 
false);
-sHyperlink = OString(aStream.str().c_str()).trim();
+sHyperlink = 
buildHyperlinkJSON(pUrlField->GetRepresentation(), pUrlField->GetURL());
+}
+}
+else if (GetEditSelection().HasRange())
+{
+EditView* pActiveView = GetEditViewPtr();
+
+if (pActiveView)
+{
+const SvxFieldItem* pFieldItem = 
pActiveView->GetFieldAtSelection();
+if (pFieldItem)
+{
+const SvxFieldData* pField = 
pFieldItem->GetField();
+if ( auto pUrlField = dynamic_cast( pField) )
+{
+sHyperlink = 
buildHyperlinkJSON(pUrlField->GetRepresentation(), pUrlField->GetURL());
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Muhammet Kara (via logerrit)]

 sw/source/core/crsr/viscrs.cxx |   44 +++--
 1 file changed, 38 insertions(+), 6 deletions(-)

New commits:
commit 150ca03b82393c8c9704885b56c2752b77bbb559
Author: Muhammet Kara 
AuthorDate: Wed Dec 18 02:11:23 2019 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 29 02:23:22 2020 +0100

lok: Resolves: Writer - selecting a hyperlink doesn't show link in dialog

Repro: Select text in Online, and Ctrl + K to open Hyperlink dialog,
then assign a hyperlink and close with Ok. Without removing/changing
the selection, re-open the hyperlink dialog again by Ctrl + K. You see
that the hyperlink is not recognized.

Why?
The dialog relies on the hyperlinkUnderCursor property which is
set by the SfxLokHelper::notifyVisCursorInvalidation() method, which
also relies on the current char cursor is on. So when you select a 
hyperlinked
text from left to right (in English), the final position of the cursor is 
outside
the hyperlinked text, thus the hyperlinkUnderCursor property is unset.

Solution
Check for presence of selection and hyperlink via SfxItemPool and
proceed accordingly

Change-Id: I3a7f18c8199cec243ac99f011d9aaee7c7c575b8
Reviewed-on: https://gerrit.libreoffice.org/85348
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Muhammet Kara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89704
Tested-by: Jenkins

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 400b79c869e1..bf764a12db94 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -54,6 +54,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -108,6 +109,23 @@ void SwVisibleCursor::Hide()
 }
 }
 
+namespace
+{
+
+// Build JSON message to be sent to Online
+OString buildHyperlinkJSON(const OUString& sText, const OUString& sLink)
+{
+boost::property_tree::ptree aTree;
+aTree.put("text", sText);
+aTree.put("link", sLink);
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree, false);
+
+return OString(aStream.str().c_str()).trim();
+}
+
+}
+
 void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell)
 {
 SwRect aRect;
@@ -241,15 +259,29 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * 
pViewShell)
 
 OString sHyperlink;
 SwContentAtPos aContentAtPos(IsAttrAtPos::InetAttr);
+bool bIsSelection = m_pCursorShell->IsSelection();
+
 if 
(const_cast(m_pCursorShell)->GetContentAtPos(aRect.Pos(), 
aContentAtPos))
 {
 const SwFormatINetFormat* pItem = static_cast(aContentAtPos.aFnd.pAttr);
-boost::property_tree::ptree aTree;
-aTree.put("text", aContentAtPos.sStr);
-aTree.put("link", pItem->GetValue());
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aTree, false);
-sHyperlink = OString(aStream.str().c_str()).trim();
+sHyperlink = buildHyperlinkJSON(aContentAtPos.sStr, 
pItem->GetValue());
+}
+else if (bIsSelection)
+{
+SwWrtShell* pShell = 
m_pCursorShell->GetDoc()->GetDocShell()->GetWrtShell();
+
+if (pShell)
+{
+SfxItemSet aSet(m_pCursorShell->GetSfxViewShell()->GetPool(),
+svl::Items{});
+pShell->GetCurAttr(aSet);
+if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT 
))
+{
+sHyperlink = 
buildHyperlinkJSON(m_pCursorShell->GetSelText(),
+
aSet.GetItem(RES_TXTATR_INETFMT)->GetValue());
+}
+}
 }
 
 if (pViewShell)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 100 paper cuts LibreOffice GSOC inquiry

[Muhammet Kara]

Hi Adly,

You can start by following the steps described here: 
https://wiki.documentfoundation.org/Development/GetInvolved


As you will also see on the page linked above, we have a number of 
easyHacks (bug reports suitable for new developers). Starting by solving 
a number of 'Beginner' easyHacks, and then switching to 'Interesting' 
easyHacks seems like a proper course to follow.


For GSoC applications, you are required to solve at least one 
'Interesting' easyHack. (Preferrably an easyHack related to your GSoC 
proposal.)


List of Easy Hacks by required Skill:
https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill

The GSoC Ideas page:
https://wiki.documentfoundation.org/Development/GSoC/Ideas

And about the 2 ideas you are interested in: I would classify these 
ideas as of moderate hardness. As you go through the 'build LibreOffice 
& solve easyHacks' path, you will hopefully have a better understanding 
of the code-base, and the required level of knowledge/skill.


Welcome aboard, and may it be easy! :)

Best,
Muhammet

On 2/22/20 6:19 PM, Adly Ezat wrote:

Dear Mr. Muhammet

Greetings!

I am Adly a Senior undergraduate @ AOU university in his last year

I was looking at some of LibreOffice GSOC proposal ideas mainly chart 
wizard and 100 paper cuts


i would like to start considering these project as proposals
however i would like to know the level of c++ required .
i have read c++ before however i mostly programmed in java,C#,VB 
,python and t-sql

also any guides or pointers that you can share to get me started?

thanks & best regards,
Adly



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/inc sd/source

[Muhammet Kara (via logerrit)]

 sd/inc/strings.hrc   |1 +
 sd/source/ui/func/futext.cxx |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 71a17533e5d892bd15353d0e367a659df8912786
Author: Muhammet Kara 
AuthorDate: Mon Feb 24 17:03:12 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Feb 24 17:22:42 2020 +0100

lok: Set default text for new text box on mobile

Change-Id: I0b6056e9dbf5fb81d092092cc183b05120b95d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89352
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins CollaboraOffice 

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 1ee48b01f221..94b9ac88b54f 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -310,6 +310,7 @@
 #define STR_PRESOBJ_TITLE_MOBILE
NC_("STR_PRESOBJ_TITLE_MOBILE", "Double-tap to add Title" )
 #define STR_PRESOBJ_OUTLINE_MOBILE  
NC_("STR_PRESOBJ_OUTLINE_MOBILE", "Double-tap to add Text" )
 #define STR_PRESOBJ_TEXT_MOBILE 
NC_("STR_PRESOBJ_TEXT_MOBILE", "Double-tap to add Text" )
+#define STR_PRESOBJ_TEXT_EDIT_MOBILE
NC_("STR_PRESOBJ_TEXT_MOBILE", "Tap to edit text" )
 #define STR_PRESOBJ_NOTESTEXT_MOBILE
NC_("STR_PRESOBJ_NOTESTEXT_MOBILE", "Double-tap to add Notes" )
 #define STR_PRESOBJ_GRAPHIC 
NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" )
 #define STR_PRESOBJ_OBJECT  
NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" )
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 7acef29be39a..b8beb4e50408 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -507,6 +508,8 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* 
pTxtObj)
 pTxtObj->AdjustTextFrameWidthAndHeight();
 
aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
 pTxtObj->SetMergedItemSet(aSet);
+if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+pTxtObj->SetText(SdResId(STR_PRESOBJ_TEXT_EDIT_MOBILE));
 }
 else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
 {
___
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' - desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/lib/init.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2b6f2fe5ba4d85310ce76f7f783889c566a8d299
Author: Muhammet Kara 
AuthorDate: Mon Feb 24 16:04:37 2020 +0300
Commit: Muhammet Kara 
CommitDate: Mon Feb 24 17:22:23 2020 +0100

lok: Create Text boxes directly

Change-Id: I281d4648d0e91f74d6f0f5880945d8e7e8659efe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89344
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 40abb74cd060..d64e827e006a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3639,6 +3639,10 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 ExecuteOrientationChange();
 return;
 }
+else if (gImpl && aCommand == ".uno:Text")
+{
+aCommand = ".uno:Text?CreateDirectly:bool=true";
+}
 
 // handle potential interaction
 if (gImpl && aCommand == ".uno:Save")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: testtools/source

[Muhammet Kara (via logerrit)]

 testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ce6434c44a9f820275908ff0ee4166427f481d6d
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 20:53:15 2020 +0300
Commit: Noel Grandin 
CommitDate: Mon Feb 17 15:36:04 2020 +0100

Remove never-executed else-block

And the always-tru if-check

Change-Id: I674d65506e1791fadab7d2871010528fd5dd94d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88816
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx 
b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
index abb082e3fd24..5deddf4005fb 100644
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
@@ -112,15 +112,11 @@ public __gc class BridgeTest : public WeakBase, public 
XMain
 Any a2 = (Any) val2;
 ret = a1.Type == a2.Type && compareData(a1.Value, a2.Value);
 }
-else if (t1->IsValueType)
+else
 {
 //Any, enum, int, bool char, float, double etc.
 ret = val1->Equals(val2);
 }
-else
-{
-Debug::Assert(false);
-}
 return ret;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Muhammet Kara (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 11345d8b7e3e1c6bbe940c08cc284e257e0811d0
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 18:52:52 2020 +0300
Commit: Noel Grandin 
CommitDate: Mon Feb 17 15:36:26 2020 +0100

Prefer prefix ++ operator for non-primitive type SwNodeIndex

Change-Id: I8863084065cd4ec3f1735a9469f6e28cd525abce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88810
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3e7964b8f957..5fe8e2f41088 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -344,7 +344,7 @@ static void 
checkAndWriteFloatingTables(DocxAttributeOutput& rDocxAttributeOutpu
 SwNodeIndex aStartNode = *pStartNode;
 
 // go to the next node (actual content)
-aStartNode++;
+++aStartNode;
 
 // this has to be a table
 if (!aStartNode.GetNode().IsTableNode())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: onlineupdate/source

[Muhammet Kara (via logerrit)]

 onlineupdate/source/update/updater/updater.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1bc6f5868fd5e780e70f999144432f30d8f64149
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 21:12:10 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 22:32:47 2020 +0100

Proper error check for fwrite in updater.cxx

A less-than-zero check for an unsigned value of type size_t
doesn't make sense, and:

If the return value of fwrite differs from the count parameter,
it means that a writing error prevented the function from completing.
In this case, the error indicator (ferror) will be set for the stream.

Change-Id: I344e608b2bc03a4a117fc5cca1acb8e26eda247a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88817
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 006e2ffe5a94..54750afb4218 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -731,8 +731,9 @@ static int ensure_copy(const NS_tchar *path, const NS_tchar 
*dest)
 
 while (written < read)
 {
-size_t chunkWritten = fwrite(buffer, 1, read - written, outfile);
-if (chunkWritten <= 0)
+size_t nCount = read - written;
+size_t chunkWritten = fwrite(buffer, 1, nCount, outfile);
+if (chunkWritten != nCount)
 {
 LOG(("ensure_copy: failed to write the file: " LOG_S ", err: 
%d",
  dest, errno));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[Muhammet Kara (via logerrit)]

 desktop/source/app/updater.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 830e21451f53e3e4405d44909f9fc640bf011781
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 18:34:48 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 18:41:39 2020 +0100

Remove useless access modifier from the Updater class

Change-Id: I1353634e9e5e65dd080daf7304d5e8a16bc77e4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88808
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/desktop/source/app/updater.hxx b/desktop/source/app/updater.hxx
index 3bda24b02b6c..d0a55df6bf1f 100644
--- a/desktop/source/app/updater.hxx
+++ b/desktop/source/app/updater.hxx
@@ -18,7 +18,6 @@ void update_checker();
 
 class Updater
 {
-private:
 public:
 static OUString getUpdateInfoLog();
 static OUString getPatchDirURL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source

[Muhammet Kara (via logerrit)]

 extras/source/autocorr/lang/tr/DocumentList.xml |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 7e3882e5b2fa83bfd7c8569c2b68dafe66db734b
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 16:35:42 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 15:35:52 2020 +0100

[tr] Add new autocorrect words

Change-Id: I1a45fbfad2fb8eee6f29e895beea4e508f65febe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88781
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/extras/source/autocorr/lang/tr/DocumentList.xml 
b/extras/source/autocorr/lang/tr/DocumentList.xml
index 13447e2c47b0..cfd818caeb7c 100644
--- a/extras/source/autocorr/lang/tr/DocumentList.xml
+++ b/extras/source/autocorr/lang/tr/DocumentList.xml
@@ -4,14 +4,32 @@
   
   
   
+  
+  
   
   
   
   
+  
+  
+  
+  
+  
+  
   
   
+  
+  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/inc sfx2/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 sfx2/inc/arrdecl.hxx|2 +-
 sfx2/inc/sfxbasecontroller_internal.hxx |1 -
 sfx2/source/doc/objstor.hxx |2 +-
 sfx2/source/doc/syspath.hxx |2 +-
 sfx2/source/doc/syspathw32.hxx  |2 +-
 sfx2/source/inc/itemdel.hxx |2 +-
 sfx2/source/inc/preview.hxx |3 ++-
 sfx2/source/inc/sfxpicklist.hxx |3 ++-
 sfx2/source/notebookbar/DropdownBox.hxx |2 +-
 sfx2/source/styles/StyleManager.cxx |1 -
 solenv/clang-format/blacklist   |   10 --
 11 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit 5c30117af73db865da11876c53de60bd613b2973
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 15:41:27 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 15:14:16 2020 +0100

clang-format sfx2 with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I6b2e99a6485031e33c781be896e9426fffd08edf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88779
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 67387e0f071e..b777fad7aa48 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -23,7 +23,7 @@
 #include 
 
 class SfxFilter;
-typedef ::std::vector< std::shared_ptr > SfxFilterList_Impl;
+typedef ::std::vector> SfxFilterList_Impl;
 
 #endif
 
diff --git a/sfx2/inc/sfxbasecontroller_internal.hxx 
b/sfx2/inc/sfxbasecontroller_internal.hxx
index 2f593414154d..0de26d5e98ad 100644
--- a/sfx2/inc/sfxbasecontroller_internal.hxx
+++ b/sfx2/inc/sfxbasecontroller_internal.hxx
@@ -14,7 +14,6 @@
 
 extern sal_uInt32 Get10ThSec();
 
-
 #endif // INCLUDED_SFX2_INC_SFXBASECONTROLLER_INTERNAL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/objstor.hxx b/sfx2/source/doc/objstor.hxx
index d4b8683682ef..4692dbf71f7a 100644
--- a/sfx2/source/doc/objstor.hxx
+++ b/sfx2/source/doc/objstor.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel 
>& xModel);
+void impl_addToModelCollection(const css::uno::Reference& 
xModel);
 
 #endif // INCLUDED_SFX2_SOURCE_DOC_OBJSTOR_HXX
 
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index 7837b03e20b0..9c135993cb63 100644
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
@@ -24,7 +24,7 @@
 
 namespace SystemPath
 {
-bool GetUserTemplateLocation(sal_Unicode*, int nSize);
+bool GetUserTemplateLocation(sal_Unicode*, int nSize);
 };
 
 #endif
diff --git a/sfx2/source/doc/syspathw32.hxx b/sfx2/source/doc/syspathw32.hxx
index 5707a80cec00..7a06950c5f01 100644
--- a/sfx2/source/doc/syspathw32.hxx
+++ b/sfx2/source/doc/syspathw32.hxx
@@ -25,7 +25,7 @@
 #include 
 
 #if defined _WIN32
-bool GetUserTemplateLocation(sal_Unicode *, int nSize);
+bool GetUserTemplateLocation(sal_Unicode*, int nSize);
 #endif
 
 #endif
diff --git a/sfx2/source/inc/itemdel.hxx b/sfx2/source/inc/itemdel.hxx
index 1884c83c38cc..b8ea325010e4 100644
--- a/sfx2/source/inc/itemdel.hxx
+++ b/sfx2/source/inc/itemdel.hxx
@@ -23,7 +23,7 @@
 
 class SfxPoolItem;
 
-void DeleteItemOnIdle( std::unique_ptr pItem );
+void DeleteItemOnIdle(std::unique_ptr pItem);
 
 #endif
 
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index 89dfa55b0e73..b3065831982b 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -29,9 +29,10 @@ class SfxPreviewWin_Impl : public 
weld::CustomWidgetController
 private:
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&) override;
 std::shared_ptr xMetaFile;
+
 public:
 SfxPreviewWin_Impl();
-voidSetObjectShell( SfxObjectShell const * pObj );
+void SetObjectShell(SfxObjectShell const* pObj);
 static void ImpPaint(vcl::RenderContext& rRenderContext, GDIMetaFile* 
pFile);
 };
 
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 6a6e818a613b..b8af2310d467 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-#define PICKLIST_MAXSIZE  100
+#define PICKLIST_MAXSIZE 100
 
 class SfxApplication;
 class SfxPickListImpl;
@@ -31,6 +31,7 @@ class SfxPickList
 {
 private:
 std::unique_ptr mxImpl;
+
 public:
 SfxPickList(SfxApplication& rApp);
 ~SfxPickList();
diff --git a/sfx2/source/notebookbar/DropdownBox.hxx 
b/sfx2/source/notebookbar/DropdownBox.hxx
index d66d798d8d14..769cd2e42fae 100644
--- a/sfx2/source/notebookbar/DropdownBox.hxx
+++ b/sfx2/source/notebookbar/DropdownBox.hxx
@@ -32,7

[Libreoffice-commits] core.git: filter/qa forms/source formula/inc formula/qa fpicker/qa fpicker/source framework/source hwpfilter/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 filter/qa/unit/filter-dialogs-test.cxx |4 +---
 forms/source/xforms/boolexpression.hxx |3 +--
 formula/inc/core_resource.hxx  |2 +-
 formula/qa/unit/formula-dialogs-test.cxx   |4 +---
 fpicker/qa/unit/fpicker-dialogs-test.cxx   |4 +---
 fpicker/source/aqua/AquaFilePickerDelegate.hxx |4 ++--
 fpicker/source/aqua/NSURL_OOoAdditions.hxx |4 ++--
 fpicker/source/aqua/SalAquaConstants.h |3 ++-
 framework/source/accelerators/acceleratorcache.cxx |6 ++
 hwpfilter/source/fontmap.hxx   |2 +-
 hwpfilter/source/grammar.hxx   |2 +-
 hwpfilter/source/hwpeq.h   |2 +-
 hwpfilter/source/lexer.hxx |2 +-
 solenv/clang-format/blacklist  |   13 -
 14 files changed, 17 insertions(+), 38 deletions(-)

New commits:
commit c691aed63451ba441d45d2feb90f7266e12366f4
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 14:44:52 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 14:10:39 2020 +0100

clang-format f*,h* with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I702c09bcd3a9a113b3d66c30edb6cf3b7e6a6593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88776
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/filter/qa/unit/filter-dialogs-test.cxx 
b/filter/qa/unit/filter-dialogs-test.cxx
index 5bddb6ccefe0..d74f1dadc0ee 100644
--- a/filter/qa/unit/filter-dialogs-test.cxx
+++ b/filter/qa/unit/filter-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-FilterDialogsTest::FilterDialogsTest()
-{
-}
+FilterDialogsTest::FilterDialogsTest() {}
 
 void FilterDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/forms/source/xforms/boolexpression.hxx 
b/forms/source/xforms/boolexpression.hxx
index cd5daa071cb9..ae3a0c120d77 100644
--- a/forms/source/xforms/boolexpression.hxx
+++ b/forms/source/xforms/boolexpression.hxx
@@ -24,7 +24,6 @@
 
 namespace xforms
 {
-
 /** BoolExpression represents a computed XPath expression that returns
  * a bool value and caches the results.
  *
@@ -38,7 +37,7 @@ public:
 
 /// set the expression string
 /// (overridden for new definition of a simple expression)
-void setExpression( const OUString& rExpression );
+void setExpression(const OUString& rExpression);
 };
 
 } // namespace xforms
diff --git a/formula/inc/core_resource.hxx b/formula/inc/core_resource.hxx
index 8a8f49b77b0f..a1533f1b5186 100644
--- a/formula/inc/core_resource.hxx
+++ b/formula/inc/core_resource.hxx
@@ -22,6 +22,6 @@
 #include 
 #include 
 
-FORMULA_DLLPUBLIC OUString ForResId(const char *pId);
+FORMULA_DLLPUBLIC OUString ForResId(const char* pId);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/qa/unit/formula-dialogs-test.cxx 
b/formula/qa/unit/formula-dialogs-test.cxx
index 29262e53dac5..8f1f7e334a75 100644
--- a/formula/qa/unit/formula-dialogs-test.cxx
+++ b/formula/qa/unit/formula-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-FormulaDialogsTest::FormulaDialogsTest()
-{
-}
+FormulaDialogsTest::FormulaDialogsTest() {}
 
 void FormulaDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/fpicker/qa/unit/fpicker-dialogs-test.cxx 
b/fpicker/qa/unit/fpicker-dialogs-test.cxx
index 7e83d2756674..8c8a78df00e5 100644
--- a/fpicker/qa/unit/fpicker-dialogs-test.cxx
+++ b/fpicker/qa/unit/fpicker-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-FpickerDialogsTest::FpickerDialogsTest()
-{
-}
+FpickerDialogsTest::FpickerDialogsTest() {}
 
 void FpickerDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx 
b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index 6ea35ec41d73..eb7e1ce402e6 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -37,9 +37,9 @@ class FilterHelper;
 
 - (void)setFilterHelper:(FilterHelper*)filterHelper;
 
-- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
+- (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename;
 - (void)panelSelectionDidChange:(id)sender;
-- (void)panel:(id)sender directoryDidChange:(NSString *)path;
+- (void)panel:(id)sender directoryDidChange:(NSString*)path;
 
 - (void)filterSelectedAtIndex:(id)sender;
 - (void)autoextensionChanged:(id)sender;
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx 
b

[Libreoffice-commits] core.git: comphelper/qa cppcanvas/qa dbaccess/qa dbaccess/source desktop/qa desktop/source desktop/unx embeddedobj/source emfio/qa extensions/source extensions/test external/blue

[Muhammet Kara (via logerrit)]

 comphelper/qa/unit/threadpooltest.cxx|4 +-
 cppcanvas/qa/extras/emfplus/emfplus.cxx  |6 ++--
 dbaccess/qa/unit/dbaccess-dialogs-test.cxx   |4 --
 dbaccess/source/filter/xml/xmlservices.hxx   |1 
 dbaccess/source/ui/control/undosqledit.cxx   |2 -
 dbaccess/source/ui/dlg/adodatalinks.hxx  |2 -
 dbaccess/source/ui/inc/uiservices.hxx|1 
 desktop/qa/unit/desktop-dialogs-test.cxx |4 --
 desktop/source/app/updater.hxx   |2 -
 desktop/unx/source/pagein.h  |2 -
 embeddedobj/source/msole/olewrapclient.hxx   |4 +-
 embeddedobj/source/msole/platform.h  |2 -
 emfio/qa/cppunit/wmf/wmfimporttest.cxx   |   25 +-
 extensions/source/abpilot/moduleabp.cxx  |1 
 extensions/source/dbpilots/dbpservices.hxx   |1 
 extensions/source/dbpilots/moduledbp.cxx |1 
 extensions/source/ole/ole2uno.hxx|5 +--
 extensions/source/propctrlr/pcrservices.hxx  |1 
 extensions/source/scanner/grid.hxx   |4 +-
 extensions/source/scanner/scanwin.cxx|8 ++---
 extensions/test/ole/MfcControl/StdAfx.h  |2 -
 extensions/test/ole/unoTocomCalls/Test/StdAfx.h  |3 --
 external/bluez_bluetooth/inc/bluetooth/l2cap.h   |6 ++--
 external/mariadb-connector-c/configs/mysql_version.h |1 
 external/neon/configs/config.h   |   26 ---
 solenv/clang-format/blacklist|   25 --
 26 files changed, 51 insertions(+), 92 deletions(-)

New commits:
commit f99e765cb303e37e6b6c983d3ee040fa36c1e52c
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 13:32:38 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 14:10:11 2020 +0100

clang-format c*,d*,e* with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: I06087a1385ca9da6a28d36ea4c0d2e40bdbf8f03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88774
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/comphelper/qa/unit/threadpooltest.cxx 
b/comphelper/qa/unit/threadpooltest.cxx
index 8148cce941e8..10fb90c3014f 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -26,8 +26,8 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-void ThreadPoolTest::testPreferredConcurrency() {
-
+void ThreadPoolTest::testPreferredConcurrency()
+{
 // Check default.
 auto nThreads = comphelper::ThreadPool::getPreferredConcurrency();
 sal_Int32 nExpected = 4; // UTs are capped to 4.
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx 
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index 13246ee24cec..9b477e8bbe3a 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -24,14 +24,16 @@ using namespace com::sun::star;
 class Test : public UnoApiTest
 {
 public:
-Test() : UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
+Test()
+: UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
 {
 }
 
 virtual void setUp() override
 {
 UnoApiTest::setUp();
-
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+mxDesktop.set(
+
frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
 SfxApplication::GetOrCreate();
 };
 
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx 
b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index e5a463b9ab78..e1156b0edf4d 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
@@ -39,9 +39,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-DbaccessDialogsTest::DbaccessDialogsTest()
-{
-}
+DbaccessDialogsTest::DbaccessDialogsTest() {}
 
 void DbaccessDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/dbaccess/source/filter/xml/xmlservices.hxx 
b/dbaccess/source/filter/xml/xmlservices.hxx
index 66c8aa53cc74..429ac4c20224 100644
--- a/dbaccess/source/filter/xml/xmlservices.hxx
+++ b/dbaccess/source/filter/xml/xmlservices.hxx
@@ -32,7 +32,6 @@ void createRegistryInfo_ODBFilter();
 void createRegistryInfo_ODBFilterExport();
 void createRegistryInfo_OFullExport();
 void createRegistryInfo_OSettingsExport();
-
 }
 
 #endif
diff --git a/dbaccess/source/ui/control/undosqledit.cxx 
b/dbaccess/source/ui/control/undosqledit.cxx
index c44fb78d8c4d..d32774292a98 100644
--- a/db

[Libreoffice-commits] core.git: chart2/qa chart2/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 chart2/qa/unit/chart2-dialogs-test.cxx|4 +---
 chart2/source/controller/dialogs/TextDirectionListBox.cxx |1 -
 chart2/source/controller/inc/dlg_InsertDataLabel.hxx  |3 ++-
 chart2/source/controller/inc/dlg_InsertTitle.hxx  |4 ++--
 chart2/source/controller/inc/dlg_ShapeFont.hxx|4 ++--
 chart2/source/controller/inc/dlg_ShapeParagraph.hxx   |2 +-
 chart2/source/inc/AxisIndexDefines.hxx|1 -
 chart2/source/inc/MutexContainer.hxx  |1 -
 chart2/source/inc/StackMode.hxx   |1 -
 chart2/source/inc/TrueGuard.hxx   |3 +--
 chart2/source/inc/servicenames.hxx|1 -
 solenv/clang-format/blacklist |   11 ---
 12 files changed, 9 insertions(+), 27 deletions(-)

New commits:
commit 1ec5204eb5f0afd29f487205f8e3f1ea9d626059
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 10:40:22 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 11:05:14 2020 +0100

clang-format chart2 with under 5-percent lines of change

Change-Id: Ia60d23c7a75086c2a68e0e295b99a3df3dfd164f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88771
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx 
b/chart2/qa/unit/chart2-dialogs-test.cxx
index ef99582eb517..c37fb1e1bbe2 100644
--- a/chart2/qa/unit/chart2-dialogs-test.cxx
+++ b/chart2/qa/unit/chart2-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-Chart2DialogsTest::Chart2DialogsTest()
-{
-}
+Chart2DialogsTest::Chart2DialogsTest() {}
 
 void Chart2DialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx 
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 611251df8451..68181fdfc726 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -23,7 +23,6 @@
 
 namespace chart
 {
-
 TextDirectionListBox::TextDirectionListBox(std::unique_ptr 
pControl)
 : svx::FrameDirectionListBox(std::move(pControl))
 {
diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx 
b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
index a16815b7a379..c39d608d1e8a 100644
--- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
+++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx
@@ -35,7 +35,8 @@ private:
 std::unique_ptr m_apDataLabelResources;
 
 public:
-DataLabelsDialog(weld::Window* pParent, const SfxItemSet& rInAttrs, 
SvNumberFormatter* pFormatter);
+DataLabelsDialog(weld::Window* pParent, const SfxItemSet& rInAttrs,
+ SvNumberFormatter* pFormatter);
 virtual ~DataLabelsDialog() override;
 
 void FillItemSet(SfxItemSet& rOutAttrs);
diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx 
b/chart2/source/controller/inc/dlg_InsertTitle.hxx
index c09c1becf709..7eea6f2bbc86 100644
--- a/chart2/source/controller/inc/dlg_InsertTitle.hxx
+++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx
@@ -28,12 +28,12 @@ namespace chart
 class SchTitleDlg : public weld::GenericDialogController
 {
 private:
-std::unique_ptr  m_xTitleResources;
+std::unique_ptr m_xTitleResources;
 
 public:
 SchTitleDlg(weld::Window* pParent, const TitleDialogData& rInput);
 
-void getResult( TitleDialogData& rOutput );
+void getResult(TitleDialogData& rOutput);
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx 
b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index 21abdcd17dea..5429b8449dd7 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -23,7 +23,6 @@
 
 namespace chart
 {
-
 class ViewElementListProvider;
 
 /** dialog for font properties of shapes
@@ -32,7 +31,8 @@ class ShapeFontDialog : public SfxTabDialogController
 {
 public:
 ShapeFontDialog(weld::Window* pParent, const SfxItemSet* pAttr,
-const ViewElementListProvider* pViewElementListProvider);
+const ViewElementListProvider* pViewElementListProvider);
+
 private:
 virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx 
b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index 14fbf5f0cc8c..6e214dfbc91a 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -23,13 +23,13 @@
 
 namespace chart
 {
-
 /** dialog for paragraph properties of shapes
  */
 class ShapeParagraphDialog : public SfxTabDialogController
 {
 public:
 ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr);
+
 private:
 virtual void PageCreated(const OString& rI

[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/qa basctl/source basic/source solenv/clang-format

[Muhammet Kara (via logerrit)]

 accessibility/inc/helper/accresmgr.hxx|1 -
 accessibility/source/inc/floatingwindowaccessible.hxx |2 +-
 basctl/qa/unit/basctl-dialogs-test.cxx|4 +---
 basctl/source/basicide/breakpoint.hxx |7 +++
 basic/source/classes/sbintern.cxx |6 +++---
 basic/source/inc/eventatt.hxx |2 +-
 basic/source/inc/sbxmod.hxx   |2 +-
 solenv/clang-format/blacklist |7 ---
 8 files changed, 10 insertions(+), 21 deletions(-)

New commits:
commit a8487acabd5d3896e3b5ae6a0afd9da500f35edb
Author: Muhammet Kara 
AuthorDate: Sun Feb 16 10:27:48 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sun Feb 16 11:04:43 2020 +0100

clang-format accessibility & basctl with under 5-percent lines of change

Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i 

There will be follow-up patches to fix all 'under-5-percent' files.

Change-Id: Idc890cac4bb6aed4e36c3556a2abc0744fd086df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88770
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/accessibility/inc/helper/accresmgr.hxx 
b/accessibility/inc/helper/accresmgr.hxx
index e60caddfc5a7..5b16c47e8166 100644
--- a/accessibility/inc/helper/accresmgr.hxx
+++ b/accessibility/inc/helper/accresmgr.hxx
@@ -23,5 +23,4 @@
 
 OUString AccResId(const char* pId);
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx 
b/accessibility/source/inc/floatingwindowaccessible.hxx
index 1a7cb4008458..c36e862360c7 100644
--- a/accessibility/source/inc/floatingwindowaccessible.hxx
+++ b/accessibility/source/inc/floatingwindowaccessible.hxx
@@ -26,7 +26,7 @@ class FloatingWindowAccessible final : public 
VCLXAccessibleComponent
 public:
 using VCLXAccessibleComponent::VCLXAccessibleComponent;
 
-virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& 
rRelationSet ) override;
+virtual void FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& 
rRelationSet) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx 
b/basctl/qa/unit/basctl-dialogs-test.cxx
index a719e5c1ae22..b907681f629d 100644
--- a/basctl/qa/unit/basctl-dialogs-test.cxx
+++ b/basctl/qa/unit/basctl-dialogs-test.cxx
@@ -36,9 +36,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-BasctlDialogsTest::BasctlDialogsTest()
-{
-}
+BasctlDialogsTest::BasctlDialogsTest() {}
 
 void BasctlDialogsTest::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
diff --git a/basctl/source/basicide/breakpoint.hxx 
b/basctl/source/basicide/breakpoint.hxx
index 4b5ab232535e..324564aaa72e 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -28,7 +28,6 @@ class SbModule;
 
 namespace basctl
 {
-
 struct BreakPoint
 {
 bool bEnabled;
@@ -48,19 +47,19 @@ struct BreakPoint
 class BreakPointList
 {
 private:
-BreakPointList& operator =(BreakPointList const &) = delete;
+BreakPointList& operator=(BreakPointList const&) = delete;
 std::vector maBreakPoints;
 
 public:
 BreakPointList();
 
-BreakPointList(BreakPointList const & rList);
+BreakPointList(BreakPointList const& rList);
 
 ~BreakPointList();
 
 void reset();
 
-void transfer(BreakPointList & rList);
+void transfer(BreakPointList& rList);
 
 void InsertSorted(BreakPoint pBrk);
 BreakPoint* FindBreakPoint(sal_uInt16 nLine);
diff --git a/basic/source/classes/sbintern.cxx 
b/basic/source/classes/sbintern.cxx
index 77bfc64e030b..aaf26ee2a34c 100644
--- a/basic/source/classes/sbintern.cxx
+++ b/basic/source/classes/sbintern.cxx
@@ -25,7 +25,7 @@ SbiGlobals* SbiGlobals::pGlobals = nullptr;
 
 SbiGlobals* GetSbData()
 {
-if( !SbiGlobals::pGlobals )
+if (!SbiGlobals::pGlobals)
 SbiGlobals::pGlobals = new SbiGlobals;
 return SbiGlobals::pGlobals;
 }
@@ -33,13 +33,13 @@ SbiGlobals* GetSbData()
 SbiGlobals::SbiGlobals()
 {
 pInst = nullptr;
-pSbFac= nullptr;
+pSbFac = nullptr;
 pUnoFac = nullptr;
 pTypeFac = nullptr;
 pClassFac = nullptr;
 pOLEFac = nullptr;
 pFormFac = nullptr;
-pMod  = nullptr;
+pMod = nullptr;
 pCompMod = nullptr; // JSM
 nInst = 0;
 nCode = ERRCODE_NONE;
diff --git a/basic/source/inc/eventatt.hxx b/basic/source/inc/eventatt.hxx
index fbe0104db00f..b38c83c597ce 100644
--- a/basic/source/inc/eventatt.hxx
+++ b/basic/source/inc/eventatt.hxx
@@ -27,7 +27,7 @@ class SbxArray;
 // Instantiate "com.sun.star.awt.UnoControlDialog" on basis
 // of a DialogLibrary 

[Libreoffice-commits] core.git: sc/source

[Muhammet Kara (via logerrit)]

 sc/source/ui/view/tabvwsh2.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 75500a4161c86bba644d212f2f2eef78dfeb9dea
Author: Muhammet Kara 
AuthorDate: Wed Feb 12 05:49:11 2020 +0300
Commit: Andras Timar 
CommitDate: Fri Feb 14 16:12:13 2020 +0100

lok: Center shape on insert also for Desktop view

Change-Id: I85c3fe3d0166eb42f46f2aa65d0319e582b851af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88489
Reviewed-by: Muhammet Kara 
Reviewed-by: Andras Timar 
Tested-by: Jenkins

diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index da77a4278655..ea2fa4cdf34b 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -321,7 +320,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 
 // calc position and size
 bool bLOKIsActive = comphelper::LibreOfficeKit::isActive();
-bool bIsMobile = 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 Point aInsertPos;
 if(!bLOKIsActive)
 {
@@ -330,7 +328,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
-else if (bIsMobile)
+else
 {
 aInsertPos = GetViewData().getLOKVisibleArea().Center();
 
@@ -340,10 +338,6 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
 aInsertPos.AdjustX( -sal_Int32(nDefaultObjectSizeWidth / 2) );
 aInsertPos.AdjustY( -sal_Int32(nDefaultObjectSizeHeight / 2) );
 }
-else
-{
-aInsertPos = GetInsertPos();
-}
 
 tools::Rectangle aNewObjectRectangle(aInsertPos, 
Size(nDefaultObjectSizeWidth, nDefaultObjectSizeHeight));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits