icon-themes/breeze/sd/res/displaymode_handoutmaster.png |binary
icon-themes/breeze/sd/res/displaymode_notes.png |binary
icon-themes/breeze/sd/res/displaymode_notesmaster.png |binary
icon-themes/breeze/sd/res/displaymode_outline.png |binary
icon-themes/breeze/sd/res/displaymode_slide.png |binary
icon-themes/breeze/sd/res/displaymode_slidemaster.png |binary
icon-themes/breeze/sd/res/displaymode_slidesorter.png |binary
icon-themes/galaxy/cmd/lc_displaymode.png |binary
icon-themes/galaxy/sd/res/displaymode_handoutmaster.png |binary
icon-themes/galaxy/sd/res/displaymode_notes.png |binary
icon-themes/galaxy/sd/res/displaymode_notesmaster.png |binary
icon-themes/galaxy/sd/res/displaymode_outline.png |binary
icon-themes/galaxy/sd/res/displaymode_slide.png |binary
icon-themes/galaxy/sd/res/displaymode_slidemaster.png |binary
icon-themes/galaxy/sd/res/displaymode_slidesorter.png |binary
icon-themes/tango/cmd/lc_displaymode.png |binary
icon-themes/tango/sd/res/displaymode_handoutmaster.png |binary
icon-themes/tango/sd/res/displaymode_notes.png |binary
icon-themes/tango/sd/res/displaymode_notesmaster.png |binary
icon-themes/tango/sd/res/displaymode_outline.png |binary
icon-themes/tango/sd/res/displaymode_slide.png |binary
icon-themes/tango/sd/res/displaymode_slidemaster.png |binary
icon-themes/tango/sd/res/displaymode_slidesorter.png |binary
sd/source/ui/app/res_bmp.src | 28 ++++++++++++++++
sd/source/ui/inc/res_bmp.hrc | 8 ++++
writerfilter/source/dmapper/FormControlHelper.cxx | 2 -
26 files changed, 37 insertions(+), 1 deletion(-)
New commits:
commit 2085d5dcbc2c2158996e52e84c50ca5d5d100be7
Author: Philippe Jung <phil.j...@free.fr>
Date: Wed Jul 8 21:04:40 2015 +0200
Add icons for future display mode selector
Change-Id: Iddc3a3dec55a4c1c2fb9fcb4cf6e9449b4f1d11e
Reviewed-on: https://gerrit.libreoffice.org/16934
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/icon-themes/breeze/sd/res/displaymode_handoutmaster.png
b/icon-themes/breeze/sd/res/displaymode_handoutmaster.png
new file mode 100644
index 0000000..8cd68fc
Binary files /dev/null and
b/icon-themes/breeze/sd/res/displaymode_handoutmaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_notes.png
b/icon-themes/breeze/sd/res/displaymode_notes.png
new file mode 100644
index 0000000..01282985
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_notes.png
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_notesmaster.png
b/icon-themes/breeze/sd/res/displaymode_notesmaster.png
new file mode 100644
index 0000000..576ae76
Binary files /dev/null and
b/icon-themes/breeze/sd/res/displaymode_notesmaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_outline.png
b/icon-themes/breeze/sd/res/displaymode_outline.png
new file mode 100644
index 0000000..5ec82cb
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_outline.png
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slide.png
b/icon-themes/breeze/sd/res/displaymode_slide.png
new file mode 100644
index 0000000..43d8377
Binary files /dev/null and b/icon-themes/breeze/sd/res/displaymode_slide.png
differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slidemaster.png
b/icon-themes/breeze/sd/res/displaymode_slidemaster.png
new file mode 100644
index 0000000..9ea9f8d
Binary files /dev/null and
b/icon-themes/breeze/sd/res/displaymode_slidemaster.png differ
diff --git a/icon-themes/breeze/sd/res/displaymode_slidesorter.png
b/icon-themes/breeze/sd/res/displaymode_slidesorter.png
new file mode 100644
index 0000000..4e401f8
Binary files /dev/null and
b/icon-themes/breeze/sd/res/displaymode_slidesorter.png differ
diff --git a/icon-themes/galaxy/cmd/lc_displaymode.png
b/icon-themes/galaxy/cmd/lc_displaymode.png
new file mode 100644
index 0000000..481407d
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_displaymode.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png
b/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png
new file mode 100644
index 0000000..8cd68fc
Binary files /dev/null and
b/icon-themes/galaxy/sd/res/displaymode_handoutmaster.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_notes.png
b/icon-themes/galaxy/sd/res/displaymode_notes.png
new file mode 100644
index 0000000..01282985
Binary files /dev/null and b/icon-themes/galaxy/sd/res/displaymode_notes.png
differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_notesmaster.png
b/icon-themes/galaxy/sd/res/displaymode_notesmaster.png
new file mode 100644
index 0000000..576ae76
Binary files /dev/null and
b/icon-themes/galaxy/sd/res/displaymode_notesmaster.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_outline.png
b/icon-themes/galaxy/sd/res/displaymode_outline.png
new file mode 100644
index 0000000..5ec82cb
Binary files /dev/null and b/icon-themes/galaxy/sd/res/displaymode_outline.png
differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_slide.png
b/icon-themes/galaxy/sd/res/displaymode_slide.png
new file mode 100644
index 0000000..43d8377
Binary files /dev/null and b/icon-themes/galaxy/sd/res/displaymode_slide.png
differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_slidemaster.png
b/icon-themes/galaxy/sd/res/displaymode_slidemaster.png
new file mode 100644
index 0000000..9ea9f8d
Binary files /dev/null and
b/icon-themes/galaxy/sd/res/displaymode_slidemaster.png differ
diff --git a/icon-themes/galaxy/sd/res/displaymode_slidesorter.png
b/icon-themes/galaxy/sd/res/displaymode_slidesorter.png
new file mode 100644
index 0000000..4e401f8
Binary files /dev/null and
b/icon-themes/galaxy/sd/res/displaymode_slidesorter.png differ
diff --git a/icon-themes/tango/cmd/lc_displaymode.png
b/icon-themes/tango/cmd/lc_displaymode.png
new file mode 100644
index 0000000..481407d
Binary files /dev/null and b/icon-themes/tango/cmd/lc_displaymode.png differ
diff --git a/icon-themes/tango/sd/res/displaymode_handoutmaster.png
b/icon-themes/tango/sd/res/displaymode_handoutmaster.png
new file mode 100644
index 0000000..8cd68fc
Binary files /dev/null and
b/icon-themes/tango/sd/res/displaymode_handoutmaster.png differ
diff --git a/icon-themes/tango/sd/res/displaymode_notes.png
b/icon-themes/tango/sd/res/displaymode_notes.png
new file mode 100644
index 0000000..01282985
Binary files /dev/null and b/icon-themes/tango/sd/res/displaymode_notes.png
differ
diff --git a/icon-themes/tango/sd/res/displaymode_notesmaster.png
b/icon-themes/tango/sd/res/displaymode_notesmaster.png
new file mode 100644
index 0000000..576ae76
Binary files /dev/null and
b/icon-themes/tango/sd/res/displaymode_notesmaster.png differ
diff --git a/icon-themes/tango/sd/res/displaymode_outline.png
b/icon-themes/tango/sd/res/displaymode_outline.png
new file mode 100644
index 0000000..5ec82cb
Binary files /dev/null and b/icon-themes/tango/sd/res/displaymode_outline.png
differ
diff --git a/icon-themes/tango/sd/res/displaymode_slide.png
b/icon-themes/tango/sd/res/displaymode_slide.png
new file mode 100644
index 0000000..43d8377
Binary files /dev/null and b/icon-themes/tango/sd/res/displaymode_slide.png
differ
diff --git a/icon-themes/tango/sd/res/displaymode_slidemaster.png
b/icon-themes/tango/sd/res/displaymode_slidemaster.png
new file mode 100644
index 0000000..9ea9f8d
Binary files /dev/null and
b/icon-themes/tango/sd/res/displaymode_slidemaster.png differ
diff --git a/icon-themes/tango/sd/res/displaymode_slidesorter.png
b/icon-themes/tango/sd/res/displaymode_slidesorter.png
new file mode 100644
index 0000000..4e401f8
Binary files /dev/null and
b/icon-themes/tango/sd/res/displaymode_slidesorter.png differ
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 45fc2df..a138c19 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -103,6 +103,34 @@ Bitmap BMP_FOILH_09
{
File = "foilh09.png";
};
+Bitmap BMP_DISPLAYMODE_SLIDE
+{
+ File = "displaymode_slide.png";
+};
+Bitmap BMP_DISPLAYMODE_OUTLINE
+{
+ File = "displaymode_outline.png";
+};
+Bitmap BMP_DISPLAYMODE_NOTES
+{
+ File = "displaymode_notes.png";
+};
+Bitmap BMP_DISPLAYMODE_SLIDE_SORTER
+{
+ File = "displaymode_slidesorter.png";
+};
+Bitmap BMP_DISPLAYMODE_SLIDE_MASTER
+{
+ File = "displaymode_slidemaster.png";
+};
+Bitmap BMP_DISPLAYMODE_NOTES_MASTER
+{
+ File = "displaymode_notesmaster.png";
+};
+Bitmap BMP_DISPLAYMODE_HANDOUT_MASTER
+{
+ File = "displaymode_handoutmaster.png";
+};
Bitmap BMP_PLACEHOLDER_CHART_SMALL
{
File = "placeholder_chart_small.png";
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 93ec740..135c710 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -64,6 +64,14 @@
#define BMP_LAYOUT_VERTICAL01 RID_SD_START+364
#define BMP_LAYOUT_VERTICAL02 RID_SD_START+366
+#define BMP_DISPLAYMODE_SLIDE (RID_SD_START+367)
+#define BMP_DISPLAYMODE_OUTLINE (RID_SD_START+368)
+#define BMP_DISPLAYMODE_NOTES (RID_SD_START+369)
+#define BMP_DISPLAYMODE_SLIDE_SORTER (RID_SD_START+370)
+#define BMP_DISPLAYMODE_SLIDE_MASTER (RID_SD_START+371)
+#define BMP_DISPLAYMODE_NOTES_MASTER (RID_SD_START+372)
+#define BMP_DISPLAYMODE_HANDOUT_MASTER (RID_SD_START+373)
+ // FREE
#define BMP_FOILH_01 RID_SD_START+388
#define BMP_FOILH_02 RID_SD_START+390
#define BMP_FOILH_03 RID_SD_START+392
commit 379fe0409e7973b36210cffa3dd1dfd4032f0ecc
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Nov 17 10:49:32 2015 +0100
Assume that this code wants to append a number, not a character
The original code in 2638faa2e834c2da4c195224fd88d32c29b3d0cc
"writerfilter08ooo330: applied patch for writerfilter08" used
OUString::valueOf,
which 64b993e046f23baaacaff1572b7d2a816588b5ef "finish deprecation of
O(U)String::valueOf()" changed to a OUString ctor instead of
OUString::number
(as that change did for almost all other cases), but without giving a
rationale
for this particular case. But as nUnique starts out as zero, so in the
first
round would append a NUL character to "DOCX-Standard", it looks plausible
that
this code should add a number after all.
Change-Id: I47136486e28b946fa334a416d1d2fe20ad616ff0
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx
b/writerfilter/source/dmapper/FormControlHelper.cxx
index c35edcf..abcdc9f 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -98,7 +98,7 @@ uno::Reference<form::XForm>
FormControlHelper::FormControlHelper_Impl::getForm()
{
++nUnique;
sFormName = sDOCXForm;
- sFormName += OUString(nUnique);
+ sFormName += OUString::number(nUnique);
}
uno::Reference<uno::XInterface>
xForm(getServiceFactory()->createInstance("com.sun.star.form.component.Form"));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
