[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - xmloff/source

2021-09-24 Thread Pierre Marty (via logerrit) 
 xmloff/source/draw/ximpstyl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e78b352caa270b65ceb5076b54a9b4194d4f5b6
Author: Pierre Marty 
AuthorDate: Mon Sep 20 14:56:33 2021 +0200
Commit: Michael Stahl 
CommitDate: Fri Sep 24 11:29:24 2021 +0200

tdf#141978: corrects the value assigned to AutoLayout while loading .odp 
file

SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32)
  now assigns the value AUTOLAYOUT_TITLE_6CONTENT
  instead of AUTOLAYOUT_4CLIPART at file loading

Change-Id: Ic441d64fc62e1dd08873305a4cafd9823babe46f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122360
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 5bcced4776bb73846ef4f98795e217e4fb923e40)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122439
Reviewed-by: Michael Stahl 

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index aa1520fe7047..bd92fc2a373b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -617,7 +617,7 @@ void 
SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32 )
 }
 case 7:
 {
-mnTypeId = AUTOLAYOUT_4CLIPART; // FIXME: not 
AUTOLAYOUT_TITLE_6CONTENT?
+mnTypeId = AUTOLAYOUT_TITLE_6CONTENT; // tdf#141978: Apply 
6content layout
 break;
 }
 default:

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

2021-09-23 Thread Pierre Marty (via logerrit) 
 xmloff/source/draw/ximpstyl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bcced4776bb73846ef4f98795e217e4fb923e40
Author: Pierre Marty 
AuthorDate: Mon Sep 20 14:56:33 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 23 09:56:12 2021 +0200

tdf#141978: corrects the value assigned to AutoLayout while loading .odp 
file

SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32)
  now assigns the value AUTOLAYOUT_TITLE_6CONTENT
  instead of AUTOLAYOUT_4CLIPART at file loading

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

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 77f5877a2442..4f3805e39ddd 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -618,7 +618,7 @@ void 
SdXMLPresentationPageLayoutContext::endFastElement(sal_Int32 )
 }
 case 7:
 {
-mnTypeId = AUTOLAYOUT_4CLIPART; // FIXME: not 
AUTOLAYOUT_TITLE_6CONTENT?
+mnTypeId = AUTOLAYOUT_TITLE_6CONTENT; // tdf#141978: Apply 
6content layout
 break;
 }
 default:

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

2020-07-22 Thread Pierre MARTY (via logerrit) 
 sd/sdi/sdraw.sdi   |4 ++--
 sd/source/ui/view/drviews2.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4bfff26b519e4890de1cf4750f9a5ad75c3bc992
Author: Pierre MARTY 
AuthorDate: Wed May 20 15:03:13 2020 +0200
Commit: Mike Kaganski 
CommitDate: Wed Jul 22 17:57:45 2020 +0200

tdf#132816: update slide "master" option buttons in tabbed ui

Make AutoUpdate:
- SfxBoolItem DisplayMasterBackground
- SfxBoolItem DisplayMasterObjects

Change-Id: I5f6bbe6cc630d74c5713ae2c0d622a74f22606b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94574
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index a675db0efb5e..436a89cc30b4 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -4129,7 +4129,7 @@ SfxVoidItem SaveBackground SID_SAVE_BACKGROUND
 
 SfxBoolItem DisplayMasterBackground SID_DISPLAY_MASTER_BACKGROUND
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
@@ -4145,7 +4145,7 @@ SfxBoolItem DisplayMasterBackground 
SID_DISPLAY_MASTER_BACKGROUND
 ]
 SfxBoolItem DisplayMasterObjects SID_DISPLAY_MASTER_OBJECTS
 [
-AutoUpdate = FALSE,
+AutoUpdate = TRUE,
 FastCall = FALSE,
 ReadOnlyDoc = FALSE,
 Toggle = FALSE,
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8bd95fb43ce8..b89c429452ee 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3459,7 +3459,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
 }
 Cancel();
-rReq.Ignore ();
+rReq.Done(); // Mark task as done to auto-update the state of each 
buttons tdf#132816
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

2020-07-21 Thread Pierre MARTY (via logerrit) 
 sfx2/source/doc/guisaveas.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 68880474423c4e2b22cdc2a25b64750863a9023f
Author: Pierre MARTY 
AuthorDate: Fri Apr 17 19:01:41 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jul 21 16:47:57 2020 +0200

tdf#121191 Fix PDF viewer after "Export..."

* Add '.pdf' file extension detection:
| if the file is actually a PDF then modify the 
'nStoreMode' value
| to 'EXPORT_REQUESTED | PDFEXPORT_REQUESTED'

Change-Id: I2c950dc424fd62f004bb3eb6860621561669f547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92715
Tested-by: Jenkins
Reviewed-by: Pierre Marty 
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99143
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
old mode 100644
new mode 100755
index eb94e0873e6e..bb4b0fb7f838
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1601,12 +1601,18 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 aModelData.GetMediaDescr().find( 
OUString("FilterFlags") );
 bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() );
 
+// check if the filter Dialog has not been called before
 if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & 
EPUBEXPORT_REQUESTED ) && !bFilterFlagsSet
 && ( ( nStoreMode & EXPORT_REQUESTED ) || bUseFilterOptions ) )
 {
 // execute filter options dialog
 if ( aModelData.ExecuteFilterDialog_Impl( aFilterName ) )
+{
 bDialogUsed = true;
+// check if the file is a pdf or not and change the storing mode 
at convenience
+if (aFilterName.endsWith("pdf_Export"))
+nStoreMode = EXPORT_REQUESTED | PDFEXPORT_REQUESTED;
+}
 }
 
 // so the arguments will not change any more and can be stored to the main 
location
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-07-21 Thread Pierre MARTY (via logerrit) 
 sfx2/source/doc/guisaveas.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit fef72302dac39674103c8cf66f1a5e27b9f3d7ab
Author: Pierre MARTY 
AuthorDate: Fri Apr 17 19:01:41 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Jul 21 13:33:20 2020 +0200

tdf#121191 Fix PDF viewer after "Export..."

* Add '.pdf' file extension detection:
| if the file is actually a PDF then modify the 
'nStoreMode' value
| to 'EXPORT_REQUESTED | PDFEXPORT_REQUESTED'

Change-Id: I2c950dc424fd62f004bb3eb6860621561669f547
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92715
Tested-by: Jenkins
Reviewed-by: Pierre Marty 
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
old mode 100644
new mode 100755
index c47d18a5710d..6e26bacd8078
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1600,12 +1600,18 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 aModelData.GetMediaDescr().find( 
OUString("FilterFlags") );
 bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() );
 
+// check if the filter Dialog has not been called before
 if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & 
EPUBEXPORT_REQUESTED ) && !bFilterFlagsSet
 && ( ( nStoreMode & EXPORT_REQUESTED ) || bUseFilterOptions ) )
 {
 // execute filter options dialog
 if ( aModelData.ExecuteFilterDialog_Impl( aFilterName ) )
+{
 bDialogUsed = true;
+// check if the file is a pdf or not and change the storing mode 
at convenience
+if ( aURL.GetFileExtension().equalsIgnoreAsciiCase( "pdf" ) )
+nStoreMode = EXPORT_REQUESTED | PDFEXPORT_REQUESTED;
+}
 }
 
 // so the arguments will not change any more and can be stored to the main 
location
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits