[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-07-01 Thread Caolán McNamara (via logerrit) 
 sfx2/source/doc/objmisc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit f9bd290d08f08464103372633462421ba0918754
Author: Caolán McNamara 
AuthorDate: Mon Jun 8 21:22:58 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Jul 1 11:27:38 2020 +0200

tdf#128006 allow documents inside odbs to be as trusted as their container

Change-Id: Id19d3805ef2e3282c1a8e89dd8edcccbf4ac4db6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96210
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit ac65ade24aa10c0a39d7d38576ad54bd00724455)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97496
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 25db3d85238e..681940462720 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1763,7 +1763,12 @@ OUString SfxObjectShell_Impl::getDocumentLocation() const
 // for documents made from a template: get the name of the template
 sLocation = rDocShell.getDocProperties()->getTemplateURL();
 }
+
+// tdf#128006 take document base url as location
+if (sLocation.isEmpty())
+sLocation = rDocShell.getDocumentBaseURL();
 }
+
 return sLocation;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-06-04 Thread Miklos Vajna (via logerrit) 
 sfx2/source/doc/objserv.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit b52d304969a15e00d82745f4d2f96c04f188eb97
Author: Miklos Vajna 
AuthorDate: Tue Jun 2 16:45:44 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 4 12:46:12 2020 +0200

tdf#130354 sfx2: make PDF signing UI work again

Regression from commit 9112c18524c9f5e67d6cbb282586a439e3020cdb (Don't
create unnecessary tempfiles for opened doc, 2019-10-18), restore the
temporary file creation for the PDF case, as it's needed for PDF signing
to work.

(cherry picked from commit 058caeef45f9abf12e4e243aafbbb1c2ebcbc057)

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

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 51276917bd5e..5c5b7826e075 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1594,6 +1594,10 @@ uno::Sequence< security::DocumentSignatureInformation > 
SfxObjectShell::GetDocum
 else
 {
 // Not ZIP-based, e.g. PDF.
+
+// Create temp file if needed.
+GetMedium()->CreateTempFile(/*bReplace=*/false);
+
 std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(GetMedium()->GetName(), 
StreamMode::READ));
 uno::Reference xStream(new 
utl::OStreamWrapper(*pStream));
 uno::Reference xInputStream(xStream, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-04-26 Thread Roman Kuznetsov (via logerrit) 
 sfx2/source/control/thumbnailview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5e845e5230ed6982bfef761e86d552f1c96b67ad
Author: Roman Kuznetsov 
AuthorDate: Sat Apr 25 11:51:33 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Apr 27 00:56:19 2020 +0200

tdf#91818 disable scrollbar in Start Center when it isn't needed

Change-Id: Ib3b7be6dd93a7f1c75f01ffe53ff7f7c19b14342
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92773
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
Reviewed-by: Roman Kuznetsov 
(cherry picked from commit 10dba26804cc0c14f74069c26112e75dacf3865b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92774
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 6f4ca606ea1b..846b0e8d95d6 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -406,6 +406,7 @@ void ThumbnailView::CalculateItemPositions (bool 
bScrollBarUsed)
 nPageSize = 1;
 mpScrBar->SetPageSize( nPageSize );
 mpScrBar->Show( mbScroll );
+mpScrBar->Enable( mbScroll );
 }
 
 // delete ScrollBar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-04-16 Thread Jim Raykowski (via logerrit) 
 sfx2/source/notebookbar/SfxNotebookBar.cxx |2 +-
 sfx2/source/view/viewfrm.cxx   |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9efcbef08c406e5d9b9486c28f3979f875953c30
Author: Jim Raykowski 
AuthorDate: Sat Apr 4 17:36:22 2020 -0800
Commit: Xisco Faulí 
CommitDate: Thu Apr 16 11:08:33 2020 +0200

tdf#131209 reload the notebook bar

Change-Id: Id5a1b63c0f907a8f20406d2fa1c08c1aff34b91c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91702
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 68c96a54fef93b9f735aeb6c9ae07171e934132a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92184
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index a2d7f1f39b17..8f97aa045918 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -332,7 +332,7 @@ bool SfxNotebookBar::StateMethod(SfxBindings& rBindings, 
const OUString& rUIFile
 {
 SfxFrame& rFrame = rBindings.GetDispatcher_Impl()->GetFrame()->GetFrame();
 return StateMethod(rFrame.GetSystemWindow(), rFrame.GetFrameInterface(), 
rUIFile,
-   bReloadNotebookbar || 
rBindings.GetDispatcher_Impl()->IsUpdated_Impl());
+   bReloadNotebookbar);
 }
 
 bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6029bdc341e3..5a64599e5894 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -143,6 +143,7 @@ using ::com::sun::star::container::XIndexContainer;
 #include 
 #include 
 #include "impviewframe.hxx"
+#include 
 #include 
 
 #define ShellClass_SfxViewFrame
@@ -860,6 +861,9 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
 UpdateDocument_Impl();
 
+if 
(vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface()) 
== "com.sun.star.text.TextDocument")
+
sfx2::SfxNotebookBar::ReloadNotebookBar("modules/swriter/ui/");
+
 try
 {
 for (auto const& viewFrame : aViewFrames)
@@ -1425,6 +1429,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 }
 }
 
+if 
(vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface()) 
== "com.sun.star.text.TextDocument")
+
sfx2::SfxNotebookBar::ReloadNotebookBar("modules/swriter/ui/");
+
 if 
(SfxClassificationHelper::IsClassified(m_xObjSh->getDocProperties()))
 {
 // Document has BAILS properties, display an infobar 
accordingly.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-04-15 Thread Caolán McNamara (via logerrit) 
 sfx2/source/doc/sfxbasemodel.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit dafa1bbf09e1df38cc0758b9f4c8a0ca186b31d2
Author: Caolán McNamara 
AuthorDate: Wed Apr 15 16:09:09 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 16 07:20:14 2020 +0200

tdf#126828 don't crash fetching cmis properties from disposed SfxBaseModel

Change-Id: Ie064632667b40201e0d266c64e3068c4d1983c7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit db677c854a37031235b0f42b4f4f48560149754f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92289
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index a136f74f2886..9849ac86d642 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2458,8 +2458,10 @@ void SAL_CALL SfxBaseModel::notifyDocumentEvent( const 
OUString&, const Referenc
 throw lang::NoSupportException("SfxBaseModel controls all the sent 
notifications itself!" );
 }
 
-Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties()
+Sequence SAL_CALL SfxBaseModel::getCmisProperties()
 {
+if (impl_isDisposed())
+return Sequence();
 return m_pData->m_cmisProperties;
 }
 
@@ -2597,7 +2599,9 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, 
const OUString& rMessage
 
 uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( )
 {
-uno::Sequence< document::CmisVersion > aVersions;
+uno::Sequence aVersions;
+if (impl_isDisposed())
+return aVersions;
 SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium();
 if ( pMedium )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-04-07 Thread Jim Raykowski (via logerrit) 
 sfx2/source/dialog/templdlg.cxx |   23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 2d5ea18732c6cc34d82575ae15d2c495da94375b
Author: Jim Raykowski 
AuthorDate: Sun Mar 15 23:46:22 2020 -0800
Commit: Eike Rathke 
CommitDate: Tue Apr 7 16:47:48 2020 +0200

tdf#131190 Make custom page styles deletable again in Calc

 This is a combination of 2 commits.

tdf#131190 Make custom page styles deletable again in Calc

Here is a patch to return the ability to delete custom page styles in
Calc. This was lost in commit 30c9bc76d0718f0c01d34f81845d88413645b42c

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90547
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit bb844eb299b614c1fa56e140630db070cf709a02)

tdf#131190 Make custom page styles deletable again in Calc

Return the ability to delete custom page styles in Calc. This was lost
in commit 30c9bc76d0718f0c01d34f81845d88413645b42c

ae402cc048fde7ffd3ca2696c08d5e54cc30d1be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91672
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

Change-Id: I18936585cfbe45e0254beb882adc8709781f57e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91404
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 55d8a0f7d515..1714f65dbe00 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2011,8 +2011,27 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
 pStyleSheetPool->Find(aTemplName,eFam, pTreeBox->IsVisible()? 
SfxStyleSearchBits::All : nFilter);
 
 OSL_ENSURE(pStyle, "Style not found");
-if (pStyle && pStyle->IsUserDefined() && (pStyle->HasParentSupport() 
|| !pStyle->IsUsed()))
-bEnableDelete = true;
+if (pStyle && pStyle->IsUserDefined())
+{
+if (pStyle->HasClearParentSupport() || !pStyle->IsUsed())
+{
+bEnableDelete = true;
+}
+else if (pStyle->GetFamily() == SfxStyleFamily::Page)
+{
+// Hack to allow Calc page styles to be deleted,
+// remove when IsUsed is fixed for Calc page styles.
+SfxViewFrame* pFrame = GetObjectShell()->GetFrame();
+if (pFrame)
+{
+uno::Reference xFrame = 
pFrame->GetFrame().GetFrameInterface();
+if (vcl::CommandInfoProvider::GetModuleIdentifier(xFrame) 
== "com.sun.star.sheet.SpreadsheetDocument")
+{
+bEnableDelete = true;
+}
+}
+}
+}
 }
 EnableDel(bEnableDelete);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-04-07 Thread Michael Weghorn (via logerrit) 
 sfx2/source/view/viewprn.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit eb40f8ba7d55489bd8bc2f8940dc5829402cded8
Author: Michael Weghorn 
AuthorDate: Fri Apr 3 11:54:42 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Apr 7 10:18:42 2020 +0200

tdf#131849 Handle changed doc print options when printer changed

Previously, the SfxPrinterChangeFlags::OPTIONS flag was
only set for the case that the printer itself was considered
unchanged ('else' case below).

However, this also needs to be done when the printer is
considered to have changed, so the flag is properly
passed in the call to 'SetPrinter' below, to make
sure that changes in document-specific options are
properly propagated.

Change-Id: Id91ebbbf40888e52149b40ac25f188af4be425f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91626
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 21fc54777d5dedc33d6bfa23b9f1072a6667eebe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91519
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2347f69584c4..8ee3fe18de04 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -542,6 +542,11 @@ void SfxViewShell::SetPrinter_Impl( VclPtr& 
pNewPrinter )
 if ( (aTempPrtName != aDocPrtName) || (pDocPrinter->IsDefPrinter() != 
pNewPrinter->IsDefPrinter()) )
 {
 nChangedFlags |= 
SfxPrinterChangeFlags::PRINTER|SfxPrinterChangeFlags::JOBSETUP;
+if ( ! (pNewPrinter->GetOptions() == pDocPrinter->GetOptions()) )
+{
+nChangedFlags |= SfxPrinterChangeFlags::OPTIONS;
+}
+
 pDocPrinter = pNewPrinter;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-03-31 Thread Julian Kalinowski (via logerrit) 
 sfx2/source/doc/docfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37cb8ac6abfc9bfd44aed1a51f6374ad1e23583a
Author: Julian Kalinowski 
AuthorDate: Tue Mar 31 12:45:31 2020 +0200
Commit: Xisco Faulí 
CommitDate: Tue Mar 31 15:28:20 2020 +0200

tdf#128662 Fix exception when accessing empty lock list

This fixes an Access Violation Exception when a WebDAV server says a
resource is locked but does return an empty lockdiscovery element on
WebDAV Propfind. Without this patch, the code only checks that a list
exists, but it should also check if it contains elements before
accessing it.

Change-Id: I5f555a9b5805102242392b018ab5a8009c7a203c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91412
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91392
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 0e646ae723b5..5d00d39bd837 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1206,7 +1206,7 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
 
 uno::Sequence aLocks;
 // getting the property, send a PROPFIND to 
the server over the net
-if 
(aContentToLock.getPropertyValue("DAV:lockdiscovery") >>= aLocks)
+if 
((aContentToLock.getPropertyValue("DAV:lockdiscovery") >>= aLocks) && 
aLocks.hasElements())
 {
 // got at least a lock, show the owner of 
the first lock returned
 css::ucb::Lock aLock = aLocks[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-03-26 Thread ilhan (via logerrit) 
 sfx2/source/sidebar/Tools.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 206e1ec3813a2d2765a206de75c70edd3b39f091
Author: ilhan 
AuthorDate: Wed Mar 25 14:01:57 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu Mar 26 12:50:58 2020 +0100

tdf#130310 Load Sidebar Icons for extensions

Changed else statement to include load of extension icons.

Change-Id: I76ad068825ad1406329ca3807b2a919988091cbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91108
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index cebfc93013d9..dcd90eb29d3b 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -53,12 +53,10 @@ Image Tools::GetImage (
 {
 if (rsURL.getLength() > 0)
 {
-OUString sPath;
-
 if (rsURL.startsWith(".uno:"))
 return vcl::CommandInfoProvider::GetImageForCommand(rsURL, 
rxFrame);
 
-else if (rsURL.startsWith("private:graphicrepository/", ))
+else
 return Image(rsURL);
 }
 return Image();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-03-25 Thread Tor Lillqvist (via logerrit) 
 sfx2/source/sidebar/SidebarController.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit af8927b6aa210095bbf3b693ec56b4adb90e9d1d
Author: Tor Lillqvist 
AuthorDate: Fri Feb 28 17:02:30 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Mar 25 08:08:41 2020 +0100

tdf#130348: Add special case for ChartDeck, too

Change-Id: Idf6cc1469f074debfc4351a58826a3a7411391ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89722
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit 6a031edca26cadd5917a94de2d3b6a706197a8fc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89783
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 794cfef82b81..5c69f97d0b59 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -435,7 +435,9 @@ void SidebarController::NotifyResize()
 // it's the PropertyDeck that really has many panes
 // that can collapse or expand. For others, limit
 // the height to something sensible.
-const sal_Int32 nExtHeight = (msCurrentDeckId == 
"PropertyDeck" ? 2000 : 600);
+// tdf#130348: Add special case for ChartDeck, too.
+const sal_Int32 nExtHeight = (msCurrentDeckId == 
"PropertyDeck" ? 2000 :
+  (msCurrentDeckId == "ChartDeck" 
? 1200 : 600));
 // No TabBar in LOK (use nWidth in full).
 mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nExtHeight);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-02-26 Thread Heiko Tietze (via logerrit) 
 sfx2/source/control/recentdocsview.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ff703b87e1f9872aeff36a47ac813390befc5522
Author: Heiko Tietze 
AuthorDate: Tue Feb 25 14:16:22 2020 +0100
Commit: Xisco Faulí 
CommitDate: Wed Feb 26 14:27:34 2020 +0100

Resolves tdf#130742 - Flat ODF in start center

Added fodt,fods,fopd,fodg to typeMatchesExtension

Change-Id: Ife8139af87ecc5af8a5e98c9d9dd7830c3a3231a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89455
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit f4b5b12fbe7eb0260119445ac39a28427fef3ee6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89514
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index 414f1236ce9f..61a2f35ac861 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -154,21 +154,21 @@ bool RecentDocsView::typeMatchesExtension(ApplicationType 
type, const OUString &
 {
 bool bRet = false;
 
-if (rExt == "odt" || rExt == "doc" || rExt == "docx" ||
+if (rExt == "odt" || rExt == "fodt" || rExt == "doc" || rExt == "docx" ||
 rExt == "rtf" || rExt == "txt" || rExt == "odm" || rExt == "otm")
 {
 bRet = static_cast(type & ApplicationType::TYPE_WRITER);
 }
-else if (rExt == "ods" || rExt == "xls" || rExt == "xlsx")
+else if (rExt == "ods" || rExt == "fods" || rExt == "xls" || rExt == 
"xlsx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_CALC);
 }
-else if (rExt == "odp" || rExt == "pps" || rExt == "ppt" ||
+else if (rExt == "odp" || rExt == "fodp" || rExt == "pps" || rExt == "ppt" 
||
 rExt == "pptx")
 {
 bRet = static_cast(type & ApplicationType::TYPE_IMPRESS);
 }
-else if (rExt == "odg")
+else if (rExt == "odg" || rExt == "fodg")
 {
 bRet = static_cast(type & ApplicationType::TYPE_DRAW);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2020-01-17 Thread Xisco Faulí (via logerrit) 
 sfx2/source/control/recentdocsviewitem.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d720e120b6534ff2fdf6cb11f0b46eca454d4e34
Author: Xisco Faulí 
AuthorDate: Fri Jan 17 14:44:21 2020 +0100
Commit: Noel Grandin 
CommitDate: Fri Jan 17 20:50:26 2020 +0100

tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"

This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137.

Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e

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

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index 908a679a5629..85d84ddc699d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -91,7 +91,8 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView 
, const OUStri
 }
 
 // create empty, and copy the default thumbnail in
-aThumbnail = BitmapEx(aThumbnailSize, 24);
+sal_uInt8 nAlpha = 255;
+aThumbnail = BitmapEx(Bitmap(aThumbnailSize, 24), 
AlphaMask(aThumbnailSize, ));
 
 aThumbnail.CopyPixel(
 ::tools::Rectangle(Point((aThumbnailSize.Width() - 
aExtSize.Width()) / 2, (aThumbnailSize.Height() - aExtSize.Height()) / 2), 
aExtSize),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source uui/source

2019-12-18 Thread Jan-Marek Glogowski (via logerrit) 
 sfx2/source/doc/docmacromode.cxx |   10 +-
 uui/source/secmacrowarnings.cxx  |9 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 9cdb97cd93e60a0faf0a531949d94cff79e1aab9
Author: Jan-Marek Glogowski 
AuthorDate: Tue Dec 10 18:42:40 2019 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Wed Dec 18 12:14:03 2019 +0100

tdf#129311 don't allow temporary trusted certs

This simply skips the DocumentMacroConfirmationRequest, if the
macro security level (MSL) is *High* and the list of trusted
authors is read-only. For the MSL *Medium*, the check box of
the dialog is hidden with read-only trusted authors.

Change-Id: If6c08e4fdbf200e778d181370cc73fd947cecff5
Reviewed-on: https://gerrit.libreoffice.org/84887
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 71c6f438cecc3ce5e8060efe1df840652885701c)
Reviewed-on: https://gerrit.libreoffice.org/85299

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 13954b06f6d8..492bd0a63009 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -225,11 +225,17 @@ namespace sfx2
 if ( nMacroExecutionMode != MacroExecMode::FROM_LIST )
 {
 // the trusted macro check will also retrieve the signature 
state ( small optimization )
-bool bHasTrustedMacroSignature = 
m_xData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode != 
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
+const SvtSecurityOptions aSecOption;
+const bool bAllowUIToAddAuthor = nMacroExecutionMode != 
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN
+ && (nMacroExecutionMode == 
MacroExecMode::ALWAYS_EXECUTE
+ || 
!aSecOption.IsReadOnly(SvtSecurityOptions::EOption::MacroTrustedAuthors));
+const bool bHasTrustedMacroSignature = 
m_xData->m_rDocumentAccess.hasTrustedScriptingSignature(bAllowUIToAddAuthor);
 
 SignatureState nSignatureState = 
m_xData->m_rDocumentAccess.getScriptingSignatureState();
 if ( nSignatureState == SignatureState::BROKEN )
 {
+if (!bAllowUIToAddAuthor)
+lcl_showDocumentMacrosDisabledError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
 return disallowMacroExecution();
 }
 else if ( bHasTrustedMacroSignature )
@@ -241,6 +247,8 @@ namespace sfx2
|| nSignatureState == SignatureState::NOTVALIDATED )
 {
 // there is valid signature, but it is not from the 
trusted author
+if (!bAllowUIToAddAuthor)
+lcl_showDocumentMacrosDisabledError(rxInteraction, 
m_xData->m_bDocMacroDisabledMessageShown);
 return disallowMacroExecution();
 }
 }
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 6c6e343a08f0..0bc2e1d04d72 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -137,9 +137,14 @@ void MacroWarning::InitControls()
 {
 mxViewSignsBtn->connect_clicked(LINK(this, MacroWarning, 
ViewSignsBtnHdl));
 mxViewSignsBtn->set_sensitive(false);
-mxAlwaysTrustCB->connect_clicked(LINK(this, MacroWarning, 
AlwaysTrustCheckHdl));
 
-mnActSecLevel = SvtSecurityOptions().GetMacroSecurityLevel();
+const SvtSecurityOptions aSecOption;
+if 
(!aSecOption.IsReadOnly(SvtSecurityOptions::EOption::MacroTrustedAuthors))
+mxAlwaysTrustCB->connect_clicked(LINK(this, MacroWarning, 
AlwaysTrustCheckHdl));
+else
+mxAlwaysTrustCB->set_visible(false);
+
+mnActSecLevel = aSecOption.GetMacroSecurityLevel();
 if ( mnActSecLevel >= 2 )
 mxEnableBtn->set_sensitive(false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2019-12-15 Thread Jim Raykowski (via logerrit) 
 sfx2/source/dialog/infobar.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b26de926aad67b266509e75829061417d7320ec7
Author: Jim Raykowski 
AuthorDate: Sun Nov 24 21:29:57 2019 -0900
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Dec 16 07:10:28 2019 +0100

tdf#129005 Make Infobar push buttons keyboard accessible

Also indicate infobar has keyboard focus by shading the close button
when infobar gets focus. And as a bonus shade the close button on
mouseover.

Change-Id: Ie714f3e6d1f13d44ced94a02af398c5c75607b94
Reviewed-on: https://gerrit.libreoffice.org/83639
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit ac11dd8365c9e9de67717d18b7983af1eca17eaf)
Reviewed-on: https://gerrit.libreoffice.org/85001
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 8dd52ed32a92..3479fe72ad7d 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -135,8 +135,12 @@ void SfxCloseButton::Paint(vcl::RenderContext& 
rRenderContext, const ::tools::Re
 aPolygon.append(B2DPoint(aRect.Left(), aRect.Bottom()));
 aPolygon.setClosed(true);
 
+Color aBackgroundColor(m_aBackgroundColor);
+if (IsMouseOver() || HasFocus())
+aBackgroundColor.ApplyTintOrShade(-2000);
+
 PolyPolygonColorPrimitive2D* pBack =
-new PolyPolygonColorPrimitive2D(B2DPolyPolygon(aPolygon), 
m_aBackgroundColor);
+new PolyPolygonColorPrimitive2D(B2DPolyPolygon(aPolygon), 
aBackgroundColor.getBColor());
 aSeq[0] = pBack;
 
 LineAttribute aLineAttribute(m_aForegroundColor, 2.0);
@@ -180,7 +184,7 @@ SfxInfoBarWindow::SfxInfoBarWindow(vcl::Window* pParent, 
const OUString& sId,
InfobarType ibType,
bool bShowCloseButton,
WinBits nMessageStyle = WB_LEFT|WB_VCENTER) :
-Window(pParent, 0),
+Window(pParent, WB_DIALOGCONTROL),
 m_sId(sId),
 m_eType(ibType),
 m_pImage(VclPtr::Create(this, nMessageStyle)),
@@ -189,6 +193,7 @@ SfxInfoBarWindow::SfxInfoBarWindow(vcl::Window* pParent, 
const OUString& sId,
 m_pCloseBtn(VclPtr::Create(this)),
 m_aActionBtns()
 {
+m_pCloseBtn->SetStyle(WB_DEFBUTTON | WB_TABSTOP);
 SetForeAndBackgroundColors(m_eType);
 float fScaleFactor = GetDPIScaleFactor();
 long nWidth = pParent->GetSizePixel().getWidth();
@@ -363,7 +368,7 @@ IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, Button*, 
void)
 }
 
 SfxInfoBarContainerWindow::SfxInfoBarContainerWindow(SfxInfoBarContainerChild* 
pChildWin ) :
-Window(pChildWin->GetParent(), 0),
+Window(pChildWin->GetParent(), WB_DIALOGCONTROL),
 m_pChildWin(pChildWin),
 m_pInfoBars()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2019-12-03 Thread Samuel Mehrbrodt (via logerrit) 
 sfx2/source/view/viewsh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 926b39e6c7acbaace8e311dba0a2527ac8c20b09
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 2 16:10:06 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Dec 3 09:12:24 2019 +0100

Don't disable "Send doc via email" when LockExport is set

Only sending as other formats should be disabled in this case

Change-Id: I985d43ba314a1bda16dab33897d212ad27d3d115
Reviewed-on: https://gerrit.libreoffice.org/84240
Tested-by: Jenkins
Reviewed-by: Serge Krot (CIB) 
(cherry picked from commit b9930d0d05db39a8466b18dccf626bc3d8ae5c4e)
Reviewed-on: https://gerrit.libreoffice.org/84292
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 80cd8a122d07..8a199623fa58 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -684,7 +684,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet  )
 #if HAVE_FEATURE_MACOSX_SANDBOX
 rSet.DisableItem(nSID);
 #endif
-if (isExportLocked())
+if (isExportLocked() && nSID != SID_MAIL_SENDDOC)
 rSet.DisableItem(nSID);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source uui/source

2019-11-29 Thread Eike Rathke (via logerrit) 
 sfx2/source/dialog/filedlghelper.cxx |   10 ++-
 uui/source/iahndl-authentication.cxx |   90 ++-
 2 files changed, 53 insertions(+), 47 deletions(-)

New commits:
commit 8bf39e6cfd988089bd0eab0958c96f8fc3413b9d
Author: Eike Rathke 
AuthorDate: Sat Nov 30 01:26:32 2019 +0100
Commit: Eike Rathke 
CommitDate: Sat Nov 30 04:04:04 2019 +0100

Resolves: tdf#97086 Allow "unlimited" password length for OOXML encryption

Change-Id: I51175424e19ad02b81120c3fdea22732cd481a8d
Reviewed-on: https://gerrit.libreoffice.org/84097
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit adb7106a7c805d332c8098891996a75e6ec4caf8)
Reviewed-on: https://gerrit.libreoffice.org/84100

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index a6a9dc675054..8e99b47bd4bd 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2660,8 +2660,11 @@ ErrCode RequestPassword(const std::shared_ptr& pCurrentFilter,
 uno::Reference xInteractionHandler = 
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(),
 rParent);
 // TODO: need a save way to distinguish MS filters from other filters
 // for now MS-filters are the only alien filters that support encryption
-bool bMSType = !pCurrentFilter->IsOwnFormat();
-::comphelper::DocPasswordRequestType eType = bMSType ?
+const bool bMSType = !pCurrentFilter->IsOwnFormat();
+// For OOXML we can use the standard password ("unlimited" characters)
+// request, otherwise the MS limited password request is needed.
+const bool bOOXML = bMSType && lclSupportsOOXMLEncryption( 
pCurrentFilter->GetFilterName());
+const ::comphelper::DocPasswordRequestType eType = bMSType && !bOOXML ?
 ::comphelper::DocPasswordRequestType::MS :
 ::comphelper::DocPasswordRequestType::Standard;
 
@@ -2696,8 +2699,7 @@ ErrCode RequestPassword(const std::shared_ptr& pCurrentFilter,
 // TODO/LATER: The filters should show the password dialog 
themself in future
 if ( bMSType )
 {
-// Check if filter supports OOXML encryption
-if ( lclSupportsOOXMLEncryption( 
pCurrentFilter->GetFilterName() ) )
+if (bOOXML)
 {
 ::comphelper::SequenceAsHashMap aHashData;
 aHashData[ OUString( "OOXPassword"  ) ] <<= 
pPasswordRequest->getPassword();
diff --git a/uui/source/iahndl-authentication.cxx 
b/uui/source/iahndl-authentication.cxx
index b6c74f4926db..4835a485dd2a 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -488,7 +488,7 @@ executePasswordDialog(
 LoginErrorInfo & rInfo,
 task::PasswordRequestMode nMode,
 const OUString& aDocName,
-bool bMSCryptoMode,
+sal_uInt16 nMaxPasswordLen,
 bool bIsPasswordToModify,
 bool bIsSimplePasswordRequest )
 {
@@ -508,11 +508,9 @@ executePasswordDialog(
 }
 else
 {
-const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 0 -> 
allow any length
-
 VclAbstractDialogFactory * pFact = 
VclAbstractDialogFactory::Create();
 ScopedVclPtr const pDialog(
-pFact->CreatePasswordToOpenModifyDialog(pParent, 
nMaxPasswdLen, bIsPasswordToModify));
+pFact->CreatePasswordToOpenModifyDialog(pParent, 
nMaxPasswordLen, bIsPasswordToModify));
 
 rInfo.SetResult( pDialog->Execute() == RET_OK ? 
DialogMask::ButtonsOk : DialogMask::ButtonsCancel );
 rInfo.SetPassword( pDialog->GetPasswordToOpen() );
@@ -539,7 +537,7 @@ handlePasswordRequest_(
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
 rContinuations,
 const OUString& aDocumentName,
-bool bMSCryptoMode,
+sal_uInt16 nMaxPasswordLen,
 bool bIsPasswordToModify,
 bool bIsSimplePasswordRequest = false )
 {
@@ -555,7 +553,7 @@ handlePasswordRequest_(
 LoginErrorInfo aInfo;
 
 executePasswordDialog( pParent, aInfo, nMode,
-aDocumentName, bMSCryptoMode, bIsPasswordToModify, 
bIsSimplePasswordRequest );
+aDocumentName, nMaxPasswordLen, bIsPasswordToModify, 
bIsSimplePasswordRequest );
 
 switch (aInfo.GetResult())
 {
@@ -649,61 +647,67 @@ UUIInteractionHelper::handlePasswordRequest(
 task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER;
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & 
rContinuations = rRequest->getContinuations();
 OUString aDocumentName;
-bool bMSCryptoMode  = false;
+sal_uInt16 nMaxPasswordLen  = 0;// any length
 bool bIsPasswordToModify= false;
 
 bool bDoHandleRequest = false;
 
 uno::Any aAnyRequest(rRequest->getRequest());
 
-task::DocumentPasswordRequest2 aDocumentPasswordRequest2;

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sfx2/source

2019-11-26 Thread Jim Raykowski (via logerrit) 
 sfx2/source/dialog/templdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd212d59d7cf9fb8c46bb73f4c21148b61c5c53e
Author: Jim Raykowski 
AuthorDate: Tue Nov 19 15:33:17 2019 -0900
Commit: Xisco Faulí 
CommitDate: Tue Nov 26 14:10:17 2019 +0100

tdf#128557 Show disabled menu items in style lists context menu

At present this doesn't work with gtk3 backend. Works with X11, tested
by using SAL_USE_VCLPLUGIN=gen. I suspect it also works with kf5.

Change-Id: I14b82bc7a6f25a4c88d547290d847217aa1b0de2
Reviewed-on: https://gerrit.libreoffice.org/83252
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit 1906f3f2f7c39ea9a3e04f1081dbfc24a1de3212)
Reviewed-on: https://gerrit.libreoffice.org/83365
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4347d9894298..2bda9d438466 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2168,6 +2168,7 @@ VclPtr const & 
SfxCommonTemplateDialog_Impl::CreateContextMenu()
 mxMenu.disposeAndClear();
 mxBuilder.reset(new VclBuilder(nullptr, 
VclBuilderContainer::getUIRootDir(), "sfx/ui/stylecontextmenu.ui", ""));
 mxMenu.set(mxBuilder->get_menu("menu"));
+mxMenu->SetMenuFlags(MenuFlags::AlwaysShowDisabledEntries);
 mxMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, 
MenuSelectHdl ) );
 mxMenu->EnableItem(mxMenu->GetItemId("edit"), bCanEdit);
 mxMenu->EnableItem(mxMenu->GetItemId("delete"), bCanDel);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits