[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source sd/uiconfig svx/sdi

2019-05-28 Thread Gülşah Köse (via logerrit) 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 

 sd/sdi/_drvwsh.sdi   |6 ---
 sd/source/ui/view/drviews2.cxx   |7 

 sd/uiconfig/simpress/menubar/menubar.xml |1 
 svx/sdi/svx.sdi  |   17 
--
 5 files changed, 39 deletions(-)

New commits:
commit 1c3f71c1e5a7b3d6935505a4a6f96c8948187910
Author: Gülşah Köse 
AuthorDate: Mon May 27 17:43:13 2019 +0300
Commit: Gülşah Köse 
CommitDate: Tue May 28 10:04:16 2019 +0200

tdf#120905 Remove temporary uno command.

Change-Id: Id12838cf08a2e5b74b53bd0036804b886b41098f
Reviewed-on: https://gerrit.libreoffice.org/73041
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index dbd69129a620..ee1f797e7a1d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2879,14 +2879,6 @@
   7
 
   
-  
-
-  Numbering and Position...
-
-
-  7
-
-  
   
 
   E~dit Mode
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 1b0171dafea7..93a30e6757dc 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -710,12 +710,6 @@ interface DrawView
 StateMethod = GetMenuState ;
 MenuConfig = TRUE;
 ]
-SID_NUMBERING_AND_POSITION // ole : no, status : ?
-[
-ExecMethod = FuTemporary ;
-StateMethod = GetMenuState ;
-MenuConfig = TRUE;
-]
 FN_SVX_SET_BULLET
 [
 ExecMethod = FuTemporary ;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 5ad0e0bd6c94..007f3723b882 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1444,13 +1444,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 case FN_SVX_SET_BULLET:
 case FN_SVX_SET_NUMBER:
 {
-SetCurrentFunction( FuOutlineBullet::Create( this, 
GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq ) );
-Cancel();
-}
-break;
-
-case SID_NUMBERING_AND_POSITION:
-{
 SetCurrentFunction( FuBulletAndPosition::Create( this, 
GetActiveWindow(), mpDrawView.get(), GetDoc(), rReq ) );
 Cancel();
 }
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 7e20197d3673..1aaa09786d0c 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -393,7 +393,6 @@
   
   
   
-  
   
   
 
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3c63477df04e..00f4d7c9bca5 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5894,23 +5894,6 @@ SfxVoidItem OutlineBullet SID_OUTLINE_BULLET
 GroupId = SfxGroupId::Format;
 ]
 
-SfxVoidItem NumberingAndPosition SID_NUMBERING_AND_POSITION
-(SfxStringItem Page FN_PARAM_1)
-[
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = FALSE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = SfxGroupId::Format;
-]
-
 SfxUInt16Item SetNumber FN_SVX_SET_NUMBER
 [
 AutoUpdate = TRUE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk sfx2/source

2018-05-21 Thread Kshitij Pathania 
 officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu   |   96 
++
 officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs |5 
 sd/UIConfig_sdraw.mk   |4 
 sd/sdi/_docsh.sdi  |5 
 sd/source/ui/docshell/docshell.cxx |   15 +
 sd/uiconfig/sdraw/popupmenu/notebookbar.xml|   23 ++
 sd/uiconfig/sdraw/ui/notebookbar.ui|6 
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui |6 
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_full.ui|6 
 sfx2/source/notebookbar/SfxNotebookBar.cxx |   10 +
 10 files changed, 173 insertions(+), 3 deletions(-)

New commits:
commit 24d43f21e92c0db040f549a226c0889db20621ac
Author: Kshitij Pathania 
Date:   Fri May 18 19:50:01 2018 +0530

Activated notebookbar in draw

Added tabbed and two groupedbars mode of notebookbar.

Change-Id: I208a365139ca6c83510a73a8ffa0260b05787793
Reviewed-on: https://gerrit.libreoffice.org/54547
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
index 64959d508520..adf337557450 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu
@@ -10,6 +10,9 @@
   
 notebookbar.ui
   
+  
+notebookbar.ui
+  
   
 
   
@@ -679,6 +682,99 @@
 Arrow
   
 
+
+  
+Tabbed
+  
+  
+true
+  
+  
+true
+  
+  
+1
+  
+  
+notebookbar.ui
+  
+  
+
+
+  
+  
+
+
+  
+  
+Arrow
+  
+  
+true
+  
+
+
+  
+Groupedbar Compact
+  
+  
+true
+  
+  
+true
+  
+  
+8
+  
+  
+notebookbar_groupedbar_compact.ui
+  
+  
+
+
+  
+  
+
+
+  
+  
+Arrow
+  
+  
+true
+  
+
+
+  
+Groupedbar
+  
+  
+true
+  
+  
+true
+  
+  
+7
+  
+  
+notebookbar_groupedbar_full.ui
+  
+  
+
+
+  
+  
+
+
+  
+  
+Arrow
+  
+  
+true
+  
+
   
 
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
index d641e80afb5e..f97ec55e2dc8 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs
@@ -113,6 +113,11 @@
 Contains name of currently used implementation in the Impress 
module.
   
 
+
+  
+Contains name of currently used implementation in the Draw 
module.
+  
+
 
   
 Contains list of toolbar mode settings for each 
application.
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 0091db50ddd8..a172013a70dd 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
sd/uiconfig/sdraw/popupmenu/measure \
sd/uiconfig/sdraw/popupmenu/media \
sd/uiconfig/sdraw/popupmenu/multiselect \
+   sd/uiconfig/sdraw/popupmenu/notebookbar \
sd/uiconfig/sdraw/popupmenu/oleobject \
sd/uiconfig/sdraw/popupmenu/outlinetext \
sd/uiconfig/sdraw/popupmenu/pagepanemaster \
@@ -111,6 +112,9 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/insertlayer \
sd/uiconfig/sdraw/ui/insertslidesdialog \
sd/uiconfig/sdraw/ui/namedesign \
+   sd/uiconfig/sdraw/ui/notebookbar \
+   sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact \
+   sd/uiconfig/sdraw/ui/notebookbar_groupedbar_full \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
sd/uiconfig/sdraw/ui/vectorize \
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index ce225b38d922..29db81db02d2 100644
--- a/sd/sdi/_docsh.sdi
+++

[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source sd/uiconfig

2013-04-10 Thread Gergő Mocsi 
 officecfg/registry/data/org/openoffice/Office/Impress.xcu|
5 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
2 
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs  |   
17 
 sd/sdi/SlideSorterController.sdi |
1 
 sd/sdi/drviewsh.sdi  |
1 
 sd/sdi/outlnvsh.sdi  |
3 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|  
701 --
 sd/source/ui/dlg/PhotoAlbumDialog.hxx|   
35 
 sd/source/ui/view/drviews6.cxx   |   
20 
 sd/uiconfig/simpress/menubar/menubar.xml |
3 
 sd/uiconfig/simpress/ui/photoalbum.ui|   
35 
 11 files changed, 723 insertions(+), 100 deletions(-)

New commits:
commit 3a56257e858c6793156a78b387451802593455e0
Author: Gergő Mocsi gmocs...@gmail.com
Date:   Tue Apr 2 12:57:59 2013 +0200

Create Photo Album implementation

Added a checkbox to enable/diable Keep Aspect ratio.
Options 2 images/slide, 4 images/slide implemented.
UI tweaks: dialog window remembers last used directory (via config),
buttons get enabled/disabled according to the content of the ListBox.
ListBox show filename only, full path is shown lower in a label.
Dialog window reopens again, if slide preview is not in focus.
Added a title slide: author, title.

Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
sd/uiconfig/simpress/ui/photoalbum.ui

Change-Id: I68d2a3e00f8c55b909fe4d98aa3958188653390e
Reviewed-on: https://gerrit.libreoffice.org/3169
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu 
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index dfff9b0..3793b99 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -195,4 +195,9 @@
   value 
oor:separator=;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml/value
 /prop
   /node
+  node oor:name=Pictures oor:op=fuse oor:mandatory=true
+prop oor:name=Path
+  value$(work)/value
+/prop
+  /node
 /oor:component-data
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 50afd03..d135cd13 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -55,7 +55,7 @@
   /node
  node oor:name=.uno:PhotoAlbumDialog oor:op=replace
 prop oor:name=Label oor:type=xs:string
-  value xml:lang=en-USCreate Photo Album/value
+  value xml:lang=en-USPhoto Album/value
 /prop
 prop oor:name=Properties oor:type=xs:int
   value1/value
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index e84ba82..ec0c12b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1594,5 +1594,22 @@
 /group
   /group
 /group
+group oor:name=Pictures
+info
+desc
+Contains configuration items form Impress Photo Album function.
+/desc
+/info
+prop oor:name=Path oor:type=xs:string oor:nillable=false
+info
+authorGM/author
+desc
+Access path, where images were loaded last time.
+The default is work directory.
+/desc
+/info
+value$(work)/value
+/prop
+/group
   /component
 /oor:component-schema
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index d1af8d0..f38a3a8 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -297,6 +297,7 @@ interface SlideSorterView
 SID_PHOTOALBUM
 [
 ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
 ]
 }
 
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index d4aab0e..5f58cb8 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -216,6 +216,7 @@ interface ImpressEditView : DrawView
 SID_PHOTOALBUM
 [
 ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
 ]
 }
 
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 9d2db2b..1e8991f 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@