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

[Heiko Tietze (via logerrit)]

 sfx2/sdi/sfx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 90c97ccfd8c0324fffec8852935e71e1f0670d76
Author: Heiko Tietze 
AuthorDate: Sat Sep 23 14:57:43 2023 +0300
Commit: Heiko Tietze 
CommitDate: Sun Sep 24 19:58:58 2023 +0200

Resolves tdf#136216 - Hide uno:AdditionsDialog from customization

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

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 669934693c0f..5660596a3b3d 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5840,9 +5840,9 @@ SfxVoidItem AdditionsDialog SID_ADDITIONS_DIALOG
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Application;
 ]
 

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

[Heiko Tietze (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05f7ab11bec87b706f598ae4e81d1f20cd4f1312
Author: Heiko Tietze 
AuthorDate: Thu Aug 24 14:35:05 2023 +0200
Commit: Heiko Tietze 
CommitDate: Fri Aug 25 11:10:05 2023 +0200

Resolves tdf#156404 - No hotkey to apply cloned formatting

Block customization for FormatPaintBrush as it allows modifier
keys and has a multi-step workflow

The patch has no effect yet because of tdf#147411

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

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 6541b39e47cd..669934693c0f 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4636,7 +4636,7 @@ SfxBoolItem FormatPaintbrush SID_FORMATPAINTBRUSH ( 
SfxBoolItem PersistentCopy S
   RecordAbsolute = FALSE,
   RecordPerSet;
 
-  AccelConfig = TRUE,
+  AccelConfig = FALSE,
   MenuConfig = TRUE,
   ToolBoxConfig = TRUE,
   GroupId = SfxGroupId::Edit;

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

[Xisco Fauli (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c2de9708f1041d230b4688151116ff9c3c9e5184
Author: Xisco Fauli 
AuthorDate: Fri Feb 24 13:52:57 2023 +0100
Commit: Xisco Fauli 
CommitDate: Sun Feb 26 08:49:57 2023 +

tdf#153802: make it possible to change the UI with read-only docs

Change-Id: I392ae68ef086a8c857e0d9d9e6117e27a85c9ba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147655
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4cf84ac12462..71b0557bb5d0 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5379,7 +5379,7 @@ SfxVoidItem ToolbarModeUI SID_TOOLBAR_MODE_UI
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = FALSE,
+ReadOnlyDoc = TRUE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,

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

[Seth Chaiklin (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40559dd30db04ab67d27fafe1e0c928757f7e7c0
Author: Seth Chaiklin 
AuthorDate: Tue Apr 26 22:43:49 2022 +0100
Commit: Seth Chaiklin 
CommitDate: Wed Apr 27 09:37:41 2022 +0200

tdf#131760 change category of Styles command

"Format" -> "View"

Change-Id: Ia702a28fd7eacf52bf02964e9dad7a3b69390241
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133413
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 5115dec907c0..834c898a59ae 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1007,7 +1007,7 @@ SfxVoidItem DesignerDialog SID_STYLE_DESIGNER
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = SfxGroupId::Format;
+GroupId = SfxGroupId::View;
 ]
 
 SfxVoidItem DragHierarchy SID_STYLE_DRAGHIERARCHIE

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ecfce0ff23d9f1ed5a51b29b14a7043dce87b300
Author: Samuel Mehrbrodt 
AuthorDate: Tue Nov 23 16:19:43 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Nov 24 09:23:51 2021 +0100

tdf#145852 Revert "Make "uno:Printer" actually work"

This broke a macro (see tdf#145852)

This reverts commit 3f4d96767fb510f07577ba4f28e60f05a370a5b2.

Change-Id: Ic3b4f31182e2f4e13d33f2b7711fec9ae62b1fd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125704
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 0a9b40b7f7a5..77690bf01e24 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3266,7 +3266,7 @@ SfxVoidItem PrintDefault SID_PRINTDOCDIRECT
 
 
 SfxStringItem Printer SID_PRINTER_NAME
-(SfxStringItem PrinterName SID_PRINTER_NAME)
+
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,

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

[Seth Chaiklin (via logerrit)]

 sfx2/sdi/sfx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 807e31d4cacaa38ff71e322aba9c485d6e22daff
Author: Seth Chaiklin 
AuthorDate: Thu Dec 10 13:09:36 2020 +0100
Commit: Heiko Tietze 
CommitDate: Mon Dec 14 10:29:04 2020 +0100

tdf#138621 Hide the .uno:TemplateManager from customization

Change-Id: I3c166a8e18f94d62562599a5218d302a1833d2ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107490
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
Reviewed-by: Heiko Tietze 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 5d71e6e5de3d..40bf3e93b424 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2993,9 +2993,9 @@ SfxVoidItem TemplateManager SID_TEMPLATE_MANAGER
 RecordPerSet;
 Asynchron;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Application;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f4d96767fb510f07577ba4f28e60f05a370a5b2
Author: Samuel Mehrbrodt 
AuthorDate: Thu Nov 26 08:16:59 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 26 09:41:36 2020 +0100

Make "uno:Printer" actually work

Needs to handle the "PrinterName" argument.
This can be used in macros to change the default printer.

Change-Id: I5d451843a5b15cda6db031c8a3a40bbc310d9107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106653
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 6cdad85a8d53..5d71e6e5de3d 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3218,7 +3218,7 @@ SfxVoidItem PrintDefault SID_PRINTDOCDIRECT
 
 
 SfxStringItem Printer SID_PRINTER_NAME
-
+(SfxStringItem PrinterName SID_PRINTER_NAME)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/sdi/sfx.sdi |2 +-
 sfx2/source/view/viewprn.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a49600eb41bf28213e3adb0a911dae9edb56513e
Author: Samuel Mehrbrodt 
AuthorDate: Wed Nov 25 23:09:18 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Nov 26 09:12:18 2020 +0100

uno:Printersetup: Allow preselecting a printer

When calling "uno:Printersetup" from a macro, allow preselecting a
printer in the printer setup dialog by passing the printer name
as an argument "PrinterName"

Change-Id: I6b435f52a4123dc7fd49f6d771052ff1b8e743c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106634
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index a0de55dbfddb..6cdad85a8d53 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3238,7 +3238,7 @@ SfxStringItem Printer SID_PRINTER_NAME
 
 
 SfxVoidItem PrinterSetup SID_SETUPPRINTER
-()
+(SfxStringItem PrinterName SID_PRINTER_NAME)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 45341cd1892a..796a505ed8d4 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -820,8 +820,8 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest  )
 return;
 }
 
-// if no arguments are given, retrieve them from a dialog
-if ( !bIsAPI )
+// Open Printer Setup dialog
+if ( nId == SID_SETUPPRINTER )
 {
 // PrinterDialog needs a temporary printer
 VclPtr pDlgPrinter = pPrinter->Clone();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 sfx2/sdi/appslots.sdi |1 +
 sfx2/source/appl/appserv.cxx  |4 +++-
 sw/sdi/_docsh.sdi |1 +
 sw/source/uibase/app/docsh.cxx|5 +
 sw/source/uibase/lingu/olmenu.cxx |6 ++
 5 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit e04fb52e8cdc8811c90f7c3492caa87c03ea6c67
Author: Michael Meeks 
AuthorDate: Sat Jul 13 15:45:22 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Oct 11 21:34:05 2019 +0200

lok: Disable autocorrect dialog from native context menu.

Change-Id: I973057c91be6704b5db7d9054679e0ddc8abf429
Reviewed-on: https://gerrit.libreoffice.org/80658
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index ee5a731d2063..6bd28f73b37f 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -291,6 +291,7 @@ shell SfxApplication
 SID_AUTO_CORRECT_DLG
 [
 ExecMethod = OfaExec_Impl ;
+StateMethod = OfaState_Impl;
 ]
 SID_OPTIONS_TREEDIALOG
 [
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index a7ede6f37492..64977135ba3a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -46,6 +46,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -1689,7 +1690,8 @@ void SfxApplication::OfaState_Impl(SfxItemSet )
 rSet.DisableItem( FN_BUSINESS_CARD );
 rSet.DisableItem( FN_XFORMS_INIT );
 }
-
+if ( comphelper::LibreOfficeKit::isActive() )
+rSet.DisableItem( SID_AUTO_CORRECT_DLG );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index f85f95f51edb..ec7814d2ceeb 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -27,6 +27,7 @@ interface BaseTextDocument
 SID_AUTO_CORRECT_DLG
 [
 ExecMethod = Execute ;
+StateMethod = GetState ;
 ]
 
 SID_STYLE_NEW
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index f641ad98508f..a373ec9e3a71 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1041,6 +1042,10 @@ void SwDocShell::GetState(SfxItemSet& rSet)
 }
 }
 break;
+case SID_AUTO_CORRECT_DLG:
+if ( comphelper::LibreOfficeKit::isActive() )
+rSet.DisableItem( SID_AUTO_CORRECT_DLG );
+break;
 case SID_SOURCEVIEW:
 {
 SfxViewShell* pCurrView = GetView() ? 
static_cast(GetView())
diff --git a/sw/source/uibase/lingu/olmenu.cxx 
b/sw/source/uibase/lingu/olmenu.cxx
index e6777811f099..8cc000318df0 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -296,6 +297,11 @@ SwSpellPopup::SwSpellPopup(
 
vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:SpellingAndGrammarDialog",
 aModuleName));
 m_xPopupMenu->SetItemText(m_nCorrectDialogId,
 
vcl::CommandInfoProvider::GetPopupLabelForCommand(".uno:AutoCorrectDlg", 
aModuleName));
+if (comphelper::LibreOfficeKit::isActive())
+{
+m_xPopupMenu->HideItem(m_nCorrectDialogId);
+m_xPopupMenu->HideItem(m_nAddId);
+}
 sal_uInt16 nItemPos = m_xPopupMenu->GetItemPos(m_nIgnoreWordId);
 m_xPopupMenu->InsertItem(MN_IGNORE_SELECTION, aIgnoreSelection, 
MenuItemBits::NONE, OString(), nItemPos);
 m_xPopupMenu->SetHelpId(MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/sdi/sfx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d42d937e6edb85bb8c2795cd54dc237e0da49bd6
Author: Maxim Monastirsky 
AuthorDate: Sun Aug 12 15:40:50 2018 +0300
Commit: Maxim Monastirsky 
CommitDate: Sun Aug 12 20:21:14 2018 +0200

Don't show ShowImeStatusWindow in the customization dialog

Change-Id: I5aeac6cf6ec9fae56c0dba3c176e0d6c52a28a5e
Reviewed-on: https://gerrit.libreoffice.org/58899
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 927957e3684f..235544588174 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4844,9 +4844,9 @@ SfxBoolItem ShowImeStatusWindow SID_SHOW_IME_STATUS_WINDOW
 RecordPerSet;
 
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::View;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sfx2/sdi/sfx.sdi |2 +-
 sfx2/source/doc/guisaveas.cxx|3 +++
 sfx2/source/doc/objstor.cxx  |4 
 sfx2/source/doc/sfxbasemodel.cxx |3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit e90a16d71cdcfbd785401613a2e5a29cb1167acf
Author: Miklos Vajna 
Date:   Mon Jan 15 15:10:22 2018 +0100

sfx2 store: handle NoFileSync for Save (not SaveAs)

The code-path in SfxMedium and lower layers is the same, but not in
SfxObjectShell.

Change-Id: I85542d17cd6b3c2a0d257f5ff196e6504a194e51
Reviewed-on: https://gerrit.libreoffice.org/47903
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 0ddf3653c3c0..74d780bd63bd 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3520,7 +3520,7 @@ SfxVoidItem SaveSimple SID_SAVESIMPLE
 ]
 
 SfxStringItem Save SID_SAVEDOC
-(SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author 
SID_DOCINFO_AUTHOR,SfxBoolItem DontTerminateEdit FN_PARAM_1)
+(SfxStringItem VersionComment SID_DOCINFO_COMMENTS,SfxStringItem Author 
SID_DOCINFO_AUTHOR,SfxBoolItem DontTerminateEdit FN_PARAM_1,SfxBoolItem 
NoFileSync SID_NO_FILE_SYNC)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9faeef85804e..4240f62f16e2 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -699,6 +699,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
 const OUString aInteractionHandlerString("InteractionHandler");
 const OUString aStatusIndicatorString("StatusIndicator");
 const OUString aFailOnWarningString("FailOnWarning");
+const OUString aNoFileSync("NoFileSync");
 
 if ( GetMediaDescr().find( aVersionCommentString ) != 
GetMediaDescr().end() )
 aAcceptedArgs[ aVersionCommentString ] = GetMediaDescr()[ 
aVersionCommentString ];
@@ -712,6 +713,8 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
 aAcceptedArgs[ aStatusIndicatorString ] = GetMediaDescr()[ 
aStatusIndicatorString ];
 if ( GetMediaDescr().find( aFailOnWarningString ) != GetMediaDescr().end() 
)
 aAcceptedArgs[ aFailOnWarningString ] = GetMediaDescr()[ 
aFailOnWarningString ];
+if (GetMediaDescr().find(aNoFileSync) != GetMediaDescr().end())
+aAcceptedArgs[aNoFileSync] = GetMediaDescr()[aNoFileSync];
 
 // remove unacceptable entry if there is any
 DBG_ASSERT( GetMediaDescr().size() == aAcceptedArgs.size(),
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3bac7ae20b97..a9692634b662 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2481,6 +2481,10 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* 
pArgs )
 if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) 
&& xInteract.is() )
 pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, 
makeAny( xInteract ) ) );
 
+const SfxBoolItem* pNoFileSync = 
pArgs->GetItem(SID_NO_FILE_SYNC, false);
+if (pNoFileSync && pNoFileSync->GetValue())
+pMediumTmp->DisableFileSync(true);
+
 bool bSaved = false;
 if( !GetError() && SaveTo_Impl( *pMediumTmp, pArgs ) )
 {
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index a383427ae0c5..69ba0a93c0a0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1476,7 +1476,8 @@ void SAL_CALL SfxBaseModel::storeSelf( constSequence< 
beans::PropertyValue >
   && aSeqArgs[nInd].Name != "InteractionHandler" && 
aSeqArgs[nInd].Name != "StatusIndicator"
   && aSeqArgs[nInd].Name != "VersionMajor"
   && aSeqArgs[nInd].Name != "FailOnWarning"
-  && aSeqArgs[nInd].Name != "CheckIn" )
+  && aSeqArgs[nInd].Name != "CheckIn"
+  && aSeqArgs[nInd].Name != "NoFileSync" )
 {
 const OUString aMessage( "Unexpected MediaDescriptor 
parameter: " + aSeqArgs[nInd].Name );
 throw lang::IllegalArgumentException( aMessage, Reference< 
XInterface >(), 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sfx2/sdi/sfx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 32ebd3d9351636c5c62c3939662ce3e057c714e7
Author: Yousuf Philips 
Date:   Thu Oct 26 11:56:44 2017 +0400

tdf#113446 Make EditStyle appear in customization dialog

Change-Id: I4340ee14478384d84148323345b498710cba4696
Reviewed-on: https://gerrit.libreoffice.org/43868
Reviewed-by: Maxim Monastirsky 
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 26265ed57bbf..2ab56c45993f 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1080,9 +1080,9 @@ SfxVoidItem EditStyle SID_STYLE_EDIT
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::Template;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sfx2/sdi/sfx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0d3d8af033fa11730abf6a0fac13f23eb0b0403b
Author: Samuel Mehrbrodt 
Date:   Fri Mar 18 09:54:24 2016 +0100

tdf#98740 Infobar should not be in the customization options

Change-Id: I741246174a8a3b642224c63faa2891ab383b645c
Reviewed-on: https://gerrit.libreoffice.org/23354
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index ad9ce08..e1b37a5 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2581,9 +2581,9 @@ SfxBoolItem InfoBar SID_INFOBAR
 RecordPerSet;
 
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = GID_DOCUMENT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sfx2/sdi/sfx.sdi  |2 +-
 sfx2/source/sidebar/AsynchronousCall.cxx  |7 +++
 sfx2/source/sidebar/AsynchronousCall.hxx  |1 +
 sfx2/source/sidebar/Sidebar.cxx   |3 ++-
 sfx2/source/sidebar/SidebarController.cxx |   20 ++--
 sfx2/source/sidebar/SidebarController.hxx |7 +++
 6 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit d59b9b4af36148e4d8df8f3e3492116d378642e2
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Wed Nov 5 23:12:55 2014 +0100

fdo#67627 fdo#85791 Allow to show/hide sidebar decks with the same command

This also reintroduces the code to switch the decks asynchronously (removed 
unintentionally before)

Change-Id: I825b4d7c5777097e9d3b3d82adbe1f646510dc9d

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 1d2e11c..2a64d6a 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1343,7 +1343,7 @@ SfxUInt16Item DeleteStyle SID_STYLE_DELETE
 ]
 
 
-SfxBoolItem DesignerDialog SID_STYLE_DESIGNER
+SfxVoidItem DesignerDialog SID_STYLE_DESIGNER
 
 [
 /* flags: */
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx 
b/sfx2/source/sidebar/AsynchronousCall.cxx
index 767e2e7..50f1a1c 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -40,6 +40,13 @@ AsynchronousCall::~AsynchronousCall (void)
 CancelRequest();
 }
 
+void AsynchronousCall::RequestCall (const Action rAction)
+{
+CancelRequest();
+maAction = rAction;
+RequestCall();
+}
+
 void AsynchronousCall::RequestCall (void)
 {
 if (mnCallId == 0)
diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx 
b/sfx2/source/sidebar/AsynchronousCall.hxx
index 665a35b..d3ecd5d 100644
--- a/sfx2/source/sidebar/AsynchronousCall.hxx
+++ b/sfx2/source/sidebar/AsynchronousCall.hxx
@@ -38,6 +38,7 @@ public:
 AsynchronousCall (const Action rAction);
 ~AsynchronousCall (void);
 
+void RequestCall (const Action rAction);
 void RequestCall (void);
 void CancelRequest (void);
 
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index 245307c..fe1bc5c 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -40,10 +40,11 @@ void Sidebar::ShowPanel (
 
 // All that is not necessary for the current use cases so lets
 // keep it simple for the time being.
-pController-OpenThenSwitchToDeck(pPanelDescriptor-msDeckId);
+pController-RequestSwitchToDeck(pPanelDescriptor-msDeckId);
 }
 }
 
+
 } } // end of namespace sfx2::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 6b6bd0d..db09eea 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -504,14 +504,27 @@ void SidebarController::UpdateConfigurations (void)
 }
 
 
-
+void SidebarController::RequestSwitchToDeck (
+const ::rtl::OUString rsDeckId)
+{
+maContextChangeUpdate.CancelRequest();
+maAsynchronousDeckSwitch.RequestCall(
+::boost::bind(SidebarController::OpenThenSwitchToDeck, this, 
rsDeckId));
+}
 
 void SidebarController::OpenThenSwitchToDeck (
 const ::rtl::OUString rsDeckId)
 {
+// fdo#67627 Clicking a second time on a Deck icon will close the Deck
+if (IsDeckVisible(rsDeckId))
+{
+RequestCloseDeck();
+return;
+}
 RequestOpenDeck();
 SwitchToDeck(rsDeckId);
 mpTabBar-Invalidate();
+mpTabBar-HighlightDeck(rsDeckId);
 }
 
 void SidebarController::SwitchToDeck (
@@ -996,7 +1009,10 @@ void SidebarController::RequestOpenDeck (void)
 UpdateDeckOpenState();
 }
 
-
+bool SidebarController::IsDeckVisible(const OUString rsDeckId)
+{
+return mbIsDeckOpen  mbIsDeckOpen.get()  msCurrentDeckId == rsDeckId;
+}
 
 
 void SidebarController::UpdateDeckOpenState (void)
diff --git a/sfx2/source/sidebar/SidebarController.hxx 
b/sfx2/source/sidebar/SidebarController.hxx
index 33cfea6..46511a5 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -122,6 +122,9 @@ public:
 const static sal_Int32 SwitchFlag_ForceNewDeck = 0x02;
 const static sal_Int32 SwitchFlag_ForceNewPanels = 0x02;
 
+
+void RequestSwitchToDeck (
+const ::rtl::OUString rsDeckId);
 void OpenThenSwitchToDeck (
 const ::rtl::OUString rsDeckId);
 
@@ -133,6 +136,10 @@ public:
 */
 void RequestOpenDeck (void);
 
+/** Returns true when the given deck is the currently visible deck
+ */
+bool IsDeckVisible (const ::rtl::OUString rsDeckId);
+
 FocusManager GetFocusManager (void) { return maFocusManager;}
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sfx2/sdi/sfx.sdi |2 +-
 sfx2/source/view/viewfrm.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 154c20cb320fb62cdd54cd248c3b981acc3903c8
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Aug 7 23:53:04 2014 +0300

fdo#82278 SfxUInt16Item - SfxInt16Item

A regression of 2245288574ef77b09416872326b4543c82790815.
VerbID can be negative.

Change-Id: Ib242376696346ab310031d1b7c5c74362fb4b3d1
Reviewed-on: https://gerrit.libreoffice.org/10823
Reviewed-by: Maxim Monastirsky momonas...@gmail.com
Tested-by: Maxim Monastirsky momonas...@gmail.com

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4302753..4ce0378 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4235,7 +4235,7 @@ SfxVoidItem ObjectCatalog SID_BASICIDE_OBJCAT
 
 
 SfxStringItem ObjectMenue SID_OBJECT
-(SfxUInt16Item VerbID SID_OBJECT)
+(SfxInt16Item VerbID SID_OBJECT)
 [
 /* flags: */
 AutoUpdate = FALSE,
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 57de550..bbabaa3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2279,7 +2279,7 @@ void SfxViewFrame::ExecView_Impl
 
 case SID_OBJECT:
 {
-SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, SID_OBJECT, false );
+SFX_REQUEST_ARG( rReq, pItem, SfxInt16Item, SID_OBJECT, false );
 
 SfxViewShell *pViewShell = GetViewShell();
 if ( pViewShell  pItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits