[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-10-28 Thread Libreoffice Gerrit user 
 sd/source/core/stlpool.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ba5d56afd88ba29ba7f222d15f4b9046011cc38e
Author: Michael Stahl 
AuthorDate: Sat Oct 27 19:56:00 2018 +0200
Commit: Michael Stahl 
CommitDate: Sun Oct 28 11:34:11 2018 +0100

tdf#120376 sd: fix duplicated styles on copy/paste

Unfortunately the comparison was inverted, so a style is copied
iff it already exists, which is clearly the reviewer's fault...

(regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b)

Change-Id: I3425982feb08e980eca9243cc16120897b65a70f
Reviewed-on: https://gerrit.libreoffice.org/62436
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1)
Reviewed-on: https://gerrit.libreoffice.org/62452
Reviewed-by: Armin Le Grand 

diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c627970fd4e2..aa3d1de8a89a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -652,7 +652,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& 
rSourcePool, SfxStyleFamily
 pExistingSheet =
 GetStyleSheetByPositionInIndex(aSheetsWithName.front()).get();
 if (!rRenameSuffix.isEmpty() &&
-pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), 
false))
+!pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), 
false))
 {
 // we have found a sheet with the same name, but different 
contents. Try to find a new name.
 // If we already have a sheet with the new name, and it is 
equal to the one in the source pool,
@@ -664,7 +664,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& 
rSourcePool, SfxStyleFamily
 aTmpName = aName + rRenameSuffix + 
OUString::number(nSuffix);
 pExistingSheet = Find(aTmpName, eFamily);
 nSuffix++;
-} while( pExistingSheet && 
pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false) );
+} while (pExistingSheet &&
+
!pExistingSheet->GetItemSet().Equals(xSheet->GetItemSet(), false));
 aName = aTmpName;
 bAddToList = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-07-29 Thread Libreoffice Gerrit user 
 sd/source/ui/unoidl/unopage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34f6ad89ed195c45f4cb5e26b4129bb0087d5452
Author: Noel Grandin 
AuthorDate: Fri Jul 27 21:20:13 2018 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 29 23:06:54 2018 +0200

tdf#118948 - Date format in Impress header/footer is lost when saving

regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum

Change-Id: I9d365c710a20054e249433f54635068f713afa72
Reviewed-on: https://gerrit.libreoffice.org/58202
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 93baa280670367ef6246d837080706f2c80eab0b)
Reviewed-on: https://gerrit.libreoffice.org/58291

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 10f25204c810..eb465e719671 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1292,7 +1292,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const 
OUString& PropertyName )
 case WID_PAGE_DATETIMEFORMAT:
 {
 auto const & rSettings = GetPage()->getHeaderFooterSettings();
-sal_Int32 x = static_cast(rSettings.meDateFormat) & 
(static_cast(rSettings.meTimeFormat) << 4);
+sal_Int32 x = static_cast(rSettings.meDateFormat) | 
(static_cast(rSettings.meTimeFormat) << 4);
 aAny <<= x;
 }
 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-0' - sd/source

2018-07-03 Thread Paul Trojahn 
 sd/source/ui/func/fuinsert.cxx |   18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit f066b54fb4af1d3f08242d81dd08100b7266eaaf
Author: Paul Trojahn 
Date:   Thu Jun 21 15:51:05 2018 +0200

tdf#115233 Don't reset crop when replacing a graphic

When passing DND_ACTION_MOVE to View::InsertGraphic, the whole object gets
replaced. DND_ACTION_LINK should be used, because it just replaces the
graphic and keeps crop information.
Marking the object is not needed, because InsertObjectAtView and
ReplaceObjectAtView already take care of that.

Change-Id: I0d829ec39a9d484a7c8946252e90eddb12ea9756
Reviewed-on: https://gerrit.libreoffice.org/56401
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 3f3c16e433f727bf52a6f894956b489187ab6dce)
Reviewed-on: https://gerrit.libreoffice.org/56838
Reviewed-by: Paul Trojahn 
Reviewed-by: Thorsten Behrens 

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e0ad64bd7169..39d3e89458c1 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -156,18 +156,13 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
 if( mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) !=  
nullptr)
 {
 sal_Int8nAction = DND_ACTION_COPY;
-SdrObject* pPickObj = mpView->GetEmptyPresentationObject( 
PRESOBJ_GRAPHIC );
-bool bSelectionReplaced(false);
+SdrObject* pPickObj;
 
-if( pPickObj )
+if( ( ( pPickObj = mpView->GetSelectedSingleObject( 
mpView->GetPage() ) ) && mbReplaceExistingImage ) || (pPickObj = 
mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC ) ) )
 {
 nAction = DND_ACTION_LINK;
-}
-else if(mbReplaceExistingImage && mpView->GetMarkedObjectCount() 
== 1)
-{
-pPickObj = mpView->GetMarkedObjectByIndex(0);
-nAction = DND_ACTION_MOVE;
-bSelectionReplaced = true;
+} else {
+pPickObj = nullptr;
 }
 
 Point aPos;
@@ -203,11 +198,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
 }
 pGrafObj->SetGraphicLink(aFileName, aReferer, aFilterName);
 }
-
-if(bSelectionReplaced && pGrafObj)
-{
-mpView->MarkObj(pGrafObj, mpView->GetSdrPageView());
-}
 }
 }
 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-0' - sd/source

2018-06-14 Thread Caolán McNamara 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ace56ae7e6d943fa8b2a72dc97f7abfc812aa35e
Author: Caolán McNamara 
Date:   Mon Jun 11 12:31:08 2018 +0100

tdf#118068 InsertionIndicator should be temporary

its original use is during a drag/drop operation so its expected to
be in use just for a temporary scope, so End after Start

Change-Id: I3efdc4079ef7e1466b49e027fed0698715b5fd58
Reviewed-on: https://gerrit.libreoffice.org/55621
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index b299f00ed748..7dd38464e582 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -1098,12 +1098,16 @@ bool NormalModeHandler::ProcessButtonDownEvent (
 pInsertionIndicatorHandler->UpdatePosition(
 rDescriptor.maMousePosition,
 InsertionIndicatorHandler::MoveMode);
+
 
mrSlideSorter.GetController().GetSelectionManager()->SetInsertionPosition(
 pInsertionIndicatorHandler->GetInsertionPageIndex());
 
 mrSlideSorter.GetViewShell()->GetDispatcher()->Execute(
 SID_INSERTPAGE,
 SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
+
+pInsertionIndicatorHandler->End(Animator::AM_Immediate);
+
 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-0' - sd/source

2018-06-07 Thread Caolán McNamara 
 sd/source/ui/view/drviews2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 66b4e7ee179cba8ec2f1229ebc6eb48343fae72a
Author: Caolán McNamara 
Date:   Tue Jun 5 10:59:23 2018 +0100

tdf#117940 setting resize shape while text edit active not recorded in undo

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

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 55fdadcd68ac..7b9784b42c1a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1645,6 +1645,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
 case SID_TEXTATTR_DLG:
 {
+if (mpDrawView->IsTextEdit())
+mpDrawView->SdrEndTextEdit();
 SetCurrentFunction( FuTextAttrDlg::Create( this, 
GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
 Cancel();
 rReq.Ignore ();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-05-14 Thread Caolán McNamara 
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx |5 +-
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx |   29 +++-
 2 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit f2cc4285c51addcb3814222616778c18dd311fe0
Author: Caolán McNamara 
Date:   Fri May 11 11:16:54 2018 +0100

Resolves: tdf#117475 page properties change triggers page reorder event

and page reorder remove and re-inserts the slide in the slide sorter, so the
selected page property is removed when the page doesn't really get removed. 
So
then there's no selection to apply the later master page property to.

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

diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx 
b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 0837c565e5a5..e5d859f743be 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -216,8 +216,9 @@ private:
 void AdaptSize();
 
 SdPage* GetPage (const sal_Int32 nCoreIndex) const;
-void InsertSlide (SdPage* pPage);
-void DeleteSlide (const SdPage* pPage);
+void InsertSlide (SdPage* pPage, bool bMarkSelected);
+// return if this page was marked as selected before being removed
+bool DeleteSlide (const SdPage* pPage);
 void UpdateIndices (const sal_Int32 nFirstIndex);
 };
 
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx 
b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 0267860dfecc..44d29094fc2a 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -534,15 +534,17 @@ bool SlideSorterModel::NotifyPageEvent (const SdrPage* 
pSdrPage)
 //NotifyPageEvent is called for add, remove, *and* change position so for
 //the change position case we must ensure we don't end up with the slide
 //duplicated in our list
-DeleteSlide(pPage);
+bool bSelected = DeleteSlide(pPage);
 if (pPage->IsInserted())
-InsertSlide(pPage);
+{
+InsertSlide(pPage, bSelected);
+}
 CheckModel(*this);
 
 return true;
 }
 
-void SlideSorterModel::InsertSlide (SdPage* pPage)
+void SlideSorterModel::InsertSlide(SdPage* pPage, bool bMarkSelected)
 {
 // Find the index at which to insert the given page.
 sal_uInt16 nCoreIndex (pPage->GetPageNum());
@@ -559,19 +561,24 @@ void SlideSorterModel::InsertSlide (SdPage* pPage)
 if (GetPage(nIndex+1) != GetPageDescriptor(nIndex)->GetPage())
 return;
 
+auto iter = maPageDescriptors.begin() + nIndex;
+
 // Insert the given page at index nIndex
-maPageDescriptors.insert(
-maPageDescriptors.begin()+nIndex,
+iter = maPageDescriptors.insert(
+iter,
 std::make_shared(
 
Reference(mxSlides->getByIndex(nIndex),UNO_QUERY),
 pPage,
 nIndex));
 
+if (bMarkSelected)
+(*iter)->SetState(PageDescriptor::ST_Selected, true);
+
 // Update page indices.
 UpdateIndices(nIndex+1);
 }
 
-void SlideSorterModel::DeleteSlide (const SdPage* pPage)
+bool SlideSorterModel::DeleteSlide (const SdPage* pPage)
 {
 sal_Int32 nIndex(0);
 
@@ -594,15 +601,21 @@ void SlideSorterModel::DeleteSlide (const SdPage* pPage)
 }
 }
 
+bool bMarkedSelected(false);
+
 if(nIndex >= 0 && nIndex < 
static_cast(maPageDescriptors.size()))
 {
 if (maPageDescriptors[nIndex])
 if (maPageDescriptors[nIndex]->GetPage() != pPage)
-return;
+return false;
 
-maPageDescriptors.erase(maPageDescriptors.begin()+nIndex);
+auto iter = maPageDescriptors.begin() + nIndex;
+bMarkedSelected = (*iter)->HasState(PageDescriptor::ST_Selected);
+maPageDescriptors.erase(iter);
 UpdateIndices(nIndex);
 }
+
+return bMarkedSelected;
 }
 
 void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-05-11 Thread Xisco Fauli 
 sd/source/ui/sidebar/SlideBackground.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 16a357ced2f18bfd3f8bd3c64071cb5f0333d92c
Author: Xisco Fauli 
Date:   Wed May 2 17:34:44 2018 +0200

tdf#117355 Show color picker on the sidebar

Change-Id: I3e69b4247b679e0ceb3c8cee5d6fecf82ad8c445
Reviewed-on: https://gerrit.libreoffice.org/53746
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 7237db44dfac914e5b6003f418267d3df1e7f162)
Reviewed-on: https://gerrit.libreoffice.org/53890
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index d7d93d75755b..c4f271487762 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -327,6 +327,7 @@ void SlideBackground::Update()
 {
 mpFillAttr->Hide();
 mpFillGrad->Hide();
+mpFillLB->Show();
 const Color aColor = GetColorSetOrDefault();
 mpFillLB->SelectEntry(aColor);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-04-10 Thread Julien Nabet 
 sd/source/ui/animations/SlideTransitionPane.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1576908dd0b5b275f90b50c0794559547aa0a25e
Author: Julien Nabet 
Date:   Thu Apr 5 21:45:20 2018 +0200

tdf#115407: preselect sound file saved

To display the sound in the dropbox, the complete filename
(eg: 
file:///home/julien/lo/libreoffice/instdir/share/gallery/sounds/pluck.wav)
was compared with items of the sound list formed like this:

file:///home/julien/lo/libreoffice/instdir/program/../share/gallery/sounds/pluck.wav

See https://bugs.documentfoundation.org/show_bug.cgi?id=115407#c1

Since listbox displays only basename, let's just compare basenames

Change-Id: I5fb49990322423fa7818e5d6e1cafd828e3500ec
Reviewed-on: https://gerrit.libreoffice.org/52476
(cherry picked from commit 23c82e1a377ea6fce65d71277ec59b3ca150b98a)
Reviewed-on: https://gerrit.libreoffice.org/52489
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index fc01f7b7547e..5ca0ea8227c9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -269,10 +269,11 @@ struct lcl_EqualsSoundFileName
 {
 // note: formerly this was a case insensitive search for all
 // platforms. It seems more sensible to do this platform-dependent
+INetURLObject aURL(rStr);
 #if defined(_WIN32)
-return maStr.equalsIgnoreAsciiCase( rStr );
+return maStr.equalsIgnoreAsciiCase( aURL.GetBase() );
 #else
-return maStr == rStr;
+return maStr == aURL.GetBase();
 #endif
 }
 
@@ -285,9 +286,10 @@ bool lcl_findSoundInList( const ::std::vector< OUString > 
& rSoundList,
   const OUString & rFileName,
   ::std::vector< OUString >::size_type & rOutPosition )
 {
+INetURLObject aURL(rFileName);
 ::std::vector< OUString >::const_iterator aIt =
   ::std::find_if( rSoundList.begin(), rSoundList.end(),
-  lcl_EqualsSoundFileName( rFileName ));
+  lcl_EqualsSoundFileName( aURL.GetBase()));
 if( aIt != rSoundList.end())
 {
 rOutPosition = ::std::distance( rSoundList.begin(), aIt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-04-05 Thread Caolán McNamara 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx |   76 +++---
 1 file changed, 62 insertions(+), 14 deletions(-)

New commits:
commit 944b882d3296b33f4b33b8ef3e33d020ed428732
Author: Caolán McNamara 
Date:   Sun Mar 25 17:16:36 2018 +0100

tdf#116544 crash on unhandled IllegalArgument exception

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

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx 
b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 72d8bd2a1db2..9ba0850f5949 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -180,9 +180,16 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = (aPageSize.Height - aPicSize.Height)/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
-if(bCreateCaptions)
-createCaption( aPageSize );
+try
+{
+xSlide->add(xShape);
+if (bCreateCaptions)
+createCaption( aPageSize );
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 }
 else if( nOpt == TWO_IMAGES )
@@ -249,7 +256,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/2 - aPicSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
+try
+{
+xSlide->add(xShape);
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 
 if( !sUrl2.isEmpty() )
@@ -287,10 +301,17 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/2 - aPicSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
-if(bCreateCaptions)
-createCaption( aPageSize );
 
+try
+{
+xSlide->add(xShape);
+if(bCreateCaptions)
+createCaption( aPageSize );
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 }
 }
@@ -370,7 +391,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/4 - aPicSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
+try
+{
+xSlide->add(xShape);
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 if( !sUrl2.isEmpty() )
 {
@@ -407,7 +435,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/4 - aPicSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
+try
+{
+xSlide->add(xShape);
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 if( !sUrl3.isEmpty() )
 {
@@ -444,7 +479,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/4 - aPicSize.Height/2 + 
aPageSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
+try
+{
+xSlide->add(xShape);
+}
+catch (const css::uno::Exception& exc)
+{
+SAL_WARN( "sd", exc );
+}
 }
 if( !sUrl4.isEmpty() )
 {
@@ -481,10 +523,16 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, 
void)
 aPicPos.Y = aPageSize.Height/4 - aPicSize.Height/2 + 
aPageSize.Height/2;
 
 xShape->setPosition(aPicPos);
-xSlide->add(xShape);
-if(bCreateCaptions)
-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-03-19 Thread Xisco Faulí 
 sd/source/ui/sidebar/SlideBackground.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 855ae519db73b81a64d991b99c8993e6a192df08
Author: Xisco Faulí 
Date:   Fri Mar 16 12:22:19 2018 +0100

tdf#116364: Revert "tdf#113660: show Master Slide label in handout view"

This reverts commit 605b01dc591eaa72788be255baf1f9b9dde76414.

Change-Id: I99a2de6a425b1ecd2e9059a9867adac3fc75e619
Reviewed-on: https://gerrit.libreoffice.org/51404
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 76da35ddd0b0..d7d93d75755b 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -261,7 +261,6 @@ void SlideBackground::HandleContextChange(
 }
 else if ( maContext == maImpressHandoutContext )
 {
-SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
 mpCloseMaster->Hide();
 mpEditMaster->Hide();
 mpMasterSlide->Disable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-03-15 Thread Xisco Fauli 
 sd/source/ui/view/drviewse.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f7db69e5302dca28c3cf5a36dc2328bd062fc0d9
Author: Xisco Fauli 
Date:   Wed Mar 14 10:19:47 2018 +0100

tdf#115539, tdf#116238: Don't display the notebookbar in presentation mode

Change-Id: Ifc64d9a3b5c93b83fa238737375e7a58b2ae86db
Reviewed-on: https://gerrit.libreoffice.org/51262
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 6a9326803c01f4c9bc7da855053ce4e80646fad8)
Reviewed-on: https://gerrit.libreoffice.org/51294
Reviewed-by: Noel Grandin 

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 99a1c34343f5..d24dbb65b4d4 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -721,12 +721,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 case SID_PRESENTATION_CURRENT_SLIDE:
 case SID_REHEARSE_TIMINGS:
 {
-sfx2::SfxNotebookBar::LockNotebookBar();
-
 slideshowhelp::ShowSlideShow(rReq, *GetDoc());
 rReq.Ignore ();
-
-sfx2::SfxNotebookBar::UnlockNotebookBar();
 }
 break;
 
@@ -1587,6 +1583,7 @@ namespace slideshowhelp
 Reference< XPresentation2 > xPresentation( rDoc.getPresentation() );
 if( xPresentation.is() )
 {
+sfx2::SfxNotebookBar::LockNotebookBar();
 if (SID_REHEARSE_TIMINGS == rReq.GetSlot())
 xPresentation->rehearseTimings();
 else if (rDoc.getPresentationSettings().mbCustomShow)
@@ -1616,6 +1613,7 @@ namespace slideshowhelp
 
 xPresentation->startWithArguments( aArguments );
 }
+sfx2::SfxNotebookBar::UnlockNotebookBar();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-02-27 Thread Rostislav Kondratenko 
 sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +++--
 sd/source/ui/remotecontrol/Server.cxx  |2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit d1114a44cef9c54dc6d5b35578ce272a3cb74811
Author: Rostislav Kondratenko 
Date:   Wed Feb 21 17:27:00 2018 +0300

tdf#97614 Fixing initialization code for Bluetooth and IP Server for 
Impress.

Change-Id: Icc385fb760b8a5ff337f58dc95ba3c3f86805eaa
Reviewed-on: https://gerrit.libreoffice.org/50108
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e)
Reviewed-on: https://gerrit.libreoffice.org/50413

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 4965ea11830b..780224719309 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1332,16 +1332,14 @@ void SAL_CALL BluetoothServer::run()
 return;
 }
 
-SOCKADDR aName;
+SOCKADDR_BTH aName;
 int aNameSize = sizeof(aName);
-getsockname( aSocket, ,  ); // Retrieve the local address 
and port
+getsockname( aSocket, reinterpret_cast(),  ); 
// Retrieve the local address and port
 
 CSADDR_INFO aAddrInfo;
 memset( , 0, sizeof(aAddrInfo) );
-aAddrInfo.LocalAddr.lpSockaddr = 
+aAddrInfo.LocalAddr.lpSockaddr = reinterpret_cast();
 aAddrInfo.LocalAddr.iSockaddrLength = sizeof( SOCKADDR_BTH );
-aAddrInfo.RemoteAddr.lpSockaddr = 
-aAddrInfo.RemoteAddr.iSockaddrLength = sizeof( SOCKADDR_BTH );
 aAddrInfo.iSocketType = SOCK_STREAM;
 aAddrInfo.iProtocol = BTHPROTO_RFCOMM;
 
@@ -1365,7 +1363,6 @@ void SAL_CALL BluetoothServer::run()
 aRecord.dwNameSpace = NS_BTH;
 aRecord.dwNumberOfCsAddrs = 1;
 aRecord.lpcsaBuffer = 
-
 if (WSASetServiceW( , RNRSERVICE_REGISTER, 0 ) == SOCKET_ERROR)
 {
 closesocket( aSocket );
diff --git a/sd/source/ui/remotecontrol/Server.cxx 
b/sd/source/ui/remotecontrol/Server.cxx
index 5fdaa1772209..28cb5f18b6a6 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -83,7 +83,7 @@ void RemoteServer::execute()
 spServer = nullptr;
 return;
 }
-osl::SocketAddr aAddr( "0", PORT );
+osl::SocketAddr aAddr( "0.0.0.0", PORT );
 if ( !mSocket.bind( aAddr ) )
 {
 SAL_WARN( "sdremote", "bind failed" << mSocket.getErrorAsString() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2018-02-01 Thread Mark Hung 
 sd/source/ui/func/fuformatpaintbrush.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 520a00a7dd9772630346eb58bfe8c00790ec0920
Author: Mark Hung 
Date:   Mon Dec 18 23:02:34 2017 +0800

tdf#114045 do not add undo action for table attributes

CreateUndoAttrObject() create extra undo steps when using
table paint brush on table cells. Undo action for each selected
cell is processed individually in
SvxTableController::ApplyFormatPaintBrush().

Change-Id: I65034a2b510898db26a7a8ddc4b5f3b742fd9b88
Reviewed-on: https://gerrit.libreoffice.org/46729
Tested-by: Jenkins 
Reviewed-by: Mark Hung 
(cherry picked from commit 140aa3e7db0a4731f02ab078a1326b2f4523a4c5)
Reviewed-on: https://gerrit.libreoffice.org/48698
Reviewed-by: Katarina Behrens 

diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx 
b/sd/source/ui/func/fuformatpaintbrush.cxx
index 88b12b4d4188..1d19e9cc9ebc 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -251,7 +251,8 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, 
bool bNoParagraphForma
 {
 OUString sLabel( 
mpViewShell->GetViewShellBase().RetrieveLabelFromCommand(".uno:FormatPaintbrush"
 ) );
 mpDoc->BegUndo( sLabel );
-mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( 
*pObj, false, true ) );
+if (dynamic_cast< sdr::table::SdrTableObj* >( pObj ) == nullptr)
+mpDoc->AddUndo( 
mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) );
 }
 
 mpView->ApplyFormatPaintBrush( *mxItemSet.get(), bNoCharacterFormats, 
bNoParagraphFormats );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source

2017-12-29 Thread Aron Budea 
 sd/source/ui/sidebar/SlideBackground.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4eeb0f5a76a6e9190fd1db457042720c10ef804a
Author: Aron Budea 
Date:   Fri Dec 22 13:26:49 2017 +0100

tdf#109100: Hide label for margin control in Impress

Change-Id: Ib61656913df673ebfde61e2c921f84cb81195a3b
Reviewed-on: https://gerrit.libreoffice.org/46974
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 88f6ffeb9e0c0b942c2b0bc9d60af7bb7a6caaf8)
Reviewed-on: https://gerrit.libreoffice.org/47119
Reviewed-by: Yousuf Philips 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 9c94a208b2cb..76da35ddd0b0 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -240,7 +240,13 @@ void SlideBackground::HandleContextChange(
 if ( IsImpress() )
 {
 mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
+
+// margin selector is only for Draw
 mpMarginSelectBox->Hide();
+VclPtr pMarginLabel;
+get(pMarginLabel, "labelmargin");
+if ( pMarginLabel )
+pMarginLabel->Hide();
 
 if ( maContext == maImpressMasterContext )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source svx/source

2017-12-15 Thread Mark Hung 
 sd/source/ui/func/fuediglu.cxx |2 +-
 svx/source/svdraw/svddrgv.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 715d0f32eb36593a4c9e52763b2ceb17ec1283c5
Author: Mark Hung 
Date:   Fri Dec 15 00:13:49 2017 +0800

tdf113594: marking gluepoints immediately.

pPV was for the parameter of MarkGluePoint that was removed
in ec38966951f2, and was kept somehow and is converted
to bool here.  Just replace the default boolean value to false
( that means marking instead of unmarking. )

Change-Id: I4c4b9dd368537b7b90cc4effae482a7b8a41eec9
Reviewed-on: https://gerrit.libreoffice.org/46472
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit bf151f0716910b56e3538579f4af7ede8f51bbcf)
Reviewed-on: https://gerrit.libreoffice.org/46497

diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bed07d6d72ed..da333d6b0621 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -141,7 +141,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& 
rMEvt)
 if (!rMEvt.IsShift())
 mpView->UnmarkAllGluePoints();
 
-mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, aVEvt.pPV);
+mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, false);
 SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.pObj, aVEvt.nGlueId);
 
 if (pHdl)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index d5734123d5f9..8f373f66a857 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -747,7 +747,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
 rGP.SetAbsolutePos(rPnt,*pObj);
 
 SdrHdl* pHdl=nullptr;
-if (MarkGluePoint(pObj,nGlueId,pPV))
+if (MarkGluePoint(pObj,nGlueId,false))
 {
 pHdl=GetGluePointHdl(pObj,nGlueId);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits