[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af2d914921f655960801fb14f41fa9cdcdba54d0 Author: Miklos Vajna AuthorDate: Tue May 28 09:25:17 2019 +0200 Commit: Miklos Vajna CommitDate: Mon Jun 3 13:47:36 2019 +0200 [cp] sw HTML import: change config default to always ignore comments Change-Id: Iae6191fbcf1d02e9e5dd29613eaf5c36646afccc Reviewed-on: https://gerrit.libreoffice.org/73084 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 855bbe13cb07..63838504eebd 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -5857,7 +5857,7 @@ Specifies whether HTML comments should be ignored or imported as postits / annotations. Ignore HTML comments -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |2 +- sd/uiconfig/sdraw/toolbar/redactedexportbar.xml |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 39ea1a6997ba214602792b0fbcc25e1d97522f59 Author: Muhammet Kara AuthorDate: Tue Apr 16 17:43:22 2019 +0300 Commit: Andras Timar CommitDate: Thu Apr 18 22:50:19 2019 +0200 Switch redacted export options Bring White option to the first place, to save toner on print as users tend to click on the first option. Change-Id: Id63c4402f8dc07a83eef69c3dfde3dd086c899b8 Reviewed-on: https://gerrit.libreoffice.org/70831 Tested-by: Jenkins Reviewed-by: Muhammet Kara (cherry picked from commit d5b59b8d9d798b884dbcf0c97f403d739b01e1cc) Reviewed-on: https://gerrit.libreoffice.org/70868 Tested-by: Muhammet Kara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 260a20b4cd1e..fcf28c113ac0 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -611,7 +611,7 @@ com.sun.star.comp.framework.SubToolBarController - redactedexportbar;.uno:RedactedExportBlack + redactedexportbar;.uno:RedactedExportWhite diff --git a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml index 727a34ba72d5..42cc31a59d98 100644 --- a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml +++ b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml @@ -18,6 +18,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink;> - + ___ 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.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec742cca9de214fa03ca4215829eb0410363d346 Author: Andras Timar AuthorDate: Thu Apr 18 12:38:11 2019 +0200 Commit: Andras Timar CommitDate: Thu Apr 18 12:38:11 2019 +0200 [cp] ViewPDFAfterExport default true Change-Id: I2c054ba672c7ab52a6e3f3f085823fd5015f0d62 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 6aee83bbce97..a84787e28a26 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -4833,7 +4833,7 @@ Specifies if PDF automatically opens after export. -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 54087433e7495a7fa74661e5bfebac95b5648598 Author: Muhammet Kara AuthorDate: Sat Jan 26 01:33:37 2019 +0300 Commit: Andras Timar CommitDate: Wed Mar 27 21:42:25 2019 +0100 Make the text on Redaction toolbar buttons visible Change-Id: I3d6bc2adb91fbe16da008797b7b7e5189726c500 Reviewed-on: https://gerrit.libreoffice.org/66968 Tested-by: Jenkins Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/69818 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 4e93b335b3ce..45ed074966df 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2071,6 +2071,17 @@ 1 + + + Rectangle + + + Rectangle Redaction + + + 1 + + Rectangle, Rounded @@ -4655,6 +4666,17 @@ 1 + + + Freeform + + + Freeform Redaction + + + 1 + + Text Animation ___ 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.0' - officecfg/registry sd/source sd/uiconfig sd/UIConfig_sdraw.mk sfx2/source svx/sdi
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 11 +
sd/UIConfig_sdraw.mk |1
sd/source/ui/func/fuconrec.cxx | 97
+-
sd/source/ui/inc/fuconrec.hxx|6
sd/uiconfig/sdraw/toolbar/redactionbar.xml | 25 ++
sfx2/source/doc/objserv.cxx | 32 +++
svx/sdi/svx.sdi |5
7 files changed, 171 insertions(+), 6 deletions(-)
New commits:
commit 6f3359112ed46ca74e3217fb3f8d9fb224aa228b
Author: Muhammet Kara
AuthorDate: Tue Jan 22 01:00:39 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:41:25 2019 +0100
Add Redaction Toolbar
* Consists of .uno:Rect, .uno:LineToolbox, and .uno:ExportDirectToPDF
* Automatically shown when we are in the redaction process
* Customizes the rectangle tool for our needs
Also:
* Adds new parameters to the SID_DRAW_RECT (.uno:Rect)
to be able to set transparancy, fill color, and line/border style,
and to make our button sticky/permanent
Known problem: Button's icon is not shown after adding the parameters
Change-Id: I7928264415769f7e0a4ded171b864adb99aed442
Reviewed-on: https://gerrit.libreoffice.org/66706
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69816
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index ab64a1eb10f6..53f3d1adb244 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -900,6 +900,17 @@
true
+
+
+ false
+
+
+ false
+
+
+ Redaction
+
+
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 1d2d6e9f2a1e..93056ddec9b6 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
sd/uiconfig/sdraw/toolbar/optionsbar \
sd/uiconfig/sdraw/toolbar/positionbar \
sd/uiconfig/sdraw/toolbar/rectanglesbar \
+ sd/uiconfig/sdraw/toolbar/redactionbar \
sd/uiconfig/sdraw/toolbar/standardbar \
sd/uiconfig/sdraw/toolbar/starshapes \
sd/uiconfig/sdraw/toolbar/symbolshapes \
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index e46293693ae6..6631a8705294 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
#include
@@ -42,6 +43,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -72,15 +75,36 @@ FuConstructRectangle::FuConstructRectangle (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pView, pDoc, rReq)
+, mnFillTransparence(0)
+, mnLineStyle(SAL_MAX_UINT16)
{
}
+namespace{
+
+/// Checks to see if the request has a parameter of IsSticky:bool=true
+/// It means that the selected command/button will stay selected after use
+bool isSticky(SfxRequest& rReq)
+{
+const SfxItemSet *pArgs = rReq.GetArgs ();
+if (pArgs)
+{
+const SfxBoolItem* pIsSticky = rReq.GetArg(FN_PARAM_4);
+if (pIsSticky && pIsSticky->GetValue())
+return true;
+}
+
+return false;
+}
+
+}
+
rtl::Reference FuConstructRectangle::Create( ViewShell* pViewSh,
::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq,
bool bPermanent )
{
FuConstructRectangle* pFunc;
rtl::Reference xFunc( pFunc = new FuConstructRectangle( pViewSh,
pWin, pView, pDoc, rReq ) );
xFunc->DoExecute(rReq);
-pFunc->SetPermanent(bPermanent);
+pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
}
@@ -105,6 +129,9 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
const SfxUInt32Item* pAxisX =
rReq.GetArg(ID_VAL_AXIS_X);
const SfxUInt32Item* pAxisY =
rReq.GetArg(ID_VAL_AXIS_Y);
+if (!pCenterX || !pCenterY || !pAxisX || !pAxisY)
+break;
+
::tools::Rectangle aNewRectangle (pCenterX->GetValue () -
pAxisX->GetValue () / 2,
pCenterY->GetValue () -
pAxisY->GetValue () / 2,
pCenterX->GetValue () +
pAxisX->GetValue () / 2,
@@ -118,10 +145,29 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
case SID_DRAW_RECT :
{
-const
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 10 -- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 15 ++ sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml|6 +++- 3 files changed, 20 insertions(+), 11 deletions(-) New commits: commit 9ad8532b84c355958c9b7035bb8159eabb6bcbed Author: Tamás Zolnai AuthorDate: Sat Feb 16 20:56:57 2019 +0100 Commit: Andras Timar CommitDate: Sun Feb 17 11:06:51 2019 +0100 MSForms: Rework the MS compatible Forms menu a bit * DateField is saved as a content control in MSO file formats so let have it under content controls submenu * The MS compatible forms menu is a Writer specific thing so better to have the related commands as Writer commands. Reviewed-on: https://gerrit.libreoffice.org/67912 Tested-by: Jenkins Reviewed-by: Tamás Zolnai (cherry picked from commit 6a4653ed1b24a161950a9cd84caabdd5ad4fe536) Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469 Reviewed-on: https://gerrit.libreoffice.org/67927 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index f146a63caa56..aeb79c35c1ec 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6571,16 +6571,6 @@ Navigate - - - ActiveX Controls - - - - - Legacy Forms - - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 21c321de95cd..5483c1730e83 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -3305,6 +3305,21 @@ More Fields + + + ActiveX Controls + + + + + Legacy Form Fields + + + + + Content Controls + + diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml index 4c8e34467d3e..4d157908dd71 100644 --- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml +++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml @@ -21,7 +21,6 @@ - @@ -31,6 +30,11 @@ + + + + + ___ 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.0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 20c7a26bf1fbdb5e5e7fa6fe075fca7fe897e41d Author: Aron Budea AuthorDate: Wed Jan 9 12:24:03 2019 +0100 Commit: Aron Budea CommitDate: Wed Jan 9 12:24:03 2019 +0100 [cp] Revert rename of Master Slide Design Change-Id: I50ee049317c5d16b8ab00bb340357dea34fb36c4 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index dbc5e98aae1e..761d2d465449 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -991,7 +991,7 @@ - Master Slide... + Master Slide D~esign... 1 ___ 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.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 43f1c7d73829e3ef0a623cfeff2f560d6c21cfb2 Author: Caolán McNamara AuthorDate: Tue Nov 27 14:02:12 2018 + Commit: Andras Timar CommitDate: Wed Nov 28 10:06:49 2018 +0100 tdf#90333 Dictionaries Path Cannot Be Changed PathSettings::impl_storePath wants to be able to nil the Dictionaries path in the old copy of properties Change-Id: Id579914cfa8b459efce962d304e2f9d6185bd55f Reviewed-on: https://gerrit.libreoffice.org/64115 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit f913bdf712b9e03506b1278e1142283af92125b1) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index b1bc6d4b2ac4..108ceb01ec16 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1596,7 +1596,7 @@ $(insturl)/@LIBO_SHARE_FOLDER@/config - + Contains the provided dictionaries. ___ 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.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4b832567dafc2f0095330bdc42ed9c0745d6aba Author: Andras Timar AuthorDate: Wed Apr 19 16:56:42 2017 +0200 Commit: Jan Holesovsky CommitDate: Fri Jul 13 18:46:42 2018 +0200 Change merge cell defaults for Collabora Office Change-Id: Ib0f96e52f268df999fde34ea7bcf9ea9706ea11a Reviewed-on: https://gerrit.libreoffice.org/57399 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index c5cc7584ff83..1cbc251d9992 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1876,14 +1876,14 @@ Specifies whether the Merge Cells dialog box is shown, when some cells are not empty. Show Merge Cells dialog - true + false Specifies whether to empty the contents of the hidden cells (like Excel does). Empty merged cells - false + true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c4e5f8ae278a31dd0fea8e1cd9900aeef23e526 Author: Mike Kaganski Date: Sun May 7 09:29:00 2017 +0200 tdf#107649: cp-specific: Try system credentials first by default Change-Id: I39f3cd85153f939c1a5ebd7c6830c0175328a966 Reviewed-on: https://gerrit.libreoffice.org/37335 Reviewed-by: Andras Timar Tested-by: Andras Timar (cherry picked from commit 0be936f739752ce773f1c77f2c1dab022af785f5) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 99850de17bba..b1bc6d4b2ac4 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -934,7 +934,7 @@ automatically for all resources that support it (regardless of whether they are in "AuthenticateUsingSystemCredentials" list or not). -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry
officecfg/registry/data/org/openoffice/Setup.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 575c99b4e424523d8042f9773f60270fe571e2fb Author: Andras Timar Date: Mon Jun 11 14:57:43 2018 +0200 Migrate user profile from Collabora GovOffice 5.x Change-Id: I3c49b307991eb7765afae70efeaadeda7f141850 Reviewed-on: https://gerrit.libreoffice.org/55627 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 84a2bb68fa52..b73826fd20e0 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -776,12 +776,12 @@ - + 10 - Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8 + Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8,Collabora GovOffice 5.x=collaboragovoffice/4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
