[Libreoffice-commits] core.git: framework/source officecfg/registry
framework/source/uielement/recentfilesmenucontroller.cxx | 53 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
2 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 6836776fa295293c114c267bca38d18603993a54
Author: Andreas Heinisch
AuthorDate: Wed Feb 1 15:09:28 2023 +0100
Commit: Andreas Heinisch
CommitDate: Fri Feb 3 09:46:01 2023 +
tdf#56696 - Sort recent document list according to current LibO module
Change-Id: I246dc9538e011b8981bea04963995559d2b43cc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146456
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index fe7de1c3d907..ef95d300058b 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -20,6 +20,8 @@
#include
#include
+#include
+#include
#include
#include
#include
@@ -34,6 +36,8 @@
#include
#include
+#include
+
using namespace css;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -42,6 +46,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::util;
#define MAX_MENU_ITEMS 99
+#define MAX_MENU_ITEMS_PER_MODULE 5
namespace {
@@ -154,12 +159,50 @@ void RecentFilesMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
int nPickListMenuItems = std::min( aHistoryList.size(),
MAX_MENU_ITEMS );
m_aRecentFilesItems.clear();
+// tdf#56696 - retrieve expert configuration option if the recent document
+// list should show only files that can be handled by the current module
+const bool bShowCurrentModuleOnly
+= officecfg::Office::Common::History::ShowCurrentModuleOnly::get();
+
+size_t nItemPosModule = 0;
if (( nPickListMenuItems > 0 ) && !m_bDisabled )
{
-for ( int i = 0; i < nPickListMenuItems; i++ )
+size_t nItemPos = 0;
+if (m_aModuleName != "com.sun.star.frame.StartModule")
+{
+::comphelper::MimeConfigurationHelper aConfigHelper(
+comphelper::getProcessComponentContext());
+// Show the first MAX_MENU_ITEMS_PER_MODULE items of the current
module
+// on top of the recent document list.
+for (int i = 0; i < nPickListMenuItems; i++)
+{
+const SvtHistoryOptions::HistoryItem& rPickListEntry =
aHistoryList[i];
+const std::pair
aPickListEntry(rPickListEntry.sURL,
+
rPickListEntry.isReadOnly);
+if ((nItemPosModule < MAX_MENU_ITEMS_PER_MODULE ||
bShowCurrentModuleOnly)
+&&
aConfigHelper.GetDocServiceNameFromFilter(rPickListEntry.sFilter)
+ == m_aModuleName)
+{
+m_aRecentFilesItems.insert(m_aRecentFilesItems.begin() +
nItemPosModule,
+ aPickListEntry);
+nItemPos++;
+nItemPosModule++;
+}
+else if (!bShowCurrentModuleOnly)
+{
+m_aRecentFilesItems.insert(m_aRecentFilesItems.begin() +
nItemPos,
+ aPickListEntry);
+nItemPos++;
+}
+}
+}
+else
{
-const SvtHistoryOptions::HistoryItem& rPickListEntry =
aHistoryList[i];
-m_aRecentFilesItems.emplace_back(rPickListEntry.sURL,
rPickListEntry.isReadOnly);
+for (int i = 0; i < nPickListMenuItems; i++)
+{
+const SvtHistoryOptions::HistoryItem& rPickListEntry =
aHistoryList[i];
+m_aRecentFilesItems.emplace_back(rPickListEntry.sURL,
rPickListEntry.isReadOnly);
+}
}
}
@@ -220,6 +263,10 @@ void RecentFilesMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
rPopupMenu->setTipHelpText(sal_uInt16(i + 1), aTipHelpText);
rPopupMenu->setCommand(sal_uInt16(i + 1), aURLString);
+
+// Show a separator after the MAX_MENU_ITEMS_PER_MODULE recent
document items
+if (nItemPosModule > 0 && i == nItemPosModule - 1)
+rPopupMenu->insertSeparator(-1);
}
rPopupMenu->insertSeparator(-1);
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f333657151f5..ced635fa4200 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2233,6 +2233,13 @@
true
+
+
+ The entry specifies if the recent document list should sho
[Libreoffice-commits] core.git: framework/source officecfg/registry
framework/source/loadenv/loadenv.cxx |3 ++- officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 ++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit a3843f1cb0095e843bc4ee7ed20802147f63c7ba Author: Mike Kaganski AuthorDate: Tue Apr 27 06:15:16 2021 +0300 Commit: Mike Kaganski CommitDate: Tue Apr 27 09:12:01 2021 +0200 tdf#141164: Add an expert config for WebDAV redirection detection Since commit 20b1e6440aacab043753e93be4499e939a80b05b, we detect redirected WebDAV paths, and substitute them with original WebDAV URLs to allow retrieving additional information like lock owner. The new officecfg::Office::Common::Load::DetectWebDAVRedirection allows to disable the detection, and opt to older way of use of Windows Redirector, taking advantage of its cookie handling until we implement own proper cookie handling. Change-Id: I1510a016f40dbe81dcba9aa4fd50eda73a6d9f22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114686 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 3821654df008..cd83d9403748 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -251,7 +251,8 @@ void LoadEnv::startLoading(const OUString& sURL, const uno::Sequence true + + + Determines whether to use WebDAV when a file is loaded from a mapped WebDAV drive. + +true + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source officecfg/registry sc/source sw/source vcl/source
framework/source/uielement/progressbarwrapper.cxx |2 +-
officecfg/registry/schema/org/openoffice/Office/Update.xcs |2 +-
sc/source/ui/drawfunc/drtxtob.cxx |2 +-
sw/source/filter/ww8/docxexport.cxx|2 +-
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
vcl/source/filter/ipdf/pdfdocument.cxx |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 00c81f291922b09f3bd6ceb334d5aaae0bab5334
Author: Andrea Gelmini
Date: Mon Jul 3 11:36:08 2017 +0200
Fix typos
Change-Id: Iaf63c488f895c446bb54119d8c9f15e0adcd1eff
Reviewed-on: https://gerrit.libreoffice.org/39454
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/framework/source/uielement/progressbarwrapper.cxx
b/framework/source/uielement/progressbarwrapper.cxx
index 981e7eef3c53..c44a2ce6db99 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -55,7 +55,7 @@ void ProgressBarWrapper::setStatusBar( const uno::Reference<
awt::XWindow >& rSt
if ( m_bOwnsInstance )
{
-// dispose XWindow reference our our status bar
+// dispose XWindow reference of our status bar
uno::Reference< lang::XComponent > xComponent( m_xStatusBar,
uno::UNO_QUERY );
try
{
diff --git a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
index 16f57bc8a986..2260264b6b2a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
@@ -25,7 +25,7 @@
-Selects if the the user should be asked about updates or
not
+Selects if the user should be asked about updates or
not
Some Value
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx
b/sc/source/ui/drawfunc/drtxtob.cxx
index 92b092f758b0..8206cb2efa25 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -305,7 +305,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
if (!bDone)
ExecuteGlobal( rReq ); // normal at View
-// If "text" is received by InsertURL of ViewShell, the
the DrawShell is turned off !!!
+// If "text" is received by InsertURL of ViewShell, then
the DrawShell is turned off !!!
}
}
break;
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 4e9f72343351..d03aee27b4c0 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1277,7 +1277,7 @@ void DocxExport::WriteVBA()
uno::Reference xProjectStream;
if (xMacrosStream.is())
{
-// First handle the the project stream, this sets xProjectStream.
+// First handle the project stream, this sets xProjectStream.
std::unique_ptr
pIn(utl::UcbStreamHelper::CreateStream(xMacrosStream));
xProjectStream = GetFilter().openFragmentStream("word/vbaProject.bin",
"application/vnd.ms-office.vbaProject");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 74a5041e..d7bc33290396 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2594,7 +2594,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode&
rNode )
/*
If a given para is using the SvxFrameDirection::Environment direction
we
-cannot export that, its its ltr then that's ok as thats word's
+cannot export that, if it's ltr then that's ok as thats word's
default. Otherwise we must add a RTL attribute to our export list
*/
const SvxFrameDirectionItem* pItem = static_cast(
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx
b/vcl/source/filter/ipdf/pdfdocument.cxx
index e2ef15cafa98..1dd186e92801 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -2200,7 +2200,7 @@ size_t PDFDictionaryElement::Parse(const std::vector<
std::unique_ptrSetDictionary(pDictionary);
pThisDictionary = pDictionary;
pThisObject->SetDictionaryOffset(nDictionaryOffset);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source officecfg/registry
framework/source/uielement/toolbarmodemenucontroller.cxx |9
+
officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs |5 -
2 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 6d1e22a9b8c197673f43dcb00f3270dae812c8ae
Author: Szymon KÅos
Date: Thu Feb 23 17:24:31 2017 +0100
Make ToolbarMode's "IsExperimental" property non-nillable
Change-Id: Ia83776d7ee23fa56c0fc541c228c68b1832c3d11
Reviewed-on: https://gerrit.libreoffice.org/34585
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 1e6cc36..018253b 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -128,14 +128,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
OUString aLabel = comphelper::getString( aModeNode.getNodeValue(
"Label" ) );
OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
"CommandArg" ) );
long nPosition = comphelper::getINT32( aModeNode.getNodeValue(
"MenuPosition" ) );
-
-bool isExperimental = false;
-if ( aModeNode.hasByName( "IsExperimental" ) )
-{
-Any aExperimentalNode = aModeNode.getNodeValue( "IsExperimental" );
-if( aExperimentalNode.hasValue() )
-isExperimental = comphelper::getBOOL( aExperimentalNode );
-}
+bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue(
"IsExperimental" ) );
// Allow Notebookbar only in experimental mode
if ( isExperimental && !aMiscOptions.IsExperimentalMode() )
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index 50759f8..5d0f418 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -41,10 +41,13 @@
Position in the menu.
-
+
Enables entry only in the experimental mode.
+
+ false
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source officecfg/registry
framework/source/uielement/toolbarmodemenucontroller.cxx | 13
++
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 --
officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu |9
++
officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs |5 +++
4 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 50468779725c9eaccae17e4e39a6651f12e49340
Author: Szymon KÅos
Date: Sun Feb 19 16:36:08 2017 +0100
tdf#103323 Single Toolbar without experimental mode
Only Notebookbar mode should be marked as experimental.
This patch allows to enable Single Toolbar or Sidebar
mode without experimental mode activation.
Change-Id: I9dcf1602b2f560aaa9ea29c07c4a7ed473be0352
Reviewed-on: https://gerrit.libreoffice.org/34431
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx
b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 69aa1a6..1e6cc36 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -117,6 +117,7 @@ void ToolbarModeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
const Sequence aModeNodeNames (aModesNode.getNodeNames());
const sal_Int32 nCount(aModeNodeNames.getLength());
+SvtMiscOptions aMiscOptions;
for ( sal_Int32 nReadIndex = 0; nReadIndex < nCount; ++nReadIndex )
{
@@ -128,6 +129,18 @@ void ToolbarModeMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue(
"CommandArg" ) );
long nPosition = comphelper::getINT32( aModeNode.getNodeValue(
"MenuPosition" ) );
+bool isExperimental = false;
+if ( aModeNode.hasByName( "IsExperimental" ) )
+{
+Any aExperimentalNode = aModeNode.getNodeValue( "IsExperimental" );
+if( aExperimentalNode.hasValue() )
+isExperimental = comphelper::getBOOL( aExperimentalNode );
+}
+
+// Allow Notebookbar only in experimental mode
+if ( isExperimental && !aMiscOptions.IsExperimentalMode() )
+continue;
+
m_xPopupMenu->insertItem( nReadIndex+1, aLabel,
css::awt::MenuItemStyle::RADIOCHECK, nPosition );
rPopupMenu->setCommand( nReadIndex+1, aCommandArg );
}
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7b78273..0b860f7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5893,9 +5893,6 @@
Toolbar Layout
-
- true
-
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index a78d90e..4ee4b4f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -93,6 +93,9 @@
true
+
+true
+
3
@@ -204,6 +207,9 @@
true
+
+true
+
3
@@ -290,6 +296,9 @@
true
+
+true
+
3
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index 4a2a5ad..50759f8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -41,6 +41,11 @@
Position in the menu.
+
+
+ Enables entry only in the experimental mode.
+
+
Determines if Notebookbar is visible.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source officecfg/registry vcl/source
framework/source/uielement/uicommanddescription.cxx |8
+++---
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 12
+-
officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs |4 +--
vcl/source/helper/commandinfoprovider.cxx|5
+---
4 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit b23d20d6d2bf0ef4c9acf5f38d11e51cdceee271
Author: Samuel Mehrbrodt
Date: Mon Oct 17 15:12:03 2016 +0200
Make 'IsExperimental' property boolean
Change-Id: If88ea931ead8dd031fda9b17d9023a771ab0a0d0
Reviewed-on: https://gerrit.libreoffice.org/29970
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/framework/source/uielement/uicommanddescription.cxx
b/framework/source/uielement/uicommanddescription.cxx
index 0aac542..41b50d2 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -120,7 +120,7 @@ class ConfigurationAccess_UICommand : // Order is necessary
for right initializa
{
CmdToInfoMap() : bPopup( false ),
bCommandNameCreated( false ),
- nIsExperimental( 0 ),
+ bIsExperimental( false ),
nProperties( 0 ) {}
OUStringaLabel;
@@ -131,7 +131,7 @@ class ConfigurationAccess_UICommand : // Order is necessary
for right initializa
OUStringaTargetURL;
boolbPopup : 1,
bCommandNameCreated : 1;
-sal_Int32 nIsExperimental;
+boolbIsExperimental;
sal_Int32 nProperties;
};
@@ -338,7 +338,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache(
const OUString& aComman
aPropSeq[6].Name = m_aPropTargetURL;
aPropSeq[6].Value <<= pIter->second.aTargetURL;
aPropSeq[7].Name = m_aPropIsExperimental;
-aPropSeq[7].Value <<= pIter->second.nIsExperimental;
+aPropSeq[7].Value <<= pIter->second.bIsExperimental;
return makeAny( aPropSeq );
}
@@ -368,7 +368,7 @@ void ConfigurationAccess_UICommand::impl_fill(const
Reference< XNameAccess >& _x
xNameAccess->getByName( m_aPropUIPopupLabel ) >>=
aCmdToInfo.aPopupLabel;
xNameAccess->getByName( m_aPropUITooltipLabel ) >>=
aCmdToInfo.aTooltipLabel;
xNameAccess->getByName( m_aPropUITargetURL )>>=
aCmdToInfo.aTargetURL;
-xNameAccess->getByName( m_aPropUIIsExperimental ) >>=
aCmdToInfo.nIsExperimental;
+xNameAccess->getByName( m_aPropUIIsExperimental ) >>=
aCmdToInfo.bIsExperimental;
xNameAccess->getByName( m_aPropProperties ) >>=
aCmdToInfo.nProperties;
m_aCmdInfoCache.insert( CommandToInfoCache::value_type(
aNameSeq[i], aCmdToInfo ));
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 01fc956..a9bef87 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4012,8 +4012,8 @@
1
-
- 1
+
+ true
@@ -4137,8 +4137,8 @@
Notebookbar
-
- 1
+
+ true
@@ -5890,8 +5890,8 @@
Toolbar Layout
-
- 1
+
+ true
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
index 6ff9c43..b82a25ac 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs
@@ -51,9 +51,9 @@
The actual command to use for everything except label/icon,
typically when the main command doesn't map to a valid application slot.
-
+
- If set to '1', this command is available only when
Experimental features are activated.
+ If set to "true", this command is available only when
Experimental features are activated.
diff --git a/vcl/source/helper/commandinfoprovider.cxx
b/vcl/source/helper/commandinfoprovider.cxx
index 881a008..2b23821 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -317,9 +317,8 @@ bool CommandInfoProvider::IsExperimental(const OUString&
rsCommandName,
{
if (aProperties[nIndex].Name == "IsExperimental")
[Libreoffice-commits] core.git: framework/source officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk sd/uiconfig sd/UIConfig_simpress.mk sfx2/source
framework/source/uielement/notebookbarmenucontroller.cxx | 30 +-
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 104
+--
officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs | 44 ++-
sc/UIConfig_scalc.mk |2
sc/uiconfig/scalc/ui/notebookbar_groups.ui | 133
--
sc/uiconfig/scalc/ui/notebookbar_single.ui | 133
--
sd/UIConfig_simpress.mk|2
sd/uiconfig/simpress/ui/notebookbar_groups.ui | 133
--
sd/uiconfig/simpress/ui/notebookbar_single.ui | 133
--
sfx2/source/notebookbar/SfxNotebookBar.cxx | 65 +++-
10 files changed, 181 insertions(+), 598 deletions(-)
New commits:
commit af3df5340d5d1a26b0d031b03c85cf715ef6ad57
Author: Szymon KÅos
Date: Wed Sep 21 15:28:26 2016 +0200
Notebookbar: separate .ui files settings for each module
* each module have own list of implementations
* deleted placeholder .ui files from Calc and Impress
Change-Id: Ib7d4cafbb332447e769ca753003d31e9f3025f0a
Reviewed-on: https://gerrit.libreoffice.org/29143
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx
b/framework/source/uielement/notebookbarmenucontroller.cxx
index c5de77f..7173356 100644
--- a/framework/source/uielement/notebookbarmenucontroller.cxx
+++ b/framework/source/uielement/notebookbarmenucontroller.cxx
@@ -84,9 +84,29 @@ void NotebookbarMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
SolarMutexGuard aSolarMutexGuard;
resetPopupMenu( rPopupMenu );
+const Reference xModuleManager =
frame::ModuleManager::create( m_xContext );
+vcl::EnumContext::Application eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(m_xFrame));
+
+OUStringBuffer aPath("org.openoffice.Office.UI.Notebookbar/Applications/");
+switch ( eApp )
+{
+case vcl::EnumContext::Application::Application_Writer:
+aPath.append("Writer");
+break;
+case vcl::EnumContext::Application::Application_Calc:
+aPath.append("Calc");
+break;
+case vcl::EnumContext::Application::Application_Impress:
+aPath.append("Impress");
+break;
+default:
+break;
+}
+aPath.append("/Implementations");
+
const utl::OConfigurationTreeRoot aImplementationsNode(
m_xContext,
-
OUString("org.openoffice.Office.UI.Notebookbar/Implementations"),
+OUString( aPath.makeStringAndClear() ),
false);
if ( !aImplementationsNode.isValid() )
return;
@@ -222,7 +242,7 @@ void SAL_CALL NotebookbarMenuController::itemSelected(
const css::awt::MenuEvent
void SAL_CALL NotebookbarMenuController::itemActivated( const
css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
{
-OUString aActive = officecfg::Office::UI::Notebookbar::Active::get(
m_xContext );
+OUString aActive;
const Reference xModuleManager =
frame::ModuleManager::create( m_xContext );
vcl::EnumContext::Application eApp =
vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(m_xFrame));
@@ -232,15 +252,15 @@ void SAL_CALL NotebookbarMenuController::itemActivated(
const css::awt::MenuEven
{
case vcl::EnumContext::Application::Application_Writer:
aPath.append("Writer");
+aActive = officecfg::Office::UI::Notebookbar::ActiveWriter::get(
m_xContext );
break;
case vcl::EnumContext::Application::Application_Calc:
aPath.append("Calc");
+aActive = officecfg::Office::UI::Notebookbar::ActiveCalc::get(
m_xContext );
break;
case vcl::EnumContext::Application::Application_Impress:
aPath.append("Impress");
-break;
-case vcl::EnumContext::Application::Application_Draw:
-aPath.append("Draw");
+aActive = officecfg::Office::UI::Notebookbar::ActiveImpress::get(
m_xContext );
break;
default:
break;
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
index 4b3c45a..e339abb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu
@@ -1,42 +1,82 @@
http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:install="http://openoffice.org/2004/installation"; oor:name="Not
[Libreoffice-commits] core.git: framework/source officecfg/registry sw/uiconfig
framework/source/uielement/toolbarmanager.cxx| 23
+
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 24
+-
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 +-
sw/uiconfig/swriter/toolbar/standardbar.xml | 18
+++
4 files changed, 38 insertions(+), 33 deletions(-)
New commits:
commit b1a5e34e27c0118f319aebbc5a6c9cdf05929239
Author: Jan Holesovsky
Date: Mon Sep 22 18:05:59 2014 +0200
Revert "Related fdo#81475 Improve toolbar tooltips in Writer standard
toolbar"
Unfortunately this breaks the Edit menu - it is now crowded with long texts;
so while it may improve the toolbar, it definitely breaks the menu.
This reverts commit b59c5ace4b7213ffd62495d0c0e5b6411f5071be.
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 74d66a4..39ecdb2 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1276,18 +1276,23 @@ void ToolBarManager::FillToolbar( const Reference<
XIndexAccess >& rItemContaine
}
m_pToolBar->InsertItem( nId, aString, nItemBits );
m_pToolBar->SetItemCommand( nId, aCommandURL );
-OUString sQuickHelp( aString );
-// Use custom tooltip if available
if ( !aTooltip.isEmpty() )
-sQuickHelp = aTooltip;
-OUString sShortCut;
-if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
-sQuickHelp += " (";
-sQuickHelp += sShortCut;
-sQuickHelp += ")";
+m_pToolBar->SetQuickHelpText( nId, aTooltip );
+}
+else
+{
+ OUString sQuickHelp( aString );
+ OUString sShortCut;
+ if( RetrieveShortcut( aCommandURL, sShortCut ) )
+ {
+ sQuickHelp += " (";
+ sQuickHelp += sShortCut;
+ sQuickHelp += ")";
+ }
+
+m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
}
-m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
if ( !aLabel.isEmpty() )
{
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e0a3206..60fed19 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1264,7 +1264,7 @@
- Undo Last Action
+ Undo
@@ -2019,7 +2019,7 @@
- Print Document Directly
+ Print File Directly
1
@@ -2246,7 +2246,7 @@
- ~Document...
+ ~File...
1
@@ -3077,7 +3077,7 @@
- Check ~Spelling and Grammar...
+ ~Spelling...
@@ -3087,7 +3087,7 @@
- Check ~Spelling and Grammar...
+ ~Spelling and Grammar...
1
@@ -3103,7 +3103,7 @@
- Check ~Spelling and Grammar...
+ ~Spelling...
1
@@ -3366,7 +3366,7 @@
- Redo Last Action
+ Redo
1
@@ -3382,7 +3382,7 @@
- Clone Formatting (double click for
multi-selection)
+ Format Paintbrush (double click for
multi-selection)
9
@@ -3403,7 +3403,7 @@
- Cu~t Selection
+ Cu~t
1
@@ -3411,7 +3411,7 @@
- ~Copy Selection
+ ~Copy
1
@@ -3419,7 +3419,7 @@
- ~Paste from Clipboard
+ ~Paste
1
@@ -5445,7 +5445,7 @@
- Toggle Auto ~Spellcheck
+ ~Spellcheck
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c0bd421..59f52b2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -88,7 +88,7 @@
-
[Libreoffice-commits] core.git: framework/source officecfg/registry sw/uiconfig
framework/source/uielement/toolbarmanager.cxx| 23
+++--
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 24
+-
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 +-
sw/uiconfig/swriter/toolbar/standardbar.xml | 18
+++
4 files changed, 33 insertions(+), 38 deletions(-)
New commits:
commit b59c5ace4b7213ffd62495d0c0e5b6411f5071be
Author: Samuel Mehrbrodt
Date: Sat Sep 6 12:03:17 2014 +0200
Related fdo#81475 Improve toolbar tooltips in Writer standard toolbar
and show the shortcut in the tooltip also when there is a custom tooltip
Change-Id: Ia3f5d17df3769479f7aacf63a83507ccb8593103
Reviewed-on: https://gerrit.libreoffice.org/11303
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 39ecdb2..74d66a4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1276,23 +1276,18 @@ void ToolBarManager::FillToolbar( const Reference<
XIndexAccess >& rItemContaine
}
m_pToolBar->InsertItem( nId, aString, nItemBits );
m_pToolBar->SetItemCommand( nId, aCommandURL );
+OUString sQuickHelp( aString );
+// Use custom tooltip if available
if ( !aTooltip.isEmpty() )
+sQuickHelp = aTooltip;
+OUString sShortCut;
+if( RetrieveShortcut( aCommandURL, sShortCut ) )
{
-m_pToolBar->SetQuickHelpText( nId, aTooltip );
-}
-else
-{
- OUString sQuickHelp( aString );
- OUString sShortCut;
- if( RetrieveShortcut( aCommandURL, sShortCut ) )
- {
- sQuickHelp += " (";
- sQuickHelp += sShortCut;
- sQuickHelp += ")";
- }
-
-m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
+sQuickHelp += " (";
+sQuickHelp += sShortCut;
+sQuickHelp += ")";
}
+m_pToolBar->SetQuickHelpText( nId, sQuickHelp );
if ( !aLabel.isEmpty() )
{
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 60fed19..e0a3206 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1264,7 +1264,7 @@
- Undo
+ Undo Last Action
@@ -2019,7 +2019,7 @@
- Print File Directly
+ Print Document Directly
1
@@ -2246,7 +2246,7 @@
- ~File...
+ ~Document...
1
@@ -3077,7 +3077,7 @@
- ~Spelling...
+ Check ~Spelling and Grammar...
@@ -3087,7 +3087,7 @@
- ~Spelling and Grammar...
+ Check ~Spelling and Grammar...
1
@@ -3103,7 +3103,7 @@
- ~Spelling...
+ Check ~Spelling and Grammar...
1
@@ -3366,7 +3366,7 @@
- Redo
+ Redo Last Action
1
@@ -3382,7 +3382,7 @@
- Format Paintbrush (double click for
multi-selection)
+ Clone Formatting (double click for
multi-selection)
9
@@ -3403,7 +3403,7 @@
- Cu~t
+ Cu~t Selection
1
@@ -3411,7 +3411,7 @@
- ~Copy
+ ~Copy Selection
1
@@ -3419,7 +3419,7 @@
- ~Paste
+ ~Paste from Clipboard
1
@@ -5445,7 +5445,7 @@
- ~Spellcheck
+ Toggle Auto ~Spellcheck
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 59f52b2..c0bd421 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -88,7 +88,7 @@
[Libreoffice-commits] core.git: framework/source officecfg/registry sfx2/inc sfx2/source sfx2/util
framework/source/uielement/recentfilesmenucontroller.cxx |5
officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu |5
sfx2/inc/backingcomp.hxx | 13 ++
sfx2/source/dialog/backingcomp.cxx| 54
+-
sfx2/source/dialog/backingwindow.cxx |5
sfx2/source/dialog/backingwindow.hxx |2
sfx2/util/sfx.component |1
7 files changed, 82 insertions(+), 3 deletions(-)
New commits:
commit d930cefbe65d8b7f21100fcbf2ddcd977dd15cb1
Author: Zolnai Tamás
Date: Tue Jan 7 22:57:58 2014 +0100
Startcenter: Refresh RecentDocsView when select 'Clear list' menu option
Change-Id: I9cbe647563699b9b610661003084d2cd16093f9a
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 586a9af..3866355 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -281,7 +281,12 @@ void SAL_CALL RecentFilesMenuController::itemSelected(
const css::awt::MenuEvent
OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8
).getStr() );
if ( aCommand.startsWith( CMD_CLEAR_LIST ) )
+{
SvtHistoryOptions().Clear( ePICKLIST );
+dispatchCommand(
+"vnd.org.libreoffice.recentdocs:ClearRecentFileList",
+::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >() );
+}
else
executeEntry( rEvent.MenuId-1 );
}
diff --git a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 8bb848a..62f7566 100644
--- a/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -70,5 +70,10 @@
vnd.com.sun.star.comp.PresentationMinimizer:*
+
+
+vnd.org.libreoffice.recentdocs:*
+
+
diff --git a/sfx2/inc/backingcomp.hxx b/sfx2/inc/backingcomp.hxx
index d4d86fe..7d1b38e 100644
--- a/sfx2/inc/backingcomp.hxx
+++ b/sfx2/inc/backingcomp.hxx
@@ -30,6 +30,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -57,6 +59,8 @@ class BackingComp : public css::lang::XTypeProvider
, public css::lang::XInitialization
, public css::frame::XController // => XComponent
, public css::awt::XKeyListener // => XEventListener
+ , public css::frame::XDispatchProvider
+ , public css::frame::XDispatch
, public ::cppu::OWeakObject
{
//__
@@ -119,6 +123,15 @@ class BackingComp : public css::lang::XTypeProvider
virtual void SAL_CALL addEventListener ( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException);
+// XDispatchProvider
+virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName ,
sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException );
+virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch
> > SAL_CALL queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& lDescriptions) throw(
css::uno::RuntimeException );
+
+// XDispatch
+virtual void SAL_CALL dispatch( const css::util::URL& aURL, const
css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(
css::uno::RuntimeException );
+virtual void SAL_CALL addStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(
css::uno::RuntimeException );
+virtual void SAL_CALL removeStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw(
css::uno::RuntimeException );
+
//__
// helper
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index c34e6dc..5e357e3 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -102,7 +102,9 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/
const css::uno::Type&
static_cast< css::frame::XController* >(this),
static_cast< css::lang::XComponent* >(this),
static_cast< css::lang::XEventListener* >(this),
-static_cast< css::awt::XKeyListener* >(static_cast<
css
