[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic ooo_custom_images/industrial
default_images/sw/imglst/sc20175.png |binary default_images/sw/imglst/sc20186.png |binary default_images/sw/imglst/sch20175.png |binary default_images/sw/imglst/sch20186.png |binary ooo_custom_images/classic/classic_images.tar.gz|binary ooo_custom_images/industrial/sw/imglst/sc20175.png |binary ooo_custom_images/industrial/sw/imglst/sc20186.png |binary 7 files changed New commits: commit cde3abc07c361395d2641bbf1c6eb12858e287f4 Author: Matthias Seidel AuthorDate: Sat Jul 27 17:10:59 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 27 17:10:59 2019 + Use correct icons for navigation up/down diff --git a/default_images/sw/imglst/sc20175.png b/default_images/sw/imglst/sc20175.png index b2c0c5e13911..86f642613bee 100644 Binary files a/default_images/sw/imglst/sc20175.png and b/default_images/sw/imglst/sc20175.png differ diff --git a/default_images/sw/imglst/sc20186.png b/default_images/sw/imglst/sc20186.png index 1d5658794522..5c75626e9525 100644 Binary files a/default_images/sw/imglst/sc20186.png and b/default_images/sw/imglst/sc20186.png differ diff --git a/default_images/sw/imglst/sch20175.png b/default_images/sw/imglst/sch20175.png index 06e01b67bbb8..2d766045efde 100644 Binary files a/default_images/sw/imglst/sch20175.png and b/default_images/sw/imglst/sch20175.png differ diff --git a/default_images/sw/imglst/sch20186.png b/default_images/sw/imglst/sch20186.png index a3fd98dc2a86..5c117bed0372 100644 Binary files a/default_images/sw/imglst/sch20186.png and b/default_images/sw/imglst/sch20186.png differ diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz index 12106f894804..f83fa028b17d 100644 Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20175.png b/ooo_custom_images/industrial/sw/imglst/sc20175.png index 0c8f07b3ffce..262f8f1e9eeb 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20175.png and b/ooo_custom_images/industrial/sw/imglst/sc20175.png differ diff --git a/ooo_custom_images/industrial/sw/imglst/sc20186.png b/ooo_custom_images/industrial/sw/imglst/sc20186.png index 3b6f27174155..52dea32d84f9 100644 Binary files a/ooo_custom_images/industrial/sw/imglst/sc20186.png and b/ooo_custom_images/industrial/sw/imglst/sc20186.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic svx/source
default_images/sw/res/point.png |binary
ooo_custom_images/classic/classic_images.tar.gz |binary
svx/source/src/errtxt.src |2 +-
3 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7e171a0440aa44b2003f9ddd3a5cebe85765953
Author: Matthias Seidel
AuthorDate: Sun Jul 21 15:51:28 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jul 21 15:51:28 2019 +
Smaller corrections to my recent commits
diff --git a/default_images/sw/res/point.png b/default_images/sw/res/point.png
index 587f080e99de..c58a792d8959 100644
Binary files a/default_images/sw/res/point.png and
b/default_images/sw/res/point.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index 425e06fcabb7..02c56886f82f 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src
index afef54975f14..d02fecac7816 100644
--- a/svx/source/src/errtxt.src
+++ b/svx/source/src/errtxt.src
@@ -474,7 +474,7 @@ Resource RID_ERRHDL
};
String ERRCODE_SFX_INCOMPLETE_ENCRYPTION
{
-Text [ en-US ] = "The encrypted document contains unexpected
non-encrypted streams.\n\nThis could be the result of document
manipulation.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n" ;
+Text [ en-US ] = "The encrypted document contains unexpected
non-encrypted streams.\n\nThis could be the result of document
manipulation.\n\nWe recommend that you do not trust the content of the current
document.\nExecution of macros is disabled for this document.\n " ;
};
String ERRCODE_IO_INVALIDLENGTH
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw ooo_custom_images/classic packimages/pack sw/source
ooo_custom_images/classic/classic_images.tar.gz |binary
packimages/pack/image-sort.lst | 10 +--
sw/source/ui/ribbar/workctrl.src| 80 +---
3 files changed, 35 insertions(+), 55 deletions(-)
New commits:
commit 732a62d93c84fc8d403c7d252f210b5173c4be9d
Author: Matthias Seidel
AuthorDate: Sun Jul 21 11:59:22 2019 +
Commit: Matthias Seidel
CommitDate: Sun Jul 21 11:59:22 2019 +
Rename graphics (punkt->point), general cleanup
diff --git a/default_images/sw/res/punkt.png b/default_images/sw/res/point.png
similarity index 100%
rename from default_images/sw/res/punkt.png
rename to default_images/sw/res/point.png
diff --git a/default_images/sw/res/punkt_h.png
b/default_images/sw/res/point_h.png
similarity index 100%
rename from default_images/sw/res/punkt_h.png
rename to default_images/sw/res/point_h.png
diff --git a/ooo_custom_images/classic/classic_images.tar.gz
b/ooo_custom_images/classic/classic_images.tar.gz
index d01e3879e387..425e06fcabb7 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and
b/ooo_custom_images/classic/classic_images.tar.gz differ
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index d7a615be3bda..b66eeaf55de4 100644
--- a/packimages/pack/image-sort.lst
+++ b/packimages/pack/image-sort.lst
@@ -1,9 +1,9 @@
#
# This file exists to help improve the ordering of
-# icons inside the OO.o theme / images.zip file.
+# icons inside the AOO theme / images.zip file.
#
# Sections are processed together, and are delimited
-# by '-- [small]' a 'group' tage denotes equal
+# by '-- [small]' a 'group' tag denotes equal
# importance: icons must be interleaved, 'ordered'
# denotes a simple best-fit order. 'literal' denotes
# a list of explicit image loads
@@ -11,8 +11,8 @@
res/mainapp_16.png
res/mainapp_32.png
-sw/res/punkt.png
-sw/res/punkt_h.png
+sw/res/point.png
+sw/res/point_h.png
res/sx03251.png
res/lx03251.png
@@ -46,7 +46,7 @@ svtools/res/bmpfont.png
svtools/res/scalfont.png
svx/res/signet_11x16.png
svx/res/caution_11x16.png
-svx/res/notcertificate_16.png
+svx/res/notcertificate_11x16.png
res/sc10223.png
res/sc10224.png
res/sx03250.png
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index aa3321fd4294..b0e21b0b4ba1 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -47,7 +47,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TIME ;
Text [ en-US ] = "Time" ;
};
- //#ifndef MN_SW_WEB
+//#ifndef MN_SW_WEB
MenuItem
{
Identifier = FN_INSERT_FLD_PGNUMBER ;
@@ -72,7 +72,7 @@ Menu RID_INSERT_FIELD_CTRL
HelpId = CMD_FN_INSERT_FLD_TITLE ;
Text [ en-US ] = "Title" ;
};
- //#endif
+//#endif
MenuItem
{
Identifier = FN_INSERT_FLD_AUTHOR ;
@@ -91,7 +91,7 @@ Menu RID_INSERT_FIELD_CTRL
};
};
};
-#define SCROLL_IMAGE_IDLIST \
+#define SCROLL_IMAGE_IDLIST \
IdList =\
{ \
NID_NEXT ; \
@@ -111,9 +111,9 @@ Menu RID_INSERT_FIELD_CTRL
NID_MARK ; \
NID_POSTIT ;\
NID_SRCH_REP ; \
-NID_INDEX_ENTRY;\
-NID_TABLE_FORMULA; \
-NID_TABLE_FORMULA_ERROR;\
+NID_INDEX_ENTRY ; \
+NID_TABLE_FORMULA ; \
+NID_TABLE_FORMULA_ERROR ; \
}; \
IdCount = { 20 ; };
@@ -126,26 +126,26 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
HelpID = HID_INSERT_CTRL ;
ImageList IL_VALUES
{
-Prefix = "sr";
+Prefix = "sr" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
ImageList ILH_VALUES
{
-Prefix = "srh";
+Prefix = "srh" ;
MaskColor = IMAGE_MASK_COLOR ;
SCROLL_IMAGE_IDLIST
};
FixedLine FL_SEP
{
//no position, no text
-Size = MAP_APPFONT ( 20 , 4 ) ;
+Size = MAP_APPFONT ( 20, 4 ) ;
};
FixedText FI_INFO
{
//no position, no text
-Size = MAP_APPFONT ( 20 , 8 ) ;
-Center = TRUE;
+Size = MAP_APPFONT ( 20, 8 ) ;
+Center = TRUE ;
};
String ST_TBL
{
@@ -185,7 +185,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_OUTL
{
-/* ### ACHTUNG: Neuer Text in Resource? �berschrift : �berschrift */
Text [ en-US ] = "Headings" ;
};
String ST_SEL
@@ -194,7 +193,6 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_FTN
{
-/* ### ACHTUNG: Neuer Text in Resource? Fu�note : Fu�note */
Text [ en-US ] = "Footnote" ;
};
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sw
default_images/sw/res/punkt.png |binary default_images/sw/res/punkt_h.png |binary 2 files changed New commits: commit d574acfca286e8d3b9d73559664294a6b2c3d86d Author: Matthias Seidel AuthorDate: Sat Jul 20 22:46:55 2019 + Commit: Matthias Seidel CommitDate: Sat Jul 20 22:46:55 2019 + Updated graphics (navigation) diff --git a/default_images/sw/res/punkt.png b/default_images/sw/res/punkt.png index c5870270382d..587f080e99de 100644 Binary files a/default_images/sw/res/punkt.png and b/default_images/sw/res/punkt.png differ diff --git a/default_images/sw/res/punkt_h.png b/default_images/sw/res/punkt_h.png index 9902f58db1e3..75426c941aa9 100644 Binary files a/default_images/sw/res/punkt_h.png and b/default_images/sw/res/punkt_h.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
