[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source
sd/inc/app.hrc |2 +-
sd/sdi/sdraw.sdi |2 +-
sd/source/ui/view/viewshe3.cxx | 10 ++
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit d7cf5429336ea4cf9a92b3338fe03ef7dc142dcd
Author: Pranam Lashkari
AuthorDate: Fri Jun 2 03:43:05 2023 +0700
Commit: Pranam Lashkari
CommitDate: Wed Jun 7 11:14:05 2023 +0200
sd: introduced impress slide duplication to particular position
Change-Id: I4931f92158c31506b765376639907d2d4f250deb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152512
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-by: Pranam Lashkari
(cherry picked from commit dc007c18097143bdb192955dda730d696d8bcb31)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152656
Tested-by: Jenkins
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index ec0eed81d1f3..e275e4688258 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -246,7 +246,7 @@
#define ID_VAL_ISACTIVE (SID_SD_START+216)
#define ID_VAL_WHATKIND (SID_SD_START+217)
#define ID_VAL_PAGEWIDTH(SID_SD_START+218)
-// FREE
+#define ID_INSERT_POS (SID_SD_START+219)
#define ID_VAL_PAGETOP (SID_SD_START+220)
#define ID_VAL_PAGEBOTTOM (SID_SD_START+221)
#define ID_VAL_PAGELEFT (SID_SD_START+222)
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index cf4d008f6cc8..7bb752c687ac 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1337,7 +1337,7 @@ SfxBoolItem DrawingMode SID_DRAWINGMODE
]
SfxVoidItem DuplicatePage SID_DUPLICATE_PAGE
-(SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout
ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem
IsPageObj ID_VAL_ISPAGEOBJ)
+(SfxStringItem PageName ID_VAL_PAGENAME,SfxUInt32Item WhatLayout
ID_VAL_WHATLAYOUT,SfxBoolItem IsPageBack ID_VAL_ISPAGEBACK,SfxBoolItem
IsPageObj ID_VAL_ISPAGEOBJ,SfxUInt16Item InsertPos ID_INSERT_POS)
[
AutoUpdate = FALSE,
FastCall = FALSE,
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index a7d466f6d94b..cb76eaf99844 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -189,7 +189,9 @@ SdPage* ViewShell::CreateOrDuplicatePage (
// 1. Process the arguments.
const SfxItemSet* pArgs = rRequest.GetArgs();
-if (! pArgs)
+const SfxUInt16Item* pInsertPos =
rRequest.GetArg(ID_INSERT_POS);
+
+if (! pArgs || (pArgs->Count() == 1 && pInsertPos))
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -206,7 +208,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
eNotesLayout = pNotesTemplatePage->GetAutoLayout();
}
}
-else if (pArgs->Count() == 1)
+else if (pArgs->Count() == 1 || pArgs->Count() == 2)
{
pDocument->StopWorkStartupDelay();
const SfxUInt32Item* pLayout =
rRequest.GetArg(ID_VAL_WHATLAYOUT);
@@ -222,7 +224,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
}
}
}
-else if (pArgs->Count() == 4)
+else if (pArgs->Count() == 4 || pArgs->Count() == 5)
{
// AutoLayouts must be ready
pDocument->StopWorkStartupDelay();
@@ -354,7 +356,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
aNotesPageName,
bIsPageBack,
bIsPageObj,
-nInsertPosition);
+pInsertPos ? (pInsertPos->GetValue()*2)+1 :
nInsertPosition);
break;
default:
[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source
sd/inc/diadef.h | 12 +---
sd/sdi/SlideSorterController.sdi|6 +++---
sd/sdi/sdgslots.sdi |6 +++---
sd/sdi/sdslots.sdi |6 +++---
sd/source/core/EffectMigration.cxx |6 +++---
sd/source/core/sdpage.cxx |2 +-
sd/source/filter/html/htmlex.cxx|2 +-
sd/source/filter/ppt/pptin.cxx |6 +++---
sd/source/ui/animations/SlideTransitionPane.cxx | 10 +-
9 files changed, 27 insertions(+), 29 deletions(-)
New commits:
commit eed94d15a49ad2038a59a3a1bfaa4a66a27ed540
Author: Noel Grandin
AuthorDate: Wed Apr 1 08:55:15 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Apr 1 09:37:34 2020 +0200
convert PresChange to scoped enum
Change-Id: I8184e436ae9c0fd2cb78a94b3146ab1903453f72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91459
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/inc/diadef.h b/sd/inc/diadef.h
index 0da1bd899d35..e09cab69649d 100644
--- a/sd/inc/diadef.h
+++ b/sd/inc/diadef.h
@@ -20,16 +20,14 @@
#ifndef INCLUDED_SD_INC_DIADEF_H
#define INCLUDED_SD_INC_DIADEF_H
-enum PresChange
+enum class PresChange
{
-PRESCHANGE_MANUAL = 0,
-PRESCHANGE_AUTO = 1,
-PRESCHANGE_SEMIAUTO = 2
+Manual = 0,
+Auto = 1,
+SemiAuto = 2,
+LAST = SemiAuto
};
-// has to be adjusted
-#define PRESCHANGE_COUNT 3
-
#endif // INCLUDED_SD_INC_DIADEF_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index e9d1ae77d7b2..8b4f08c63e1f 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -52,9 +52,9 @@ enum FadeSpeed
enum PresChange
{
-PRESCHANGE_MANUAL ,
-PRESCHANGE_AUTO ,
-PRESCHANGE_SEMIAUTO
+PresChange::Manual ,
+PresChange::Auto ,
+PresChange::SemiAuto
} ;
// Items
diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi
index f6731011037d..e7c94ab322cd 100644
--- a/sd/sdi/sdgslots.sdi
+++ b/sd/sdi/sdgslots.sdi
@@ -62,9 +62,9 @@ module StarDraw
enum PresChange
{
-PRESCHANGE_MANUAL,
-PRESCHANGE_AUTO,
-PRESCHANGE_SEMIAUTO
+PresChange::Manual,
+PresChange::Auto,
+PresChange::SemiAuto
};
// Items
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index 204cbfcafa2f..751c09901fa8 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -63,9 +63,9 @@ module StarDraw
enum PresChange
{
-PRESCHANGE_MANUAL,
-PRESCHANGE_AUTO,
-PRESCHANGE_SEMIAUTO
+PresChange::Manual,
+PresChange::Auto,
+PresChange::SemiAuto
};
// Items
diff --git a/sd/source/core/EffectMigration.cxx
b/sd/source/core/EffectMigration.cxx
index 8a62c180d82f..7ca5fcee2c92 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -509,7 +509,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape,
AnimationEffect eEff
CustomAnimationEffectPtr pEffect =
std::make_shared( xNode );
pEffect->setTarget( makeAny( xShape ) );
SdPage* pPage = dynamic_cast< SdPage* >(
pObj->getSdrPageFromSdrObject() );
-const bool bManual = (pPage == nullptr) ||
(pPage->GetPresChange() == PRESCHANGE_MANUAL);
+const bool bManual = (pPage == nullptr) ||
(pPage->GetPresChange() == PresChange::Manual);
if( !bManual )
pEffect->setNodeType( EffectNodeType::AFTER_PREVIOUS );
@@ -668,7 +668,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape*
pShape, AnimationEffect
pMainSequence->append( pShapeEffect );
SdPage* pPage = dynamic_cast< SdPage* >(
pObj->getSdrPageFromSdrObject() );
-if( pPage && pPage->GetPresChange() != PRESCHANGE_MANUAL )
+if( pPage && pPage->GetPresChange() != PresChange::Manual )
pShapeEffect->setNodeType(
EffectNodeType::AFTER_PREVIOUS );
}
}
@@ -677,7 +677,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape*
pShape, AnimationEffect
if( pShapeEffect.get() )
{
SdPage* pPage = dynamic_cast< SdPage* >(
pObj->getSdrPageFromSdrObject() );
-const bool bManual = (pPage == nullptr) || (pPage->GetPresChange()
== PRESCHANGE_MANUAL);
+const bool bManual = (pPage == nullptr) || (pPage->GetPresChange()
== PresChange::Manual);
// now create effects for each paragraph
pGroup =
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index fc2fcdafe155..7b50a3a9b0f9 100644
--- a/sd/source/core/sdpage.cxx
+++
[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source sfx2/source
sd/inc/app.hrc |1
sd/sdi/SlideSorterController.sdi |5
sd/sdi/drviewsh.sdi|5
sd/sdi/sdraw.sdi | 18 +
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 11 ++
sd/source/ui/view/drviews2.cxx |3 ++
sfx2/source/sidebar/DeckLayouter.cxx |1
sfx2/source/sidebar/SidebarController.cxx |1
8 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit 11b06f0e00fc21654384e2816842ab101e15010e
Author: Ashod Nakashian
AuthorDate: Sun Aug 26 22:11:43 2018 -0400
Commit: Noel Grandin
CommitDate: Thu Jul 25 12:18:58 2019 +0200
sidebar: Add .uno:MasterSlidesPanel
Change-Id: I578dc8b1f9c8df7f7cc9108c70d6fad8006871c6
Reviewed-on: https://gerrit.libreoffice.org/73502
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 9445f47cd0a7..40424d73097f 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -229,6 +229,7 @@
#define SID_BEFORE_OBJ (SID_SD_START+181)
// FREE
#define SID_CUSTOM_ANIMATION_PANEL (SID_SD_START+183)
+#define SID_MASTER_SLIDES_PANEL (SID_SD_START+184)
// FREE
// and even more...
#define ID_VAL_ENDINTENS(SID_SD_START+197)
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 5937ba159cec..e9d1ae77d7b2 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -204,6 +204,11 @@ interface SlideSorterView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_MASTER_SLIDES_PANEL // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_PRESENTATION_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 7ee014de5f76..1139fc5790b5 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -57,6 +57,11 @@ interface ImpressEditView : DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+SID_MASTER_SLIDES_PANEL // ole : no, status : ?
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_REHEARSE_TIMINGS // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index ad88ee8a09ab..ca7d5bed8ac1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3542,6 +3542,24 @@ SfxBoolItem SlideChangeWindow SID_SLIDE_TRANSITIONS_PANEL
GroupId = SfxGroupId::Modify;
]
+SfxBoolItem MasterSlidesPanel SID_MASTER_SLIDES_PANEL
+
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Modify;
+]
+
SfxVoidItem SlideMasterPage SID_SLIDE_MASTER_MODE
()
[
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 17b4adeeb958..4c2af27c3a93 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -181,6 +181,17 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
break;
}
+case SID_MASTER_SLIDES_PANEL:
+{
+// First make sure that the sidebar is visible
+pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
+::sfx2::sidebar::Sidebar::ShowPanel(
+"SdAllMasterPagesPanel",
+pShell->GetViewFrame()->GetFrame().GetFrameInterface());
+rRequest.Ignore ();
+break;
+}
+
case SID_PRESENTATION_DLG:
FuSlideShowDlg::Create (
pShell,
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 11025537247f..3c70dc1596c6 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3176,6 +3176,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
break;
case SID_SLIDE_TRANSITIONS_PANEL:
+case SID_MASTER_SLIDES_PANEL:
case SID_CUSTOM_ANIMATION_PANEL:
case SID_GALLERY:
{
@@ -3189,6 +3190,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
panelId = "GalleryPanel";
else if (nSId == SID_SLIDE_TRANSITIONS_PANEL)
panelId = "SdSlideTransitionPanel";
+else if (nSId == SID_MASTER_SLIDES_PANEL)
+panelId = "SdAllMasterPagesPanel";
::sfx2::sidebar::Sidebar::ShowPanel(
panelId,
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source
[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source
sd/inc/app.hrc |1
sd/inc/helpids.h |1
sd/sdi/drviewsh.sdi|5 ---
sd/sdi/sdraw.sdi | 20
sd/source/ui/dlg/navigatr.cxx | 64 -
sd/source/ui/dlg/navigatr.src | 12 ---
sd/source/ui/inc/navigatr.hrc |1
sd/source/ui/inc/navigatr.hxx |4 --
sd/source/ui/view/drviewsd.cxx |3 -
9 files changed, 14 insertions(+), 97 deletions(-)
New commits:
commit e69c4f978228fb443cf0f6d2a6679cb5a4c82940
Author: Bryan Quigley
Date: Wed Feb 3 15:02:43 2016 -0500
Remove pointer (pen) from Navigator window
It doesn't appear to have worked since LibreOffice 5.0,
and the best use case (to use it during a live slideshow)
has been removed per bug 96414.
Change-Id: I25dbaa0b9ab86a2a7324b9c496473bf29a5f6ac2
Reviewed-on: https://gerrit.libreoffice.org/22087
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 928a19f..0c05093 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -325,7 +325,6 @@
#define SID_NAVIGATOR_STATE (SID_SD_START+288)
#define SID_NAVIGATOR_INIT (SID_SD_START+289)
// FREE
-#define SID_NAVIGATOR_PEN (SID_SD_START+291)
#define SID_NAVIGATOR_PAGE (SID_SD_START+292)
#define SID_NAVIGATOR_OBJECT(SID_SD_START+293)
#define SID_ANIMATOR_INIT (SID_SD_START+294)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index c24b662..fdc48b2 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -28,7 +28,6 @@
#define HID_SD_NAVIGATOR
"SD_HID_SD_NAVIGATOR"
#define HID_SD_NAVIGATOR_TBX
"SD_HID_SD_NAVIGATOR_TBX"
#define HID_SD_NAVIGATOR_LB
"SD_HID_SD_NAVIGATOR_LB"
-#define HID_SD_NAVIGATOR_TBI_PEN
"SD_HID_SD_NAVIGATOR_TBI_PEN"
#define HID_SD_NAVIGATOR_TBI_FIRST
"SD_HID_SD_NAVIGATOR_TBI_FIRST"
#define HID_SD_NAVIGATOR_TBI_PREV
"SD_HID_SD_NAVIGATOR_TBI_PREV"
#define HID_SD_NAVIGATOR_TBI_NEXT
"SD_HID_SD_NAVIGATOR_TBI_NEXT"
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index b97d2b3..228467b 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -106,11 +106,6 @@ interface ImpressEditView : DrawView
ExecMethod = ExecAnimationWin ;
StateMethod = GetAnimationWinState ;
]
-SID_NAVIGATOR_PEN // ole : no, status : ?
-[
-ExecMethod = ExecNavigatorWin ;
-StateMethod = GetNavigatorWinState ;
-]
SID_PRESENTATION_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index ab32aa7..48fcbd1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3418,26 +3418,6 @@ SfxStringItem NavigatorPageName SID_NAVIGATOR_PAGENAME
GroupId = GID_EDIT;
]
-SfxBoolItem NavigatorPen SID_NAVIGATOR_PEN
-
-[
-/* flags: */
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-
-Readonly = FALSE,
-
-/* config: */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = GID_EDIT;
-]
SfxUInt32Item NavigatorState SID_NAVIGATOR_STATE
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 32098f7..bbee98c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -266,49 +266,22 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const
SdDrawDocument* pDoc )
IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
{
sal_uInt16 nId = maToolbox->GetCurItemId();
-sal_uInt16 nSId = 0;
PageJump ePage = PAGE_NONE;
-switch( nId )
-{
-case TBI_PEN:
-{
-if( nId == TBI_PEN )
-{
-nSId = SID_NAVIGATOR_PEN;
-}
+if( nId == TBI_FIRST )
+ePage = PAGE_FIRST;
+else if( nId == TBI_PREVIOUS )
+ePage = PAGE_PREVIOUS;
+else if( nId == TBI_NEXT )
+ePage = PAGE_NEXT;
+else if( nId == TBI_LAST )
+ePage = PAGE_LAST;
-if( nSId > 0 )
-{
-SfxBoolItem aItem( nSId, true );
-mpBindings->GetDispatcher()->Execute(
-nSId, SfxCallMode::SLOT |SfxCallMode::RECORD, &aItem, 0L );
-}
-}
-break;
-
-case TBI_FIRST:
-case TBI_PREVIOUS:
-case TBI_NEXT:
-case TBI_LAST:
-{
-if( nId == TBI_FIRST )
-ePage = PAGE_FIRST;
-else if( nId == TBI_PREVIOUS )
-ePage = PAGE_PREVIOUS;
-else if( nId == TBI_NEXT )
-ePage =
