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

2021-07-13 Thread Heiko Tietze (via logerrit) 
 include/sfx2/sfxsids.hrc   |1 
 include/sfx2/strings.hrc   |1 
 include/sfx2/viewfrm.hxx   |1 
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 ++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 
 sfx2/sdi/appslots.sdi  |4 +++
 sfx2/sdi/sfx.sdi   |   15 +
 sfx2/source/appl/appserv.cxx   |8 ++
 sfx2/source/view/viewfrm.cxx   |   15 +
 9 files changed, 53 insertions(+)

New commits:
commit 14653f89a83982ef36346ebc15f14099fd5cf8f1
Author: Heiko Tietze 
AuthorDate: Thu Jul 1 16:54:39 2021 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jul 13 14:56:35 2021 +0200

Resolves tdf#131233 - UX around "Missing hyphenation"

SID_MISSINGHYPHENATION added and connected to a button
on the infobar opening the wiki page via hub

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

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 35d9ab895856..94ef74e86107 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -101,6 +101,7 @@ class SvxSearchItem;
 #define SID_DONATION(SID_SFX_START + 424)
 #define SID_GETINVOLVED (SID_SFX_START + 425)
 #define SID_WHATSNEW(SID_SFX_START + 426)
+#define SID_HYPHENATIONMISSING  (SID_SFX_START + 427)
 
 #define SID_SHOW_LICENSE(SID_SFX_START + 1683)
 #define SID_SHOW_CREDITS(SID_SFX_START + 1711)
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d8af44e6a2e9..ce05fa4dce27 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -297,6 +297,7 @@
 #define STR_SIGNATURE_SHOW  NC_("STR_SIGNATURE_SHOW", 
"Show Signatures")
 #define STR_TRACK_CHANGES_BUTTON
NC_("STR_TRACK_CHANGES_BUTTON", "Show Toolbar")
 #define STR_TRACK_CHANGES_BUTTON_HIDE   
NC_("STR_TRACK_CHANGES_BUTTON_HIDE", "Hide Toolbar")
+#define STR_HYPHENATION_BUTTON  NC_("STR_HYPHENATION_BUTTON", 
"Learn more")
 
 #define STR_CLOSE_PANE  NC_("STR_CLOSE_PANE", "Close 
Pane")
 
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7dd7f0e8553a..1bd0cbca39eb 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -67,6 +67,7 @@ class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, 
public SfxListener
 DECL_LINK(SwitchReadOnlyHandler, weld::Button&, void);
 DECL_LINK(SignDocumentHandler, weld::Button&, void);
 DECL_LINK(HiddenTrackChangesHandler, weld::Button&, void);
+DECL_LINK(HypenationMissingHandler, weld::Button&, void);
 SAL_DLLPRIVATE void KillDispatcher_Impl();
 
 virtual ~SfxViewFrame() override;
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 2277b42bdf74..745ff1244eb6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -360,6 +360,9 @@
 
   https://hub.libreoffice.org/ReleaseNotes/
 
+
+  https://hub.libreoffice.org/HyphenationMissing/
+
 
   https://hub.libreoffice.org/InstallJava/
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5cc8182eb46..d74a9411ca3c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2151,6 +2151,11 @@
   Specifies the URL used with the UNO command WhatsNew 
(SID_WHATSNEW).
 
   
+  
+
+  Specifies the URL used with the UNO command HyphenationMissing 
(SID_HYPHENATIONMISSING).
+
+  
   
 
   Specifies the URL used for Install Java message box.
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 6fd72f84ce85..0a759a45a22f 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -143,6 +143,10 @@ interface Application
 [
 ExecMethod = MiscExec_Impl ;
 ]
+SID_HYPHENATIONMISSING
+[
+ExecMethod = MiscExec_Impl ;
+]
 SID_SHOW_LICENSE
 [
 ExecMethod = MiscExec_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 92add9f2abf0..b3042125a7e5 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5072,6 +5072,21 @@ SfxVoidItem WhatsNew SID_WHATSNEW
 MenuConfig = TRUE,
 GroupId = SfxGroupId::Application;
 ]
+SfxVoidItem HyphenationMissing SID_HYPHENATIONMISSING
+()

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

2021-02-13 Thread Tomaž Vajngerl (via logerrit) 
 include/sfx2/devtools/DevelopmentToolDockingWindow.hxx   |6 +
 include/sfx2/sfxsids.hrc |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 ++
 sfx2/sdi/appslots.sdi|5 +
 sfx2/sdi/sfx.sdi |   16 

 sfx2/source/appl/appserv.cxx |   37 
++
 sfx2/source/devtools/DevelopmentToolDockingWindow.cxx|   13 +--
 7 files changed, 79 insertions(+), 7 deletions(-)

New commits:
commit 063602ea3791e87f9bd6685c9bd6dac7a1e4d189
Author: Tomaž Vajngerl 
AuthorDate: Sat Feb 13 10:42:52 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sun Feb 14 02:25:17 2021 +0100

devtools: add .uno action to trigger inspect of the selected object

Added .uno:InspectSelectedObject, which can be added to context
menu and when triggered, shows the current selected object in the
object inspector.

Change-Id: I2ade6c74197dcb3cf33b0ad2194822e6ae25fb7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110837
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx 
b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index 4721a424e66d..987bc053a878 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -36,6 +37,7 @@ private:
 css::uno::Reference mxRoot;
 css::uno::Reference mxCurrentSelection;
 css::uno::Reference 
mxSelectionListener;
+css::uno::Reference mxSelectionSupplier;
 
 DocumentModelTreeHandler maDocumentModelTreeHandler;
 ObjectInspectorTreeHandler maObjectInspectorTreeHandler;
@@ -45,7 +47,7 @@ private:
 
 void inspectDocument();
 void updateSelection();
-void inspectSelectionOrRoot(css::uno::Reference 
const& xController);
+void inspectSelectionOrRoot();
 
 public:
 DevelopmentToolDockingWindow(SfxBindings* pBindings, SfxChildWindow* 
pChildWindow,
@@ -60,6 +62,8 @@ public:
 void introspect(css::uno::Reference const& 
xInterface);
 
 void selectionChanged(css::uno::Reference const& 
xInterface);
+
+void changeToCurrentSelection();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 8cb256ff998a..3f9d4a232fb7 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -51,6 +51,7 @@ class SvxSearchItem;
 #define SID_SAFE_MODE   (SID_SFX_START + 303)
 
 #define SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW (SID_SFX_START + 306)
+#define SID_INSPECT_SELECTED_OBJECT  (SID_SFX_START + 307)
 
 #define SID_CONTEXT (SID_SFX_START + 310)
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ee5c3fd9e81d..508238ccbaf4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -7336,6 +7336,14 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   1
 
   
+  
+
+  Inspect Object
+
+
+  1
+
+  
 
   
 
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index ee620ff3fa8c..5dbee7376b6e 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -219,6 +219,11 @@ interface Application
 ExecMethod = MiscExec_Impl ;
 StateMethod = MiscState_Impl ;
 ]
+SID_INSPECT_SELECTED_OBJECT
+[
+ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
+]
 }
 
 
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 5a52dd558114..425724440d13 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5640,6 +5640,22 @@ SfxBoolItem DevelopmentToolsDockingWindow 
SID_DEVELOPMENT_TOOLS_DOCKING_WINDOW
 GroupId = SfxGroupId::Application;
 ]
 
+SfxVoidItem InspectSelectedObject SID_INSPECT_SELECTED_OBJECT
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::View;
+]
+
 SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
 ()
 [
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e5360c796183..43f36d187bfd 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -97,6 +97,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1022,6 +1023,26 @@ void SfxApplication::MiscExec_Impl(

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

2019-01-03 Thread Libreoffice Gerrit user 
 include/sfx2/sfxsids.hrc |3 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   14 +
 sfx2/sdi/docslots.sdi|5 
 sfx2/sdi/sfx.sdi |   17 ++
 sfx2/source/appl/appuno.cxx  |4 
 sfx2/source/doc/objserv.cxx  |   76 
++
 6 files changed, 116 insertions(+), 3 deletions(-)

New commits:
commit 1f6506ca9d34ab2576e7659986ed2c3d3bf81d90
Author: Muhammet Kara 
AuthorDate: Thu Dec 6 12:10:13 2018 +0300
Commit: Muhammet Kara 
CommitDate: Thu Jan 3 21:05:28 2019 +0100

Redaction: First steps

- Add an uno command to create an empty draw document
- Create a meta file from the first page of a Writer document
- Insert meta file to the draw page
- Doesn't work with normal/default view on big/high-res screens
  because of a bug in the MapModes. Manually setting zoom level to %200
  or "Page Width" (to get rid of the extra space around the actual page)
  works for now as workaround.

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

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 80d262e20625..badaedad4d26 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -134,6 +134,7 @@ class SfxDocumentInfoItem;
 #define SID_DIRECTEXPORTDOCASPDF(SID_SFX_START + 1674)
 #define SID_EXPORTDOCASEPUB (SID_SFX_START + 1677)
 #define SID_DIRECTEXPORTDOCASEPUB   (SID_SFX_START + 1678)
+#define SID_REDACTDOC   (SID_SFX_START + 1732)
 #define SID_UPDATEDOCMODE   (SID_SFX_START + 1668)
 #define SID_CHECKOUT(SID_SFX_START + 512)
 #define SID_CANCELCHECKOUT  (SID_SFX_START + 513)
@@ -256,7 +257,7 @@ class SfxDocumentInfoItem;
 // not required for preview, but interferes with not-yet-saved embedded data 
source for main document.
 #define SID_NO_EMBEDDED_DS  
TypedWhichId(SID_SFX_START + 1731)
 
-//  SID_SFX_free_START  (SID_SFX_START + 1732)
+//  SID_SFX_free_START  (SID_SFX_START + 1733)
 //  SID_SFX_free_END(SID_SFX_START + 3999)
 
 #define SID_OPEN_NEW_VIEW   (SID_SFX_START + 520)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f880d3717521..9df09104437e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4997,6 +4997,20 @@
   1
 
   
+  
+
+  Redact
+
+
+  Redact
+
+
+  Redact Document
+
+
+  1
+
+  
   
 
   ~Customize...
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 811467cd94be..5b878b8ff051 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -248,6 +248,11 @@ shell SfxObjectShell
 ExecMethod = ExecFile_Impl ;
 StateMethod = GetState_Impl ;
 ]
+SID_REDACTDOC
+[
+ExecMethod = ExecFile_Impl ;
+StateMethod = GetState_Impl ;
+]
 SID_SIGNATURE
 [
 ExecMethod = ExecFile_Impl;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 11225f17868e..f8fbcd49d3b5 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4814,6 +4814,23 @@ SfxVoidItem ExportDirectToEPUB SID_DIRECTEXPORTDOCASEPUB
 GroupId = SfxGroupId::Document;
 ]
 
+SfxVoidItem RedactDoc SID_REDACTDOC
+(SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME)
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = TRUE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Document;
+]
+
 SfxImageItem ImageOrientation SID_IMAGE_ORIENTATION
 
 [
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 2ce0f060184a..57bc154ad891 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -175,7 +175,7 @@ static bool isMediaDescriptor( sal_uInt16 nSlotId )
  nSlotId == SID_SAVETO || nSlotId == SID_SAVEACOPY ||
  nSlotId == SID_EXPORTDOCASPDF || nSlotId == 
SID_DIRECTEXPORTDOCASPDF ||
  nSlotId == SID_EXPORTDOCASEPUB || nSlotId == 
SID_DIRECTEXPORTDOCASEPUB ||
- nSlotId == SID_SAVEACOPYITEM);
+ nSlotId == SID_REDACTDOC || nSlotId == SID_SAVEACOPYITEM);
 }
 
 void TransformParameters( sal_uInt16

[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sfx2/sdi sfx2/source sw/uiconfig

2017-12-17 Thread Gulsah Kose 
 include/sfx2/sfxsids.hrc |2 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 

 sfx2/sdi/frmslots.sdi|5 ++
 sfx2/sdi/sfx.sdi |   19 
++
 sfx2/source/view/viewfrm.cxx |   13 
+-
 sw/uiconfig/swriter/toolbar/standardbar.xml  |1 
 sw/uiconfig/swriter/toolbar/viewerbar.xml|1 
 7 files changed, 45 insertions(+), 4 deletions(-)

New commits:
commit 5afa76782d192d66711e02400987d6153ef9e5a7
Author: Gulsah Kose 
Date:   Mon Nov 20 23:45:02 2017 +0300

tdf#113928 Add uno:ReadOnlyDoc command.

That uno command is opposition to uno:EditDoc command.

Change-Id: I34977a46c274574e8e44097a16c0fa8972d68559
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/45005
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 7bac74572f8f..995f3641a744 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -147,7 +147,7 @@
 #define SID_CREATELINK  (SID_SFX_START + 1309)
 #define SID_EDITDOC (SID_SFX_START + 1312)
 #define SID_BROWSER_MODE(SID_SFX_START + 1313)
-// FREE (was SID_PLUGINS_ACTIVE)  (SID_SFX_START + 1314)
+#define SID_READONLYDOC (SID_SFX_START + 1314)
 #define SID_BROWSER (SID_SFX_START + 1318)
 #define SID_MACROEXECMODE   (SID_SFX_START + 1319)
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c5d9664e2aa3..c903fe8b9d21 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2841,6 +2841,14 @@
   9
 
   
+  
+
+  Read Only Mode
+
+
+  Toggle Read Only Mode
+
+  
   
 
   Image Control
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index f4c824ec29ab..09aafef95b7d 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -208,6 +208,11 @@ interface BrowseWindow : Window
 ExecMethod = ExecReload_Impl ;
 StateMethod = StateReload_Impl ;
 ]
+SID_READONLYDOC // ole(?opt) api(play/rec)
+[
+ExecMethod = ExecReload_Impl ;
+StateMethod = StateReload_Impl ;
+]
 SID_RELOAD // ole(?opt) api(play/rec)
 [
 ExecMethod = ExecReload_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 659e3763bfd1..79d10caa0716 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1050,6 +1050,25 @@ SfxVoidItem EditDoc SID_EDITDOC
 ]
 
 
+SfxVoidItem ReadOnlyDoc SID_READONLYDOC
+(SfxBoolItem Editable SID_EDITDOC)
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Asynchron;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Document;
+]
+
+
 SfxVoidItem EditMacro SID_BASICIDE_EDITMACRO
 (SfxMacroInfoItem aMacroInfo SID_BASICIDE_ARG_MACROINFO)
 [
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e168ac8068bf..448b625dd427 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -254,6 +254,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 switch ( rReq.GetSlot() )
 {
 case SID_EDITDOC:
+case SID_READONLYDOC:
 {
 // Due to Double occupancy in toolboxes (with or without Ctrl),
 // it is also possible that the slot is enabled, but Ctrl-click
@@ -791,6 +792,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 switch ( nWhich )
 {
 case SID_EDITDOC:
+case SID_READONLYDOC:
 {
 const SfxViewShell *pVSh;
 const SfxShell *pFSh;
@@ -800,14 +802,19 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
( !(pVSh = pSh->GetViewShell())  ||
  !(pFSh = pVSh->GetFormShell()) ||
  !pFSh->IsDesignMode(
-rSet.DisableItem( SID_EDITDOC );
+rSet.DisableItem( nWhich );
 else
 {
 const SfxBoolItem* pItem = 
SfxItemSet::GetItem(pSh->GetMedium()->GetItemSet(), SID_EDITDOC, 
false);
 if ( pItem && !pItem->GetValue() )
-

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

2017-09-20 Thread Miklos Vajna 
 include/sfx2/sfxsids.hrc |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   14 ++
 sfx2/sdi/docslots.sdi|5 
 sfx2/sdi/sfx.sdi |   16 +++
 sfx2/source/appl/appuno.cxx  |6 -
 sfx2/source/doc/guisaveas.cxx|   53 
+++---
 sfx2/source/doc/objserv.cxx  |2 
 7 files changed, 81 insertions(+), 16 deletions(-)

New commits:
commit eef3b0182af2f6196eb4c2a402d72eeaed069083
Author: Miklos Vajna 
Date:   Wed Sep 20 17:04:35 2017 +0200

EPUB export: add uno command to trigger the filter

This is quite similar to PDF, except that by default the File menu
doesn't advertise this command. Possible to add it via Tools ->
Customize -> Menus -> Search -> EPUB.

(Reasoning for having a dedicated UNO command for EPUB is an increasing
amount of users look at EPUB as the new PDF, given how non-reflowable
PDF is hard to read on mobile devices, while EPUB is primarily
reflowable.)

Change-Id: Ib80f784a630a192f5b6ffbbfc60cb565fda7ed37

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 7ed7e1e0c728..062117dc4b4f 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -125,6 +125,7 @@
 #define SID_EXPORTDOC   (SID_SFX_START + 829)
 #define SID_EXPORTDOCASPDF  (SID_SFX_START + 1673)
 #define SID_DIRECTEXPORTDOCASPDF(SID_SFX_START + 1674)
+#define SID_EXPORTDOCASEPUB (SID_SFX_START + 1677)
 #define SID_UPDATEDOCMODE   (SID_SFX_START + 1668)
 #define SID_CHECKOUT(SID_SFX_START + 512)
 #define SID_CANCELCHECKOUT  (SID_SFX_START + 513)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ff7788129b3c..6e4ec8c1dd12 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4855,6 +4855,20 @@
   1
 
   
+  
+
+  EPUB
+
+
+  ~Export as EPUB...
+
+
+  Export as EPUB
+
+
+  1
+
+  
   
 
   ~Customize...
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 52476b5c16c6..04039af5728a 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -234,6 +234,11 @@ shell SfxObjectShell
 ExecMethod = ExecFile_Impl ;
 StateMethod = GetState_Impl ;
 ]
+SID_EXPORTDOCASEPUB
+[
+ExecMethod = ExecFile_Impl ;
+StateMethod = GetState_Impl ;
+]
 SID_SIGNATURE
 [
 ExecMethod = ExecFile_Impl;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 9b755fb36e6e..75b883ae5508 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4778,6 +4778,22 @@ SfxVoidItem ExportDirectToPDF SID_DIRECTEXPORTDOCASPDF
 GroupId = SfxGroupId::Document;
 ]
 
+SfxVoidItem ExportToEPUB SID_EXPORTDOCASEPUB
+(SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME)
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = TRUE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Document;
+]
 
 SfxImageItem ImageOrientation SID_IMAGE_ORIENTATION
 
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8739f8f656a0..534baecfe967 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -168,8 +168,9 @@ static bool isMediaDescriptor( sal_uInt16 nSlotId )
 {
 return ( nSlotId == SID_OPENDOC || nSlotId == SID_EXPORTDOC ||
  nSlotId == SID_SAVEASDOC || nSlotId == SID_SAVEDOC ||
- nSlotId == SID_SAVETO || nSlotId == SID_EXPORTDOCASPDF ||
- nSlotId == SID_DIRECTEXPORTDOCASPDF || nSlotId == SID_SAVEACOPY ||
+ nSlotId == SID_SAVETO || nSlotId == SID_SAVEACOPY ||
+ nSlotId == SID_EXPORTDOCASPDF || nSlotId == 
SID_DIRECTEXPORTDOCASPDF ||
+ nSlotId == SID_EXPORTDOCASEPUB ||
  nSlotId == SID_SAVEACOPYITEM);
 }
 
@@ -1330,6 +1331,7 @@ void TransformItems( sal_uInt16 nSlotId, const 
SfxItemSet& rSet, uno::Sequence 
GetDocServiceDefaultFilterCheckFlags( SfxFilterFlags nMust, SfxFilterFlags 
nDont );
 uno::Sequence< beans::PropertyValue > GetDocServiceAnyFilter( 
SfxFilterFlags nMust, SfxFilterFlags nDont );
-uno::Sequence< beans::PropertyValue > GetPreselectedFilter_Impl( sal_Int8 
nStoreMode );
+uno::Sequence<

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

2016-08-25 Thread Szymon Kłos 
 include/sfx2/notebookbar/SfxNotebookBar.hxx  |1 
 include/sfx2/sfxsids.hrc |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
 officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu |6 
 officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs   |5 
 sfx2/sdi/appslots.sdi|5 
 sfx2/sdi/sfx.sdi |   16 +
 sfx2/source/appl/appserv.cxx |   46 

 sfx2/source/dialog/dialog.src|6 
 sfx2/source/notebookbar/NotebookBarPopupMenu.cxx |5 
 sfx2/source/notebookbar/NotebookBarPopupMenu.hxx |2 
 sfx2/source/notebookbar/SfxNotebookBar.cxx   |  115 
+++---
 12 files changed, 183 insertions(+), 30 deletions(-)

New commits:
commit 3b01af931470c82375b4f962beb9f71243001230
Author: Szymon Kłos 
Date:   Thu Aug 11 12:07:36 2016 +0200

GSoC notebookbar: hiding menubar

+ node in the Notebookbar.xcu determines if menubar is
  visible for each implementation
+ new .uno:Menubar command (toggles menubar's visibility)

Change-Id: I8ee4ec5bdb78556a8561cc328cba8ecd9bbef60d
Reviewed-on: https://gerrit.libreoffice.org/28044
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index e3735658..12373d1 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -40,6 +40,7 @@ public:
 static void RemoveListeners(SystemWindow* pSysWindow);
 
 static void ShowMenubar(bool bShow);
+static void ToggleMenubar();
 
 private:
 static bool m_bLock;
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 2498942..f5561fe 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -545,6 +545,7 @@
 #define SID_SEARCH_ITEM (SID_SVX_START + 291)
 #define SID_SIDEBAR (SID_SVX_START + 336)
 #define SID_NOTEBOOKBAR (SID_SVX_START + 338)
+#define SID_MENUBAR (SID_SVX_START + 339)
 #define SID_HYPERLINK_GETLINK   (SID_SVX_START + 361)
 #define SID_HYPERLINK_SETLINK   (SID_SVX_START + 362)
 #define SID_INFOBAR (SID_SVX_START + 365)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0247b17..9f476a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6130,6 +6130,11 @@
   Paste Special
 
   
+  
+
+  Menubar
+
+  
 
   
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
index 3814b3e..2b67a6d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
@@ -12,6 +12,9 @@
   
 notebookbar.ui
   
+  
+false
+  
 
 
   
@@ -20,6 +23,9 @@
   
 notebookbar_groups.ui
   
+  
+true
+  
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs
index 51dbeed..ace1d50 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs
@@ -36,6 +36,11 @@
 The .ui file name.
   
 
+
+  
+Determines if menubar is visible.
+  
+
 
   
   
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index d103b96..4921f27 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -220,6 +220,11 @@ interface Application
 [
 ExecMethod = MiscExec_Impl ;
 ]
+SID_MENUBAR
+[
+ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
+]
 }
 
 
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 3afeb51..7c24c75 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2623,6 +2623,22 @@ SfxBoolItem Sidebar SID_SIDEBAR
 GroupId = GID_VIEW;
 ]
 
+SfxBoolItem Menubar SID_MENUBAR
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Asynchron;
+
+AccelConfig = FALSE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId