[Libreoffice-commits] core.git: 2 commits - icon-themes/breeze icon-themes/colibre sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 icon-themes/breeze/links.txt                |    8 ++++++++
 icon-themes/colibre/links.txt               |    8 ++++++++
 sd/uiconfig/simpress/popupmenu/drawtext.xml |    3 ++-
 sw/uiconfig/swriter/popupmenu/text.xml      |    1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 295059082e46718526ab0cc296416447128ceb8c
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 19 02:35:31 2018 +0100
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Nov 19 22:16:38 2018 +0100

    Colibre Breeze icons: add masterpage and pagemode icons
    
    for draw from impress
    
    Change-Id: I60bb28ddf47ca4aa3ef16c9fd61e26ac80d4e721
    Reviewed-on: https://gerrit.libreoffice.org/63563
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index d102fd3b30ff..fc6cc36ed482 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1730,3 +1730,11 @@ cmd/lc_cellprotection.png cmd/lc_protect.png
 # writer
 # ===============================================
 cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png
+
+# draw
+# ===============================================
+cmd/sc_masterpage.png cmd/sc_slidemasterpage.png
+cmd/lc_masterpage.png cmd/lc_slidemasterpage.png
+
+cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png
+cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index eae2feed3cc2..ab1b9ee502b2 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1787,3 +1787,11 @@ cmd/sc_objectmenu.png cmd/sc_insertframe.png
 # ===============================================
 cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png
 cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png
+
+# draw
+# ===============================================
+cmd/sc_masterpage.png cmd/sc_slidemasterpage.png
+cmd/lc_masterpage.png cmd/lc_slidemasterpage.png
+
+cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png
+cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png
commit 68814c91eb11ac5c5320353267ae248f33f58df6
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Mon Nov 19 03:15:37 2018 +0100
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Mon Nov 19 22:16:27 2018 +0100

    tdf#61580 add insert comment to writer and impress
    
    Change-Id: I00fa63f9cb7c31f54732446aaf62b4a9b9fce522
    Reviewed-on: https://gerrit.libreoffice.org/63565
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/sd/uiconfig/simpress/popupmenu/drawtext.xml b/sd/uiconfig/simpress/popupmenu/drawtext.xml
index 0b47863183e6..53d8910b4d8c 100644
--- a/sd/uiconfig/simpress/popupmenu/drawtext.xml
+++ b/sd/uiconfig/simpress/popupmenu/drawtext.xml
@@ -14,7 +14,6 @@
   <menu:menuitem menu:id=".uno:PasteUnformatted"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:TextAttributes"/>
-  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuseparator/>
@@ -23,4 +22,6 @@
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:SetDefault"/>
   <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertAnnotation"/>
 </menu:menupopup>
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml
index 73738e313216..8295b50dd25e 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -75,6 +75,7 @@
     </menu:menupopup>
   </menu:menu>
   <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertAnnotation"/>
   <menu:menuitem menu:id=".uno:AcceptTrackedChange"/>
   <menu:menuitem menu:id=".uno:RejectTrackedChange"/>
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>