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

[Julien Nabet]

 sfx2/source/dialog/dinfdlg.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit c522b4017915b3a12203ac39f48a75ae6f4a5bc0
Author: Julien Nabet 
Date:   Tue Feb 20 23:50:04 2018 +0100

tdf#115853: save current custom property when adding line

by reloading current lines before adding a brand new one
indeed the info are deleted by ClearCustomProperties
each time SfxDocumentInfoItem destructor is called

Change-Id: Id1e2e652e90c720f00b8612aa9afbfa91b784d1d
Reviewed-on: https://gerrit.libreoffice.org/50070
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/52349
Reviewed-by: Jean-Baptiste Faure 
Reviewed-by: Christian Lohmaier 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0fef104c23d0..06fbcb353ddd 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2119,6 +2119,20 @@ void SfxCustomPropertiesPage::dispose()
 
 IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl, Button*, void)
 {
+// tdf#115853: reload current lines before adding a brand new one
+// indeed the info are deleted by ClearCustomProperties
+// each time SfxDocumentInfoItem destructor is called
+SfxDocumentInfoItem pInfo;
+Sequence< beans::PropertyValue > aPropertySeq = 
m_pPropertiesCtrl->GetCustomProperties();
+sal_Int32 i = 0, nCount = aPropertySeq.getLength();
+for ( ; i < nCount; ++i )
+{
+if ( !aPropertySeq[i].Name.isEmpty() )
+{
+pInfo.AddCustomProperty( aPropertySeq[i].Name, 
aPropertySeq[i].Value );
+}
+}
+
 Any aAny;
 m_pPropertiesCtrl->AddLine( OUString(), aAny, true );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/dialog/templdlg.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8256df2bb3823f318d2131f513d62784e702b90c
Author: Michael Stahl 
Date:   Tue Mar 13 22:16:20 2018 +0100

tdf#91106 sfx2: Stylist hierarchical: sort the Default Style first

(regression from 41af2a9e26f3ee6b505b343120d5df3617ba5c49)

(cherry picked from commit fd67ee14e769ebdf1e43d55e0117f70f90d53053)

Change-Id: I47377447dd1e04a44033dea27ce7307a65821737
Reviewed-on: https://gerrit.libreoffice.org/51244
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 21f220fce05bb99964f098247786eec014e56902)
Reviewed-on: https://gerrit.libreoffice.org/51591

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0832f1515a15..0e872b367581 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -562,6 +562,10 @@ StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr)
 // tdf#91106 sort top level styles
 std::sort(rArr.begin(), rArr.end(),
 [](StyleTree_Impl* pEntry1, StyleTree_Impl* pEntry2) {
+if (pEntry2->getName() == "Default Style")
+return false;
+if (pEntry1->getName() == "Default Style")
+return true; // default always first
 return aSorter.compare(pEntry1->getName(), pEntry2->getName()) < 0;
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Franklin Weng]

 sfx2/source/appl/appserv.cxx |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit c008e38e1069f33a20af63eedc4bc7e6ebf5278d
Author: Franklin Weng 
Date:   Wed Feb 28 18:12:07 2018 +0800

tdf#115795 Solve wrong redirect behavior of "Get Online Help"

When under locale zh-TW, Help > Get Online Help would use only "zh"
as the parameter of LOLang and sent it to hub.libreoffice.org, which
would redirect to Simplified Chinese forum instead of zh_TW
ask.libreoffice.org forum.  After discussing with Guilhem he
refactored the behavior of the Hub, use LOlocale instead of LOLang,
and keep LOLang for backward compatibility.  The LibreOffice sent
LOlocale instead to avoid this problem happening again.

Change-Id: Ia9348cff88723210f693e65260bb987826a3f3ea
Reviewed-on: https://gerrit.libreoffice.org/50503
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/50519
Tested-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d6424c2d06ef..e5f91e7983e6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -508,14 +508,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 {
 // Askbot has URL's normalized to languages, not locales
 // Get language from locale: ll or lll or ll-CC or lll-CC
-sal_Int32 ix = utl::ConfigManager::getLocale().indexOf("-",0);
-OUString aLang;
-if (ix == -1)
-aLang = utl::ConfigManager::getLocale();
-else
-aLang = utl::ConfigManager::getLocale().copy(0,ix);
 
-OUString sURL("http://hub.libreoffice.org/forum/?LOlang=; + aLang);
+OUString sURL("https://hub.libreoffice.org/forum/?LOlocale=; + 
utl::ConfigManager::getLocale());
 sfx2::openUriExternally(sURL, false);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sfx2/source/doc/sfxbasemodel.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 615f4846751fb669ea28cc092eadfd3842ab3220
Author: Michael Meeks 
Date:   Tue Jan 16 13:31:37 2018 +

tdf#113755 - avoid null ptr de-reference during shutdown.

Why the PostUserEvent's that should do the XTDataObject async destroy
are not completed by here, is rather unclear; but - de-referencing
NULL is not a great thing to do during shutdown.


http://crashreport.libreoffice.org/stats/crash_details/a7d8fd19-0512-4292-b3a0-140dcff204c8

Change-Id: I3f294379f07f4cfc0106c1b5fc5e705c41e78b03
Reviewed-on: https://gerrit.libreoffice.org/48007
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit ad7e6339e5e5cf465a2ef25442099eb59f1a0deb)
Reviewed-on: https://gerrit.libreoffice.org/49103
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 7430b1a02b9d..997f581c7fba 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -941,6 +941,13 @@ OUString SAL_CALL SfxBaseModel::getURL()
 Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs()
 {
 SfxModelGuard aGuard( *this );
+
+if (!SfxApplication::Get()) // tdf#113755
+{
+SAL_WARN("sfx.appl", "Unexpected operations on model");
+return m_pData->m_seqArguments;
+}
+
 if ( m_pData->m_pObjectShell.is() )
 {
 Sequence< beans::PropertyValue > seqArgsNew;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sfx2/source/doc/objstor.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit df30a561499305a1da6c5fb578315feefe873881
Author: Justin Luth 
Date:   Fri Feb 2 14:53:40 2018 +0300

init known ExtraLanguages before document loads

Extensions can add RegisterOnTheFly languages for spell checkers.
A late initialization of the LanguageTable resulted in the inability
to recognize the available spell checker.

So, if a .doc file had an onTheFly language inside, and it was
the first document that LibreOffice opened, then the spell checking
extension was disabled for any other document opened while LibreOffice
was living, including docx and odt files.  (Starting with a blank
document, or a .docx or .odt file seems to initialize OK - and
then subsequent .doc files are also ok in those sessions.)

Ensuring that the static LanguageTable is intialized early in the process
avoids this headache.

In my case, .doc was failing with:
LanguageTag::registerOnTheFly: not cross-inserted
0x7e0 for 'kbo' have 'en-US'

but with this patch now matches .odt/docx with:

LanguageTag::registerOnTheFly: cross-inserted
0x7e0 for 'kbo' [have 'kbo']

This fixes .ods .odg, odp,
   .xls .xlsx .ppt, pptx
   .doc and likely many others

Change-Id: Ie6dcbfd73e063eef4573016c3c62d29cf8ad43ca
Reviewed-on: https://gerrit.libreoffice.org/49142
Reviewed-by: Martin Hosken 
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 427c0804cd4aecde1cadb7cb3c4f3487991bd573)
Reviewed-on: https://gerrit.libreoffice.org/49171
Reviewed-by: Justin Luth 
(cherry picked from commit d51c01846afb9bea5a39fd48fbb30b9fd02c2870)
Reviewed-on: https://gerrit.libreoffice.org/49449
Reviewed-by: Markus Mohrhard 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 759cc16b987c..b295345ca46e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -655,6 +656,9 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 pImpl->nLoadedFlags = SfxLoadedFlags::NONE;
 pImpl->bModelInitialized = false;
 
+// initialize static language table so language-related extensions are 
learned before the document loads
+(void)SvtLanguageTable::GetLanguageEntryCount();
+
 //TODO/LATER: make a clear strategy how to handle "UsesStorage" etc.
 bool bOwnStorageFormat = IsOwnStorageFormat( *pMedium );
 bool bHasStorage = IsPackageStorageFormat_Impl( *pMedium );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 sfx2/source/sidebar/UnoPanels.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6cc44459833deec6a54a0ed8b0572d345d3e7425
Author: Tamás Zolnai 
Date:   Thu Dec 28 18:02:57 2017 +0100

tdf#104870 - Impress crashes switching views in read-only mode

We need to check read only mode similar to SidebarController::CreatePanels()
method. Otherwise SfxUnoPanels::getByName() creates an invalid panel.

Reviewed-on: https://gerrit.libreoffice.org/47116
Tested-by: Xisco Faulí 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 23a83639f5a06708074b13bc13ea4f6f819f55f0)

Change-Id: Ib7801b81c95f3f505a06c00f749ba4ed5809bfe0
Reviewed-on: https://gerrit.libreoffice.org/47144
Tested-by: Xisco Faulí 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/sidebar/UnoPanels.cxx 
b/sfx2/source/sidebar/UnoPanels.cxx
index 257c75cea4bc..98708d9cf658 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -114,6 +114,9 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& 
aName )
 iPanel(aPanels.begin()), iEnd(aPanels.end());
 iPanel!=iEnd; ++iPanel)
 {
+// Determine if the panel can be displayed.
+if(pSidebarController->IsDocumentReadOnly() && 
!iPanel->mbShowForReadOnlyDocuments)
+continue;
 if (iPanel->msId == aName)
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 sfx2/source/sidebar/SidebarController.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6054c390d136cea5d79b429447e262f61e4a3f19
Author: Aron Budea 
Date:   Wed Dec 20 12:06:39 2017 +0100

tdf#104229: properly switch to def sidebar deck on status change

regression since a64999511ae654131d997eec9a3d78478cfc1c75

Change-Id: Id1d0a76f89c41e88511f670f1aac4b866e4c15c6
Reviewed-on: https://gerrit.libreoffice.org/46840
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit f2f5ebcee462472b27b610f53abc7f9a6378462b)
Reviewed-on: https://gerrit.libreoffice.org/46884

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 66850a562021..466d45d53cc5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -306,7 +306,7 @@ void SAL_CALL SidebarController::statusChanged (const 
css::frame::FeatureStateEv
 
 // Force the current deck to update its panel list.
 if ( ! mbIsDocumentReadOnly)
-msCurrentDeckId = gsDefaultDeckId;
+SwitchToDefaultDeck();
 
 mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
 maAsynchronousDeckSwitch.CancelRequest();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sfx2/source/doc/objcont.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 530a587f232e2552216fae363d798901aa2bd259
Author: Noel Grandin 
Date:   Wed Nov 22 15:46:20 2017 +0200

tdf#113935 Switching from read-only to edit mode slow

Regression introduced by

commit 389da66dfc96d06c407bff156c4ea21e940c5e06
remove unused uno::Reference vars

I'm guessing this variable keeps some kind of cache alive which prevents
us from re-parsing the PDF file when we switch to edit mode - which is
clearly what we are doing when I remove the line.

Change-Id: Iea2cf9640d876028a78806e717b930d4a063dc9b
Reviewed-on: https://gerrit.libreoffice.org/45093
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 5ee141ee2fb77c3cc452ac656235d7e83e15072c)
Reviewed-on: https://gerrit.libreoffice.org/45108
Tested-by: Noel Grandin 
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index ca419ab37d64..9acded4ba510 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -384,6 +384,11 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
 // update only for documents loaded from the local file system
 return;
 
+// tdf#113935 - do not remove this line - somehow, it makes the process
+// of switching from viewing a read-only document to opening it in writable
+// mode much faster.
+uno::Reference< embed::XStorage > xDocStor = pFile->GetStorage();
+
 // only for own storage formats
 if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sfx2/source/sidebar/SidebarController.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 26074f8ffacd817825a6e61d39dc9e7d27b1f3c2
Author: Jan-Marek Glogowski 
Date:   Tue Oct 17 19:52:58 2017 +0200

tdf#99537 set expand for re-used sidebar panels

When re-using a panel, reset the expand state from the stored
state in the PanelContexDescriptor.

Change-Id: I00851982bbd36cacdc57459bb6e5be9fcc719e81
Reviewed-on: https://gerrit.libreoffice.org/43466
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit ce2e94a98f5fc85bef7623a0227b3a95d8093288)
Reviewed-on: https://gerrit.libreoffice.org/43481
Reviewed-by: Katarina Behrens 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 9b6eab64dd97..66850a562021 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -619,6 +619,7 @@ void SidebarController::CreatePanels(const ::rtl::OUString& 
rDeckId, const Conte
 if (pPanel != nullptr)
 {
 aNewPanels[nWriteIndex] = pPanel;
+pPanel->SetExpanded( rPanelContexDescriptor.mbIsInitiallyVisible );
 ++nWriteIndex;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/dialog/templdlg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 729752b2df5c64429aff10628680d91c8bbbe1a6
Author: Michael Stahl 
Date:   Fri Sep 29 20:35:40 2017 +0200

tdf#91106 sfx2: Stylist: sort top-level styles in hierarchical mode

(regression from 8f04b172c5c78fa80c3692a729f0191425195869)

Change-Id: I111d12a622390afc02eb73a42b1d3c714f046bd2
(cherry picked from commit 41af2a9e26f3ee6b505b343120d5df3617ba5c49)
Reviewed-on: https://gerrit.libreoffice.org/42952
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fdeaa9910a42..0832f1515a15 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -559,6 +559,12 @@ StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr)
 // Only keep tree roots in rArr, child elements can be accessed through 
the hierarchy
 rArr.erase(std::remove_if(rArr.begin(), rArr.end(), [](StyleTree_Impl* 
pEntry) { return pEntry->HasParent(); }), rArr.end());
 
+// tdf#91106 sort top level styles
+std::sort(rArr.begin(), rArr.end(),
+[](StyleTree_Impl* pEntry1, StyleTree_Impl* pEntry2) {
+return aSorter.compare(pEntry1->getName(), pEntry2->getName()) < 0;
+});
+
 return rArr;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sfx2/source/dialog/templdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02b95a0e8191fc560637b2fa3a62bca0bd51b9c4
Author: Julien Nabet 
Date:   Tue Aug 29 20:48:42 2017 +0200

tdf#112027: avoid leaks in FillTreeBox (sfx2)

Next step could be using std::unique_ptr
instead of StyleTree_Impl*

Change-Id: Ifbf5313fedf1fc0310073918f91edd6fe75d0afc
Reviewed-on: https://gerrit.libreoffice.org/41710
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit c82e5db9626e4d84300f84842b837e852be828be)
Reviewed-on: https://gerrit.libreoffice.org/41925
Reviewed-by: Julien Nabet 

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 48a874f34996..fdeaa9910a42 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1044,6 +1044,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
 for (sal_uInt16 i = 0; i < nCount; ++i)
 {
 FillBox_Impl(pTreeBox, aArr[i], aEntries, pItem->GetFamily(), 
nullptr);
+delete aArr[i];
 }
 pTreeBox->Recalc();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/dialog/dinfdlg.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7040862125fb1d805286771c26f6b51396cfb145
Author: Caolán McNamara 
Date:   Tue Aug 29 14:01:09 2017 +0100

Resolves: rhbz#1400287 resizing properties dialog hides widgets

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

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 83916da238ad..787cb7a83dfe 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1506,6 +1506,7 @@ 
CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
 m_aDurationField->SetPosSizePixel(aPos, aSize);
 m_aDateField->SetPosSizePixel(aPos, aSize);
 m_aTimeField->SetPosSizePixel(aPos, aSize);
+m_aYesNoButton->SetPosSizePixel(aPos, aSize);
 
 m_aEditLoseFocusIdle.SetPriority( TaskPriority::LOWEST );
 m_aEditLoseFocusIdle.SetInvokeHandler( LINK( this, CustomPropertiesWindow, 
EditTimeoutHdl ) );
@@ -1796,12 +1797,13 @@ void CustomPropertiesWindow::updateLineWidth()
 
 vcl::Window** pCurrent = pWindows;
 vcl::Window** pNewCurrent = pNewWindows;
-while ( *pCurrent )
+while (*pCurrent)
 {
-Size aSize = (*pCurrent)->GetSizePixel();
-Point aPos = (*pCurrent)->GetPosPixel();
-aPos.Y() = (*pNewCurrent)->GetPosPixel().Y();
-(*pNewCurrent)->SetPosSizePixel( aPos, aSize );
+Size aSize = (*pNewCurrent)->GetSizePixel();
+aSize.Width() = (*pCurrent)->GetSizePixel().Width();
+Point aPos = (*pNewCurrent)->GetPosPixel();
+aPos.X() = (*pCurrent)->GetPosPixel().X();
+(*pNewCurrent)->SetPosSizePixel(aPos, aSize);
 pCurrent++;
 pNewCurrent++;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze]

 sfx2/source/dialog/infobar.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9d7b4b0114fdbd784ab87ab532140af9e1bbc06d
Author: heiko tietze 
Date:   Mon Aug 21 21:13:22 2017 +0200

tdf#111844 infobar icons on high dpi

scaling factor added

Change-Id: Iccfc76832ccfaaffb9950d4b591b379dfb0d9eca
Reviewed-on: https://gerrit.libreoffice.org/41401
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 4438849e400ecef3cdf2f267dc75a76d4b11aba1)

tdf#111844 infobar icons/text on high dpi

scaling factor added to text position

Change-Id: Iaeb48fd4ac0439680fa3b6ca43f23a617efe1457
Reviewed-on: https://gerrit.libreoffice.org/41417
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 4d60d96a22ef2f67db7c7e99981447bd81f776c4)
Reviewed-on: https://gerrit.libreoffice.org/41461
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index b093718f4e86..2d03bf01e20b 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -289,9 +289,9 @@ void SfxInfoBarWindow::Resize()
 nX -= nButtonGap;
 }
 
-m_pImage->SetPosSizePixel(Point(4,4), Size(32, 32));
+m_pImage->SetPosSizePixel(Point(4,4), Size(32* fScaleFactor, 32* 
fScaleFactor));
 
-Point aMessagePosition(32 + 10 * fScaleFactor, 10 * fScaleFactor);
+Point aMessagePosition(32 * fScaleFactor + 10 * fScaleFactor, 10 * 
fScaleFactor);
 Size aMessageSize(nX - 20 * fScaleFactor, 20 * fScaleFactor);
 
 m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sfx2/source/control/templatelocalview.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 08ae774fe92f0576691c9b0177fef45d18fd77b3
Author: Julien Nabet 
Date:   Thu Aug 10 21:06:43 2017 +0200

tdf#111567: fix memleak in TemplateLocalView::insertItems

Clearing mItemList at the begin of insertItems is a bad idea
because it prevents ImplDeleteItems (called by updateItems,
itself called at the end of insertItems) from clearing
correctly mItemList
See comments from bugtracker for more info

(Thank you Alex for the precious info attached with memleak reports! :-))

Change-Id: I04976dbb065d1369562649fc97c33f7fd599b107
Reviewed-on: https://gerrit.libreoffice.org/40995
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 05a338159761e012c2c8779f8927b0d709b4416f)
Reviewed-on: https://gerrit.libreoffice.org/41002
Reviewed-by: Noel Grandin 

diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 6c5881422b15..2168cdd9ac59 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -777,8 +777,6 @@ bool TemplateLocalView::renameItem(ThumbnailViewItem* 
pItem, const OUString& sNe
 
 void TemplateLocalView::insertItems(const std::vector 
, bool isRegionSelected, bool bShowCategoryInTooltip)
 {
-mItemList.clear();
-
 std::vector aItems(rTemplates.size());
 for (size_t i = 0, n = rTemplates.size(); i < n; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 sfx2/source/control/ctrlitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1571964b4f7c38f47e47973fb06a0589d11d17b5
Author: Dennis Francis 
Date:   Tue Aug 8 17:02:19 2017 +0530

tdf#108802 : In SfxControllerItem::dispose do not directly...

call pBindings->Release(), but call UnBind() instead which
correctly sets the state to "UnBound" by setting
pNext = this.

Thanks to Miklos Vajna for pointing this out !

Change-Id: I08e85496cff6df0952d6c5ec4ee979a93b8862d0
Reviewed-on: https://gerrit.libreoffice.org/40882
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
(cherry picked from commit 2585eb9d15f5c047d846ccb4b4d606d9ac89e518)
Reviewed-on: https://gerrit.libreoffice.org/40907
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index cd22920f144e..dadead816898 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -203,7 +203,7 @@ SfxControllerItem::~SfxControllerItem()
 void SfxControllerItem::dispose()
 {
 if ( IsBound() )
-pBindings->Release(*this);
+UnBind();
 }
 
 void SfxControllerItem::StateChanged
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 sfx2/source/doc/objserv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc882e977144d60b850288045e3f6aab7cbad6f7
Author: Katarina Behrens 
Date:   Fri Jul 7 17:26:27 2017 +0200

tdf#108852: Put signature infobar into the right frame

and thus avoid crash when user clicks 'show signatures' button
in a window where signature bar shouldn't even be

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

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6b5374a694b0..16265c2510d5 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1035,7 +1035,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet )
 }
 case SID_SIGNATURE:
 {
-SfxViewFrame *pFrame = SfxViewFrame::Current();
+SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this);
 if ( pFrame )
 {
 SignatureState eState = GetDocumentSignatureState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/sidebar/ResourceManager.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 830feb5ecfd041c52a118d51f56b26f65a77712e
Author: Michael Stahl 
Date:   Tue Jun 27 17:32:16 2017 +0200

tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented

com.sun.star.ui.XUpdateModel was added in 5.1 so pre-existing extensions
don't implement it.

(regression from 0635208edf1cdee4235ea87666a473ac81007555)

Change-Id: I6749a9cf2fc82b9cd90d85a682247104e369e167
(cherry picked from commit d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c)
Reviewed-on: https://gerrit.libreoffice.org/39311
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sfx2/source/sidebar/ResourceManager.cxx 
b/sfx2/source/sidebar/ResourceManager.cxx
index adbedece1695..140190228f01 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -719,7 +719,10 @@ void ResourceManager::UpdateModel(const 
css::uno::Reference&
 for (SharedPanelContainer::const_iterator it = rContainer.begin(); it 
!= rContainer.end(); ++it)
 {
 css::uno::Reference 
xPanel((*it)->GetPanelComponent(), css::uno::UNO_QUERY);
-xPanel->updateModel(xModel);
+if (xPanel.is()) // tdf#108814 interface is optional
+{
+xPanel->updateModel(xModel);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sfx2/source/view/viewfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 66ef0206967c5b0452fafe4fe75aa8d7f439f5f4
Author: Samuel Mehrbrodt 
Date:   Fri Apr 7 12:44:23 2017 +0200

tdf#106366 Show infobar for all read-only documents

Except those who were set open r/o with the File->Properties checkbox

Change-Id: Id44daac364cae73636b6f1c051521928743b88f4
Reviewed-on: https://gerrit.libreoffice.org/36258
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit 630186ff4e0eba7317e542f8c3eca39ebd068721)
Reviewed-on: https://gerrit.libreoffice.org/38874
Tested-by: Jenkins 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index aafff1ff21b6..3a7a62394d80 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1140,7 +1140,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 const SfxViewShell *pVSh;
 const SfxShell *pFSh;
-if ( m_xObjSh->IsOriginallyReadOnlyMedium() &&
+if ( m_xObjSh->IsReadOnly() &&
+! m_xObjSh->IsSecurityOptOpenReadOnly() &&
 ( m_xObjSh->GetCreateMode() != 
SfxObjectCreateMode::EMBEDDED ||
 (( pVSh = m_xObjSh->GetViewShell()) && (pFSh = 
pVSh->GetFormShell()) && pFSh->IsDesignMode(
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos]

 sfx2/source/doc/watermarkitem.cxx |   35 +++
 1 file changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 4a17ebe23a88297fa2f1cd85f0bef8c266962188
Author: Szymon Kłos 
Date:   Thu May 25 15:12:46 2017 +0200

Watermark: updated Put and QueryValue

Change-Id: Ica65be783130b1981093204edd03dc793a16343b
Reviewed-on: https://gerrit.libreoffice.org/38027
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 6533c30f7f8b62671fef9e636c49b11127812ed1)
Reviewed-on: https://gerrit.libreoffice.org/38380
Reviewed-by: Szymon Kłos 

diff --git a/sfx2/source/doc/watermarkitem.cxx 
b/sfx2/source/doc/watermarkitem.cxx
index ebb794fcd73e..f54745694557 100644
--- a/sfx2/source/doc/watermarkitem.cxx
+++ b/sfx2/source/doc/watermarkitem.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 SfxWatermarkItem::SfxWatermarkItem()
 : SfxPoolItem( SID_WATERMARK )
@@ -52,26 +53,36 @@ SfxPoolItem* SfxWatermarkItem::Clone( SfxItemPool *) const
 
 bool SfxWatermarkItem::QueryValue( css::uno::Any& rVal, sal_uInt8 
/*nMemberId*/ ) const
 {
-rVal <<= m_aText;
-rVal <<= m_aFont;
-rVal <<= m_nAngle;
-rVal <<= m_nTransparency;
-rVal <<= m_nColor;
+rVal <<= comphelper::InitPropertySequence( {
+{ "Text", css::uno::makeAny( m_aText ) },
+{ "Font", css::uno::makeAny( m_aFont ) },
+{ "Angle", css::uno::makeAny( m_nAngle ) },
+{ "Transparency", css::uno::makeAny( m_nTransparency ) },
+{ "Color", css::uno::makeAny( m_nColor ) },
+} );
 
 return true;
 }
 
 bool SfxWatermarkItem::PutValue( const css::uno::Any& rVal, sal_uInt8 
/*nMemberId*/ )
 {
-OUString aText;
+css::uno::Sequence aSequence;
 
-if ( rVal >>= aText )
+if ( rVal >>= aSequence )
 {
-m_aText = aText;
-rVal >>= m_aFont;
-rVal >>= m_nAngle;
-rVal >>= m_nTransparency;
-rVal >>= m_nColor;
+for(const auto& aEntry : aSequence)
+{
+if(aEntry.Name == "Text")
+aEntry.Value >>= m_aText;
+if(aEntry.Name == "Font")
+aEntry.Value >>= m_aFont;
+if(aEntry.Name == "Angle")
+aEntry.Value >>= m_nAngle;
+if(aEntry.Name == "Transparency")
+aEntry.Value >>= m_nTransparency;
+if(aEntry.Name == "Color")
+aEntry.Value >>= m_nColor;
+}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits