[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2019-06-10 Thread Matthias Seidel (via logerrit) 
 cui/source/tabpages/connect.src |  138 +++-
 1 file changed, 53 insertions(+), 85 deletions(-)

New commits:
commit d78e60f7b9167eb893cccee3f3206af9ffc55c0b
Author: Matthias Seidel 
AuthorDate: Tue Jun 11 00:00:47 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 11 00:00:47 2019 +

Cleaned up whitespace

diff --git a/cui/source/tabpages/connect.src b/cui/source/tabpages/connect.src
index eca67a660371..520f7d75a757 100644
--- a/cui/source/tabpages/connect.src
+++ b/cui/source/tabpages/connect.src
@@ -20,56 +20,57 @@
  */
 
 
- // pragma 
 
- // include ---
+// pragma 
+
+// include ---
 #include 
 #include "connect.hrc"
 #include 
 #include "helpid.hrc"
 #include 
 
- // RID_SVXPAGE_CONNECTION 
+// RID_SVXPAGE_CONNECTION 
 TabPage RID_SVXPAGE_CONNECTION
 {
 HelpId = HID_PAGE_CONNECTION ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 Text [ en-US ] = "Connector" ;
 FixedText FT_TYPE
 {
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 25 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 25, 8 ) ;
 Text [ en-US ] = "~Type" ;
 };
 ListBox LB_TYPE
 {
-HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE";
+HelpID = "cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 37 , 6 ) ;
-Size = MAP_APPFONT ( 83 , 54 ) ;
+Pos = MAP_APPFONT ( 37, 6 ) ;
+Size = MAP_APPFONT ( 83, 54 ) ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
 FixedLine FL_DELTA
 {
-Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 120 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+Pos = MAP_APPFONT ( 6, 24 ) ;
+Size = MAP_APPFONT ( 120, RSC_CD_FIXEDLINE_HEIGHT ) ;
 Text [ en-US ] = "Line skew" ;
 };
 FixedText FT_LINE_1
 {
-Pos = MAP_APPFONT ( 12 , 37  ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 37 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
 Text [ en-US ] = "Line ~1" ;
 };
 MetricField MTR_FLD_LINE_1
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 35  ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 35 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
 TabStop = TRUE ;
 Spin = TRUE ;
 Repeat = TRUE ;
@@ -83,16 +84,16 @@ TabPage RID_SVXPAGE_CONNECTION
 };
 FixedText FT_LINE_2
 {
-Pos = MAP_APPFONT ( 12 , 53 ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 53 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
 Text [ en-US ] = "Line ~2" ;
 };
 MetricField MTR_FLD_LINE_2
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 51 ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 51 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
 TabStop = TRUE ;
 Spin = TRUE ;
 Repeat = TRUE ;
@@ -106,16 +107,16 @@ TabPage RID_SVXPAGE_CONNECTION
 };
 FixedText FT_LINE_3
 {
-Pos = MAP_APPFONT ( 12 , 69 ) ;
-Size = MAP_APPFONT ( 66 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 69 ) ;
+Size = MAP_APPFONT ( 66, 8 ) ;
 Text [ en-US ] = "Line ~3" ;
 };
 MetricField MTR_FLD_LINE_3
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3";
+HelpID = "cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 79 , 67 ) ;
-Size = MAP_APPFONT ( 41 , 12 ) ;
+Pos = MAP_APPFONT ( 79, 67 ) ;
+Size = MAP_APPFONT ( 41, 12 ) ;
 TabStop = TRUE ;
 Spin = TRUE ;
 Repeat = TRUE ;
@@ -129,22 +130,22 @@ TabPage RID_SVXPAGE_CONNECTION
 };
 FixedLine FL_DISTANCE
 {
-Pos = MAP_APPFONT ( 6 , 85 ) ;
-Size = MAP_APPFONT ( 120 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+Pos = MAP_APPFONT ( 6, 85 ) ;
+Size = MAP_APPFONT ( 120, RSC_CD_FIXEDLINE_HEIGHT ) ;
 Text [ en-US ] = "Line spacing" ;
 };
 FixedText FT_HORZ_1
 {
-Pos = MAP_APPFONT ( 12 , 98 ) ;
-Size = MAP_APPFONT (

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2019-01-19 Thread Libreoffice Gerrit user 
 cui/source/options/treeopt.src |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4bd9114409483053198e3322a059272cb716cf2
Author: Matthias Seidel 
AuthorDate: Sat Jan 19 09:05:35 2019 +
Commit: Matthias Seidel 
CommitDate: Sat Jan 19 09:05:35 2019 +

Re-added entries for Maskcolor.

Will investigate further why this is needed here.

diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 4296dc99ef74..d8fe903b31ba 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -302,6 +302,7 @@ String RID_RIDER_SLL_PERSONAL
 Text [ en-US ] = "Personal certificates" ;
 };
 
+#define MASK_COLMaskColor = Color { Red = 0xFF00; Green = 0x; Blue = 
0xFF00; } ;
 #define IMGLST_IDLST \
 IdList = {  \
 SID_GENERAL_OPTIONS;\
@@ -324,12 +325,14 @@ String RID_RIDER_SLL_PERSONAL
 ImageList RID_IMGLIST_TREEOPT
 {
 Prefix = "tr" ;
+MASK_COL
 IMGLST_IDLST
 };
 
 ImageList RID_IMGLIST_TREEOPT_HC
 {
 Prefix = "trh" ;
+MASK_COL
 IMGLST_IDLST
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2019-01-17 Thread Libreoffice Gerrit user 
 cui/source/options/treeopt.src |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f05d3c45e9a63389c7ebff4c018fc44bd3efbd00
Author: Matthias Seidel 
AuthorDate: Thu Jan 17 12:06:56 2019 +
Commit: Matthias Seidel 
CommitDate: Thu Jan 17 12:06:56 2019 +

Forgot to remove two lines for MASKCOLOR

diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 1fe188fe1bfa..4296dc99ef74 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -324,14 +324,12 @@ String RID_RIDER_SLL_PERSONAL
 ImageList RID_IMGLIST_TREEOPT
 {
 Prefix = "tr" ;
-MASK_COL
 IMGLST_IDLST
 };
 
 ImageList RID_IMGLIST_TREEOPT_HC
 {
 Prefix = "trh" ;
-MASK_COL
 IMGLST_IDLST
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2019-01-16 Thread Libreoffice Gerrit user 
 cui/source/options/treeopt.src |  251 -
 1 file changed, 126 insertions(+), 125 deletions(-)

New commits:
commit 49d68b8ac2685703957b8541a9b5b81ee1c93452
Author: Matthias Seidel 
AuthorDate: Wed Jan 16 20:25:35 2019 +
Commit: Matthias Seidel 
CommitDate: Wed Jan 16 20:25:35 2019 +

Cleaned up resource file

Removed entry for MASKCOLOR

diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index d43b4c970ad0..1fe188fe1bfa 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -30,91 +30,92 @@
 
 ModalDialog RID_OFADLG_OPTIONS_TREE
 {
-HelpID = HID_OFADLG_OPTIONS_TREE;
+HelpID = HID_OFADLG_OPTIONS_TREE ;
 Moveable = TRUE ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
 
-Size = MAP_APPFONT ( COL_12 , ROW_5 ) ;
-Text [ en-US ] = "Options";
+Size = MAP_APPFONT ( COL_12, ROW_5 ) ;
+Text [ en-US ] = "Options" ;
 
 OKButton PB_OK
 {
 Pos = MAP_APPFONT ( COL_4, ROW_3 ) ;
-Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
) ;
 TabStop = TRUE ;
-DefButton = TRUE;
+DefButton = TRUE ;
 };
 CancelButton PB_CANCEL
 {
 Pos = MAP_APPFONT ( COL_6, ROW_3 ) ;
-Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
) ;
 TabStop = TRUE ;
 };
 HelpButton PB_HELP
 {
 Pos = MAP_APPFONT ( COL_8, ROW_3 ) ;
-Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
) ;
 TabStop = TRUE ;
 };
 PushButton PB_BACK
 {
-HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
+HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK" ;
 Pos = MAP_APPFONT ( COL_10, ROW_3 ) ;
-Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
) ;
 TabStop = TRUE ;
 Text [ en-US ] = "~Back" ;
 };
-//TreeListBox
+
+// TreeListBox
 Control TLB_PAGES
 {
 Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
-Size = MAP_APPFONT ( (COL_2-COL_1), (ROW_4-ROW_1) );
+Size = MAP_APPFONT ( (COL_2-COL_1), (ROW_4-ROW_1) ) ;
 TabStop = TRUE ;
-Border = TRUE;
+Border = TRUE ;
 };
 Control FB_BORDER
 {
 Pos = MAP_APPFONT ( COL_3, ROW_1 ) ;
 Size = MAP_APPFONT ( WIDTH_PAGEFRAME, HEIGHT_PAGEFRAME ) ;
-Hide = TRUE;
+Hide = TRUE ;
 };
 FixedImage IMG_HELP
 {
 Pos = MAP_APPFONT ( COL_3_1, ROW_1_1 ) ;
 Size = MAP_APPFONT ( WIDTH_IMG_HELP, HEIGHT_IMG_HELP ) ;
-Hide = TRUE;
+Hide = TRUE ;
 };
 FixedText FT_PAGE_TITLE
 {
 Pos = MAP_APPFONT ( COL_3_3, ROW_1_2 ) ;
 Size = MAP_APPFONT ( (COL_3_5-COL_3_3), 15 ) ;
-Hide = TRUE;
+Hide = TRUE ;
 };
 FixedLine FL_LINE_1
 {
-Pos = MAP_APPFONT ( COL_3_1 , ROW_1_3 ) ;
+Pos = MAP_APPFONT ( COL_3_1, ROW_1_3 ) ;
 Size = MAP_APPFONT ( (COL_3_5-COL_3_1), 1 ) ;
-Comment = "Trennlinie" ;
-Hide = TRUE;
+Comment = "Divider" ;
+Hide = TRUE ;
 };
 FixedText FT_HELPTEXT
 {
 Pos = MAP_APPFONT ( COL_3_3, ROW_1_4 ) ;
 Size = MAP_APPFONT ( (COL_3_5-COL_3_3), (HEIGHT_PAGEFRAME-ROW_1_4-1) ) 
;
-WordBreak = TRUE;
-Hide = TRUE;
+WordBreak = TRUE ;
+Hide = TRUE ;
 };
 String ST_LOAD_ERROR
 {
-Text [ en-US ] = "The selected module could not be loaded.";
+Text [ en-US ] = "The selected module could not be loaded." ;
 };
 StringArray STR_HELPTEXTS
 {
 ItemList [ en-US ] =
 {
-< "This dialog is used to define general settings when working 
with %PRODUCTNAME. Enter your personal data, the defaults to be used when 
saving documents, and paths to important files. These settings will be saved 
automatically and used in later sessions as well."; SID_GENERAL_OPTIONS; > ;
-< "This is where you make settings concerning language and writing 
aids for your work with %PRODUCTNAME."; SID_LANGUAGE_OPTIONS; > ;
+< "This dialog is used to define general settings when working 
with %PRODUCTNAME. Enter your personal data, the defaults to be used when 
saving documents, and paths to important files. These settings will be saved 
automatically and used in later sessions as well." ; SID_GENERAL_OPTIONS; > ;
+< "This is where you make settings concerning language and writing 
aids for your work with %PRODUCTNAME." ; SID_LANGUAGE_OPTIONS; > ;

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source desktop/util desktop/win32 LICENSE_ALv2 NOTICE odk/docs odk/examples odk/index.html setup_native/source solenv/inc

2019-01-01 Thread Libreoffice Gerrit user 
 LICENSE_ALv2  |2 
 NOTICE|2 
 cui/source/dialogs/about.cxx  |2 
 desktop/util/verinfo.rc   |2 
 desktop/win32/source/applauncher/ooo/verinfo.rc   |2 
 desktop/win32/source/applauncher/verinfo.rc   |2 
 odk/docs/install.html |2 
 odk/docs/notsupported.html|2 
 odk/docs/tools.html   |2 
 odk/examples/DevelopersGuide/examples.html|2 
 odk/examples/examples.html|2 
 odk/index.html|2 
 setup_native/source/packinfo/packinfo_brand.txt   |   16 +-
 setup_native/source/packinfo/packinfo_office.txt  |  118 +-
 setup_native/source/packinfo/packinfo_office_lang.txt |   22 +--
 setup_native/source/packinfo/packinfo_sdkoo.txt   |2 
 setup_native/source/packinfo/packinfo_ure.txt |4 
 solenv/inc/version.lst|   14 +-
 18 files changed, 100 insertions(+), 100 deletions(-)

New commits:
commit 1691fc441da840b4890ed80e58f10b954dcd4e22
Author: Matthias Seidel 
AuthorDate: Tue Jan 1 20:45:19 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jan 1 20:45:19 2019 +

Updated copyright to 2019

diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index f999ddb9659c..d615b1384b94 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
   same "printed page" as the copyright notice for easier
   identification within third-party archives.
 
-   Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Apache Software 
Foundation
+   Copyright 2011-2019 Apache Software Foundation
 
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index d7dc0e2a651c..7391b26a2c98 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 
 Apache OpenOffice (https://www.openoffice.org)
-Copyright 2011, 2018 The Apache Software Foundation
+Copyright 2011-2019 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 5e77cdf61f24..2acfc0966a9a 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & 
rId ) :
 sbcopyright.appendAscii("Copyright ");
 sbcopyright.append((sal_Unicode)0x00a9);
 sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2018") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2019") );
 if (vendor.EqualsAscii("Apache Software Foundation")) {
 sbcopyright.append(sYear);
 sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc
index e9068be1a7e4..7781a9d8292b 100644
--- a/desktop/util/verinfo.rc
+++ b/desktop/util/verinfo.rc
@@ -25,7 +25,7 @@
 #define LG_D   // generate always german 
version
 #endif
 
-#define VER_FIRSTYEAR  2007
+#define VER_FIRSTYEAR  2000
 
 #include 
 #include "version_so.hrc"
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc 
b/desktop/win32/source/applauncher/ooo/verinfo.rc
index 09e26f450bfd..f60682f08bbc 100755
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/ooo/verinfo.rc
@@ -25,7 +25,7 @@
 #define LG_D   // generate always german 
version
 #endif
 
-#define VER_FIRSTYEAR  2009
+#define VER_FIRSTYEAR  2000
 
 #include 
 #include "version.hrc"
diff --git a/desktop/win32/source/applauncher/verinfo.rc 
b/desktop/win32/source/applauncher/verinfo.rc
index 381fbe61f5a1..4dfbaf0e5aa4 100755
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
@@ -25,7 +25,7 @@
 #define LG_D   // generate always german 
version
 #endif
 
-#define VER_FIRSTYEAR  2009
+#define VER_FIRSTYEAR  2000
 
 #include 
 #include "version_so.hrc"
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 8ac83d9b33da..7a1012ed9a27 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -439,7 +439,7 @@
  
   

-Copyright  2011 The Apache Software Foundation, Licensed 
under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache 
OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. 
Other names may be trademarks of their respective owners.
+Copyright  2011-2019 The Apache Software Foundation, 
Licensed under the Apache License, Version 2.0. Apache, the Apache feather 
logo, Apache OpenOffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source i18npool/inc i18npool/source sd/source vcl/source

2018-12-21 Thread Libreoffice Gerrit user 
 cui/source/tabpages/page.cxx|8 
 cui/source/tabpages/page.h  |   83 +++--
 cui/source/tabpages/page.src|5 
 i18npool/inc/i18npool/paper.hxx |   14 
 i18npool/source/paper/paper.cxx |   58 ++--
 sd/source/core/drawdoc2.cxx |6 
 vcl/source/gdi/print.cxx|8 
 vcl/source/src/print.src|  572 
 8 files changed, 384 insertions(+), 370 deletions(-)

New commits:
commit e78622bfa9657c3877df43df74ad59a93196c7de
Author: Matthias Seidel 
AuthorDate: Fri Dec 21 20:28:50 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Dec 21 20:28:50 2018 +

i81715 - RFE: 16:9 (16:10) widescreen page format

This adds 16:9 and 16:10 as screen format for Impress (and Draw).

The new strings are visible for en-US immediately and will be for other 
languages after the next run of our Pootle synchronisation.

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7aa17089dcb2..dec6378d807d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1072,7 +1072,9 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox 
*, pBox )
 {
 // Draw: bei Papierformat soll der Rand 1cm betragen
 long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = ( PAPER_SCREEN_4_BY_3 == ePaper )  ||
+   ( PAPER_SCREEN_16_BY_9 == ePaper ) ||
+   ( PAPER_SCREEN_16_BY_10 == ePaper );
 
 if ( !bScreen )
 // bei Bildschirm keinen Rand
@@ -1549,7 +1551,9 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
 sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
 Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
 
-if ( ePaper != PAPER_SCREEN && IsMarginOutOfRange() )
+if ( ePaper != PAPER_SCREEN_4_BY_3 && IsMarginOutOfRange()  ||
+ ePaper != PAPER_SCREEN_16_BY_9 && IsMarginOutOfRange() ||
+ ePaper != PAPER_SCREEN_16_BY_10 && IsMarginOutOfRange() )
 {
 if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText 
).Execute() == RET_NO )
 {
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 02b01a65abb2..8ff4eaa82197 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -20,54 +20,57 @@
  */
 
 
+
 #ifndef _SVX_PAGE_H
 #define _SVX_PAGE_H
 
 // define 
 
-//!! the values of the following defines must correspond to the array position
+//!! The values of the following defines must correspond to the array position
 //!! of the respective paper size in the file i18npool/source/paper/paper.cxx
 //!! There are enums for them in i18npool/inc/i18npool/paper.hxx but 
unfortunately
 //!! the resource compiler does not understand enums, thus the enum values need
 //!! to be duplicated here for use in the src file.
-#define PAPERSIZE_A00
-#define PAPERSIZE_A11
-#define PAPERSIZE_A22
-#define PAPERSIZE_A33
-#define PAPERSIZE_A44
-#define PAPERSIZE_A55
-#define PAPERSIZE_B4_ISO6
-#define PAPERSIZE_B5_ISO7
-#define PAPERSIZE_LETTER8
-#define PAPERSIZE_LEGAL 9
-#define PAPERSIZE_TABLOID   10
-#define PAPERSIZE_USER  11
-#define PAPERSIZE_B6_ISO12
-#define PAPERSIZE_C413
-#define PAPERSIZE_C514
-#define PAPERSIZE_C615
-#define PAPERSIZE_C65   16
-#define PAPERSIZE_DL17
-#define PAPERSIZE_DIA   18
-#define PAPERSIZE_SCREEN19
-#define PAPERSIZE_C 20
-#define PAPERSIZE_D 21
-#define PAPERSIZE_E 22
-#define PAPERSIZE_EXECUTIVE 23
-#define PAPERSIZE_LEGAL224
-#define PAPERSIZE_MONARCH   25
-#define PAPERSIZE_COM67526
-#define PAPERSIZE_COM9  27
-#define PAPERSIZE_COM10 28
-#define PAPERSIZE_COM11 29
-#define PAPERSIZE_COM12 30
-#define PAPERSIZE_KAI16 31
-#define PAPERSIZE_KAI32 32
-#define PAPERSIZE_KAI32BIG  33
-#define PAPERSIZE_B4_JIS34
-#define PAPERSIZE_B5_JIS35
-#define PAPERSIZE_B6_JIS36
-#define PAPERSIZE_A656
 
-#endif
+#define PAPERSIZE_A00
+#define PAPERSIZE_A11
+#define PAPERSIZE_A22
+#define PAPERSIZE_A33
+#define PAPERSIZE_A44
+#define PAPERSIZE_A55
+#define PAPERSIZE_B4_ISO6
+#define PAPERSIZE_B5_ISO7
+#define PAPERSIZE_LETTER8
+#define PAPERSIZE_LEGAL 9
+#define PAPERSIZE_TABLOID   10
+#define PAPERSIZE_USER  11
+#define PAPERSIZE_B6_ISO12
+#define PAPERSIZE_C413

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-11-18 Thread Libreoffice Gerrit user 
 cui/source/options/optfltr.src |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit e87c8b7922e9a73e0abb7f9a7a47c9ac3374a826
Author: Matthias Seidel 
AuthorDate: Sun Nov 18 11:07:28 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Nov 18 11:07:28 2018 +

Never heard "WinWord" since Windows 3.1 ;-)

diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index 442298af20ea..299c0433e3af 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -29,7 +29,7 @@
 // RID_OFAPAGE_MSFILTEROPT 
-
 TabPage RID_OFAPAGE_MSFILTEROPT
 {
-HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT";
+HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT" ;
 OutputSize = TRUE ;
 Size = MAP_APPFONT ( 260, 185 ) ;
 SVLook = TRUE ;
@@ -43,7 +43,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_WBAS_CODE
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE" ;
 Pos = MAP_APPFONT ( 12, 14 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -51,7 +51,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_WBAS_STG
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG" ;
 Pos = MAP_APPFONT ( 12, 28 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -62,11 +62,11 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 {
 Pos = MAP_APPFONT ( 6, 44 ) ;
 Size = MAP_APPFONT ( 248, 8 ) ;
-Text [ en-US ] = "Microsoft Excel 97/2000/XP";
+Text [ en-US ] = "Microsoft Excel 97/2000/XP" ;
 };
 CheckBox CB_EBAS_CODE
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE" ;
 Pos = MAP_APPFONT ( 12, 55 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -74,7 +74,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_EBAS_EXECTBL
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL" ;
 Pos = MAP_APPFONT ( 22, 69 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -82,7 +82,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_EBAS_STG
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG" ;
 Pos = MAP_APPFONT ( 12, 83 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -97,7 +97,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_PBAS_CODE
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE" ;
 Pos = MAP_APPFONT ( 12, 110 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -105,7 +105,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 };
 CheckBox CB_PBAS_STG
 {
-HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG";
+HelpID = "cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG" ;
 Pos = MAP_APPFONT ( 12, 124 ) ;
 Size = MAP_APPFONT ( 236, 10 ) ;
 TabStop = TRUE ;
@@ -116,7 +116,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT
 // RID_OFAPAGE_MSFILTEROPT2 
-
 TabPage RID_OFAPAGE_MSFILTEROPT2
 {
-HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2";
+HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2" ;
 OutputSize = TRUE ;
 Size = MAP_APPFONT ( 260, 185 ) ;
 SVLook = TRUE ;
@@ -155,7 +155,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT2
 };
 String ST_CHG_WRITER
 {
-Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse" ;
+Text [ en-US ] = "Word to %PRODUCTNAME Writer or reverse" ;
 };
 String ST_CHG_CALC
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-11-12 Thread Libreoffice Gerrit user 
 cui/source/dialogs/charmap.src |   73 -
 1 file changed, 36 insertions(+), 37 deletions(-)

New commits:
commit 799a1eacbc82c3c78bcade367fe80e6f61cc9f0f
Author: Matthias Seidel 
AuthorDate: Mon Nov 12 12:03:43 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Nov 12 12:03:43 2018 +

Cleaned up resource file

diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index b8cc8766ec04..5a0d6537a40f 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -21,115 +21,114 @@
 
 
 
- // include ---
-
+// include ---
 #include 
 #include "charmap.hrc"
 #include "helpid.hrc"
 #include  // for RID_SVXDLG_CHARMAP
 
- // RID_SVXDLG_CHARMAP 
+// RID_SVXDLG_CHARMAP 
 ModalDialog RID_SVXDLG_CHARMAP
 {
 HelpId = CMD_SID_CHARMAP ;
 SvLook = TRUE ;
-Text [ en-US ] = "Special Characters";
-Size = MAP_APPFONT ( 297 , 153 ) ;
+Text [ en-US ] = "Special Characters" ;
+Size = MAP_APPFONT ( 297, 153 ) ;
 OutputSize = TRUE ;
 Moveable = TRUE ;
 Control CT_SHOWSET
 {
 HelpId = HID_CHARMAP_CTL_SHOWSET ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 230 , 112 ) ;
+Pos = MAP_APPFONT ( 6, 24 ) ;
+Size = MAP_APPFONT ( 230, 112 ) ;
 TabStop = TRUE ;
 Group = TRUE ;
 };
 FixedText FT_FONT
 {
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 33 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 33, 8 ) ;
 Text [ en-US ] = "~Font" ;
 Left = TRUE ;
 Group = TRUE ;
 };
 ListBox LB_FONT
 {
-HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT";
-Pos = MAP_APPFONT ( 42 , 6 ) ;
-Size = MAP_APPFONT ( 70 , 58 ) ;
+HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT" ;
+Pos = MAP_APPFONT ( 42, 6 ) ;
+Size = MAP_APPFONT ( 70, 58 ) ;
 Sort = TRUE ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
 FixedText FT_SUBSET
 {
-Pos = MAP_APPFONT ( 118 , 8 ) ;
-Size = MAP_APPFONT ( 42 , 8 ) ;
-Text [ en-US ] = "~Subset";
+Pos = MAP_APPFONT ( 118, 8 ) ;
+Size = MAP_APPFONT ( 42, 8 ) ;
+Text [ en-US ] = "~Subset" ;
 };
 ListBox LB_SUBSET
 {
-HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET";
-Pos = MAP_APPFONT ( 161 , 6 ) ;
-Size = MAP_APPFONT ( 63 , 68 ) ;
+HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET" ;
+Pos = MAP_APPFONT ( 161, 6 ) ;
+Size = MAP_APPFONT ( 63, 68 ) ;
 Sort = FALSE ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
 FixedText FT_SYMBOLE
 {
-Pos = MAP_APPFONT ( 6 , 140 ) ;
-Size = MAP_APPFONT ( 38 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 140 ) ;
+Size = MAP_APPFONT ( 38, 8 ) ;
 Left = TRUE ;
-Text [ en-US ] = "Characters:";
+Text [ en-US ] = "Characters:" ;
 };
 Control CT_SHOWTEXT
 {
 HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
-Pos = MAP_APPFONT ( 46 , 137 ) ;
-Size = MAP_APPFONT ( 244 , 16 ) ;
+Pos = MAP_APPFONT ( 46, 137 ) ;
+Size = MAP_APPFONT ( 244, 16 ) ;
 Group = TRUE ;
 };
 Control CT_SHOWCHAR
 {
 HelpId = HID_CHARMAP_CTL_SHOWCHAR ;
-Pos = MAP_APPFONT ( 241 , 79 ) ;
-Size = MAP_APPFONT ( 50 , 44 ) ;
+Pos = MAP_APPFONT ( 241, 79 ) ;
+Size = MAP_APPFONT ( 50, 44 ) ;
 Group = TRUE ;
 };
 FixedText FT_CHARCODE
 {
-Pos = MAP_APPFONT ( 241 , 126 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 241, 126 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
 Center = TRUE ;
 };
 OKButton BTN_CHAR_OK
 {
-Pos = MAP_APPFONT ( 242 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 };
 CancelButton BTN_CHAR_CANCEL
 {
-Pos = MAP_APPFONT ( 242 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 HelpButton BTN_CHAR_HELP
 {
-Pos = MAP_APPFONT ( 242 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 43 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 PushButton BTN_DELETE
 {
-HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE";
-Pos = MAP_APPFONT ( 242 , 63 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-11-10 Thread Libreoffice Gerrit user 
 cui/source/options/optjava.src |  144 -
 1 file changed, 72 insertions(+), 72 deletions(-)

New commits:
commit ad6aaff6863614ed5b951b40d877d7f300038439
Author: Matthias Seidel 
AuthorDate: Sat Nov 10 11:14:08 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Nov 10 11:14:08 2018 +

Cleaned up resource file

diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 034c0c47d168..8c11c9635949 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -21,8 +21,7 @@
 
 
 
- // include --
-
+// include --
 #include "optjava.hrc"
 #include 
 #include "helpid.hrc"
@@ -35,60 +34,60 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA
 OutputSize = TRUE ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 Text [ en-US ] = "Java" ;
 
 FixedLine FL_JAVA
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
 Text [ en-US ] = "Java options" ;
 };
 CheckBox CB_JAVA_ENABLE
 {
-HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE";
+HelpID = "cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE" ;
 Pos = MAP_APPFONT ( 12, 14 ) ;
-Size = MAP_APPFONT ( 242 , 10 ) ;
+Size = MAP_APPFONT ( 242, 10 ) ;
 Text [ en-US ] = "~Use a Java runtime environment" ;
 };
 FixedText FT_JAVA_FOUND
 {
-Pos = MAP_APPFONT ( 21 , 27 ) ;
-Size = MAP_APPFONT ( 233 , 8 ) ;
+Pos = MAP_APPFONT ( 21, 27 ) ;
+Size = MAP_APPFONT ( 233, 8 ) ;
 Text [ en-US ] = "~Java runtime environments (JRE) already installed:" 
;
 };
 Control LB_JAVA
 {
-Pos = MAP_APPFONT ( 21 , 38 ) ;
-Size = MAP_APPFONT ( 177 , 130 ) ;
+Pos = MAP_APPFONT ( 21, 38 ) ;
+Size = MAP_APPFONT ( 177, 130 ) ;
 Border = TRUE ;
 TabStop = TRUE ;
 };
 FixedText FT_JAVA_PATH
 {
-Pos = MAP_APPFONT ( 21 , 171 ) ;
-Size = MAP_APPFONT ( 233 , 8 ) ;
+Pos = MAP_APPFONT ( 21, 171 ) ;
+Size = MAP_APPFONT ( 233, 8 ) ;
 NoLabel = TRUE ;
 };
 PushButton PB_ADD
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD";
-Pos = MAP_APPFONT ( 204 , 38 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD" ;
+Pos = MAP_APPFONT ( 204, 38 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 Text [ en-US ] = "~Add..." ;
 };
 PushButton PB_PARAMETER
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER";
-Pos = MAP_APPFONT ( 204 , 55 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER" ;
+Pos = MAP_APPFONT ( 204, 55 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 Text [ en-US ] = "~Parameters..." ;
 };
 PushButton PB_CLASSPATH
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH";
-Pos = MAP_APPFONT ( 204 , 72 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+HelpID = "cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH" ;
+Pos = MAP_APPFONT ( 204, 72 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 Text [ en-US ] = "~Class Path..." ;
 };
 String STR_INSTALLED_IN
@@ -124,76 +123,76 @@ ModalDialog RID_SVXDLG_JAVA_PARAMETER
 HelpId = HID_OPTIONS_JAVA_PARAMETER ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 270 , 140 ) ;
+Size = MAP_APPFONT ( 270, 140 ) ;
 Text [ en-US ] = "Java Start Parameters" ;
 Moveable = TRUE ;
 FixedText FT_PARAMETER
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 202 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 202, 8 ) ;
 Text [ en-US ] = "Java start ~parameter" ;
 };
 Edit ED_PARAMETER
 {
-HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER";
-Pos = MAP_APPFONT ( 6 , 15 ) ;
-Size = MAP_APPFONT ( 202 , 12 ) ;
+HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER" ;
+Pos = MAP_APPFONT ( 6, 15 ) ;
+Size = MAP_APPFONT ( 202, 12 ) ;
 Border = TRUE ;
 };
 PushButton PB_ASSIGN
 {
-HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN";
-Pos = MAP_APPFONT ( 214 , 14 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN" ;
+Pos = MAP_APPFONT ( 214, 14 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 Text [ en-US ] = "~Assign" ;
 };
 FixedText FT_ASSIGNED
 {
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-10-14 Thread Libreoffice Gerrit user 
 cui/source/options/fontsubs.src |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 916e40069d27ff96cb84209e465489d2b639d91e
Author: Matthias Seidel 
AuthorDate: Sun Oct 14 16:23:18 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Oct 14 16:23:18 2018 +

Re-added Maskcolor.

Will investigate further why this is needed here.

diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 93fa59210004..058d95875b87 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -82,13 +82,14 @@ TabPage RID_SVX_FONT_SUBSTITUTION
 };
 ImageList IL_ICON
 {
-Prefix = "nu" ;
+Prefix = "nu";
+MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
 IdList =
 {
 BT_SUBSTAPPLY ;
 BT_SUBSTDELETE ;
 };
-IdCount = { 2 ; } ;
+IdCount = { 2 ; };
 };
 ToolBox TBX_SUBSTNEWDEL
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-10-14 Thread Libreoffice Gerrit user 
 cui/source/options/optsave.src |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e798a3177976806b4b726d2845251f2b11ae7bcd
Author: Matthias Seidel 
AuthorDate: Sun Oct 14 14:51:35 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Oct 14 14:51:35 2018 +

Moved ODF warning up a bit

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 15c23ec065cb..e743cc50ae88 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -224,16 +224,16 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedImage FI_ODF_WARNING
 {
-Pos = MAP_APPFONT ( 12, 180 ) ;
+Pos = MAP_APPFONT ( 12, 174 ) ;
 Size = MAP_APPFONT ( 8, 8 ) ;
 Hide = TRUE ;
 };
 FixedText FT_WARN
 {
-Pos = MAP_APPFONT ( 23, 180 ) ;
+Pos = MAP_APPFONT ( 23, 174 ) ;
 Size = MAP_APPFONT ( 239, 8 ) ;
 Hide = TRUE ;
-Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to 
be lost!" ;
+Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to 
be lost." ;
 };
 Image IMG_ODF_WARNING
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-10-13 Thread Libreoffice Gerrit user 
 cui/source/options/optsave.src |  208 +++--
 1 file changed, 80 insertions(+), 128 deletions(-)

New commits:
commit 53da1e10878dab6d01e0e49dc8b37d65b60b25c7
Author: Matthias Seidel 
AuthorDate: Sat Oct 13 11:59:47 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Oct 13 11:59:47 2018 +

Cleaned up resource file

Removed entries for MASKCOLOR

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 892cf7b75c71..15c23ec065cb 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -21,13 +21,13 @@
 
 
 
- // include ---
+// include ---
 #include 
 #include 
 #include "helpid.hrc"
 #include "optsave.hrc"
 
- // SID_SFXPAGE_SAVE --
+// SID_SFXPAGE_SAVE --
 #define TEXT_SAVEPAGE \
 Text [ en-US ] = "Save" ;\
 
@@ -38,67 +38,67 @@ TabPage RID_SFXPAGE_SAVE
 SVLook = TRUE ;
 Hide = TRUE ;
 TEXT_SAVEPAGE
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 FixedLine LB_LOAD
 {
-Pos = MAP_APPFONT ( 6 , 2 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Load";
+Pos = MAP_APPFONT ( 6, 2 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
+Text [ en-US ] = "Load" ;
 };
 CheckBox CB_LOAD_SETTINGS
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS";
-Pos = MAP_APPFONT ( 12 , 11 ) ;
-Size = MAP_APPFONT ( 236 , 10 ) ;
-Text [ en-US ] = "Load user-specific settings with the document";
+Pos = MAP_APPFONT ( 12, 11 ) ;
+Size = MAP_APPFONT ( 236, 10 ) ;
+Text [ en-US ] = "Load user-specific settings with the document" ;
 };
 CheckBox CB_LOAD_DOCPRINTER
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER";
-Pos = MAP_APPFONT ( 12 , 22 ) ;
-Size = MAP_APPFONT ( 236 , 10 ) ;
-Text [ en-US ] = "Load printer settings with the document";
+Pos = MAP_APPFONT ( 12, 22 ) ;
+Size = MAP_APPFONT ( 236, 10 ) ;
+Text [ en-US ] = "Load printer settings with the document" ;
 };
 FixedLine GB_SAVE
 {
-Pos = MAP_APPFONT ( 6 , 32 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 32 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
 Text [ en-US ] = "Save" ;
 };
 CheckBox BTN_DOCINFO
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO";
-Pos = MAP_APPFONT ( 12 , 41 ) ;
-Size = MAP_APPFONT ( 236 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 41 ) ;
+Size = MAP_APPFONT ( 236, 10 ) ;
 Text [ en-US ] = "~Edit document properties before saving" ;
 TabStop = TRUE ;
 };
 FixedImage FI_BACKUP
 {
 Pos = MAP_APPFONT ( 5, 53 ) ;
-Size = MAP_APPFONT ( 6 , 6 ) ;
-Hide = TRUE;
+Size = MAP_APPFONT ( 6, 6 ) ;
+Hide = TRUE ;
 };
 CheckBox BTN_BACKUP
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP";
-Pos = MAP_APPFONT ( 12 , 52 ) ;
-Size = MAP_APPFONT ( 236 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 52 ) ;
+Size = MAP_APPFONT ( 236, 10 ) ;
 Text [ en-US ] = "Al~ways create backup copy" ;
 };
 CheckBox BTN_AUTOSAVE
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE";
-Pos = MAP_APPFONT ( 12 , 63 ) ;
-Size = MAP_APPFONT ( 150 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 63 ) ;
+Size = MAP_APPFONT ( 150, 10 ) ;
 Text [ en-US ] = "Save ~AutoRecovery information every" ;
 };
 NumericField ED_AUTOSAVE
 {
 HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 180 , 62 ) ;
-Size = MAP_APPFONT ( 21 , 12 ) ;
+Pos = MAP_APPFONT ( 180, 62 ) ;
+Size = MAP_APPFONT ( 21, 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -112,128 +112,128 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedText FT_MINUTE
 {
-Pos = MAP_APPFONT ( 204 , 63 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 204, 63 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
 Text [ en-US ] = "Minutes" ;
 };
 CheckBox BTN_RELATIVE_FSYS
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS";
-Pos = MAP_APPFONT ( 12 , 74 ) ;
-Size = MAP_APPFONT ( 236 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 74 ) ;
+Size = MAP_APPFONT ( 236, 10 ) ;
 Text [ en-US ] = "Save URLs relative to file system" ;
 };
 CheckBox BTN_RELATIVE_INET
 {
 HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET";
-Pos = MAP_APPFONT ( 12 , 85 ) ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-10-09 Thread Libreoffice Gerrit user 
 cui/source/options/internationaloptions.src |   59 +-
 cui/source/options/optasian.src |  112 +---
 2 files changed, 59 insertions(+), 112 deletions(-)

New commits:
commit c7e073180489431d6a70ef58bed53031b2b6c12e
Author: Matthias Seidel 
AuthorDate: Tue Oct 9 15:56:08 2018 +
Commit: Matthias Seidel 
CommitDate: Tue Oct 9 15:56:08 2018 +

Cleaned up resource files

diff --git a/cui/source/options/internationaloptions.src 
b/cui/source/options/internationaloptions.src
index e1a7859e4834..664b0f252a99 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -36,69 +36,50 @@ TabPage RID_OFA_TP_INTERNATIONAL
 
 FixedLine FL_DEFTXTDIRECTION
 {
-Pos = MAP_APPFONT( COL_0, ROW_0 );
-Size = MAP_APPFONT( WIDTH2END( COL_0 ), HEIGHT_FL );
-Text [ en-US ] = "Default text direction";
+Pos = MAP_APPFONT ( COL_0, ROW_0 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_0 ), HEIGHT_FL ) ;
+Text [ en-US ] = "Default text direction" ;
 };
 
 RadioButton RB_TXTDIR_LEFT2RIGHT
 {
 HelpID = 
"cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_LEFT2RIGHT";
-Pos = MAP_APPFONT( COL_1, ROW_1 );
-Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
-Group = TRUE;
-Text [ en-US ] = "~Left-to-right";
+Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_1 ), HEIGHT_RB ) ;
+Group = TRUE ;
+Text [ en-US ] = "~Left-to-right" ;
 };
 
 RadioButton RB_TXTDIR_RIGHT2LEFT
 {
 HelpID = 
"cui:RadioButton:RID_OFA_TP_INTERNATIONAL:RB_TXTDIR_RIGHT2LEFT";
-Pos = MAP_APPFONT( COL_1, ROW_2 );
-Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_RB );
-Text [ en-US ] = "~Right-to-left";
+Pos = MAP_APPFONT ( COL_1, ROW_2 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_1 ), HEIGHT_RB ) ;
+Text [ en-US ] = "~Right-to-left" ;
 };
 
 FixedLine FL_SHEETVIEW
 {
-Pos = MAP_APPFONT( COL_0, ROW_3 );
-Size = MAP_APPFONT( WIDTH2END( COL_0 ), HEIGHT_FL );
-Text [ en-US ] = "Sheet view";
+Pos = MAP_APPFONT ( COL_0, ROW_3 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_0 ), HEIGHT_FL ) ;
+Text [ en-US ] = "Sheet view" ;
 };
 
 CheckBox CB_SHTVW_RIGHT2LEFT
 {
 HelpID = "cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_RIGHT2LEFT";
-Pos = MAP_APPFONT( COL_1, ROW_4 );
-Size = MAP_APPFONT( WIDTH2END( COL_1 ), HEIGHT_CB );
-Text [ en-US ] = "Right-~to-left";
+Pos = MAP_APPFONT ( COL_1, ROW_4 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_1 ), HEIGHT_CB ) ;
+Text [ en-US ] = "Right-~to-left" ;
 };
 
 CheckBox CB_SHTVW_CURRENTDOCONLY
 {
 HelpID = 
"cui:CheckBox:RID_OFA_TP_INTERNATIONAL:CB_SHTVW_CURRENTDOCONLY";
-Pos = MAP_APPFONT( COL_2, ROW_5 );
-Size = MAP_APPFONT( WIDTH2END( COL_2 ), HEIGHT_CB );
-Text [ en-US ] = "~Current document only";
+Pos = MAP_APPFONT ( COL_2, ROW_5 ) ;
+Size = MAP_APPFONT ( WIDTH2END( COL_2 ), HEIGHT_CB ) ;
+Text [ en-US ] = "~Current document only" ;
 };
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// *** EOF
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index 213c49ac3348..69af71be5312 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -30,73 +30,73 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
 {
 HelpId = HID_OPTIONS_ASIAN_LAYOUT ;
 OutputSize = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 SVLook = TRUE ;
 Hide = TRUE ;
 FixedLine GB_KERNING
 {
 Pos = MAP_APPFONT ( 6, 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Kerning";
+Size = MAP_APPFONT ( 248, 8 ) ;
+Text [ en-US ] = "Kerning" ;
 };
 RadioButton RB_CHAR_KERNING
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING";
 Pos = MAP_APPFONT ( 12, 14 ) ;
-Size = MAP_APPFONT ( 200 , 10 ) ;
-Text [ en-US ] = "~Western characters only";
+Size = MAP_APPFONT ( 200, 10 ) ;
+Text [ en-US ] = "~Western characters only" ;
 };
 RadioButton RB_CHAR_PUNCT
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT";
 Pos = MAP_APPFONT ( 12, 27 ) ;
-Size = MAP_APPFONT ( 200 , 10 ) ;
-Text [ en-US ] = "Western ~text and Asian punctuation";
+Size = MAP_APPFONT ( 200, 10 ) ;
+Text [ en-US ] = "Western ~text and Asian punctuation" ;
 };
 FixedLine GB_CHAR_DIST
 {
 Pos = MAP_APPFONT ( 6, 43 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
-Text [ en-US ] = "Character spacing";
+Size =

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-10-02 Thread Libreoffice Gerrit user 
 cui/source/options/dbregister.src |   34 -
 cui/source/options/fontsubs.src   |  105 +-
 cui/source/options/optfltr.src|  132 ++
 cui/source/options/opthtml.src|  121 +-
 4 files changed, 174 insertions(+), 218 deletions(-)

New commits:
commit 79bfa97245b3131d6103080523f299e02cbcce13
Author: Matthias Seidel 
AuthorDate: Tue Oct 2 15:27:52 2018 +
Commit: Matthias Seidel 
CommitDate: Tue Oct 2 15:27:52 2018 +

Cleaned up resource files

diff --git a/cui/source/options/dbregister.src 
b/cui/source/options/dbregister.src
index f8aea9a1f221..4919ed6e30d3 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -27,63 +27,63 @@
 #include 
 
 // RID_SFXPAGE_PATH -
-#define STD_MASKCOLOR Color { Red=0x; Green=0x; Blue=0x; }
 TabPage RID_SFXPAGE_DBREGISTER
 {
 HelpId = "cui:TabPage:RID_SFXPAGE_DBREGISTER" ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 Text [ en-US ] = "Registered databases" ;
 
 FixedText FT_TYPE
 {
 Hide = TRUE;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 40, 10 ) ;
 Text [ en-US ] = "Registered name" ;
 };
 FixedText FT_PATH
 {
 Hide = TRUE;
-Pos = MAP_APPFONT ( 110 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 10 ) ;
+Pos = MAP_APPFONT ( 110, 14 ) ;
+Size = MAP_APPFONT ( 40, 10 ) ;
 Text [ en-US ] = "Database file" ;
 };
 Control LB_PATH
 {
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 236 , 147 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 236, 147 ) ;
 Border = TRUE ;
-TabStop = TRUE;
+TabStop = TRUE ;
 };
 PushButton BTN_NEW
 {
 HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW";
-Pos = MAP_APPFONT ( 47 , 165 ) ;
-Size = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 47, 165 ) ;
+Size = MAP_APPFONT ( 65, 14 ) ;
 Text [ en-US ] = "~New..." ;
 };
 PushButton BTN_EDIT
 {
 HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT";
-Pos = MAP_APPFONT ( 183 , 165 ) ;
-Size = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 183, 165 ) ;
+Size = MAP_APPFONT ( 65, 14 ) ;
 Text [ en-US ] = "~Edit..." ;
 };
 PushButton BTN_DELETE
 {
 HelpID = "cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE";
-Pos = MAP_APPFONT ( 115 , 165 ) ;
-Size = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 115, 165 ) ;
+Size = MAP_APPFONT ( 65, 14 ) ;
 Text [ en-US ] = "~Delete" ;
 };
 FixedLine GB_STD
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
 Text [ en-US ] = "Registered databases" ;
 };
 };
 
+// *** EOF
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 54c11ad26e97..93fa59210004 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -21,90 +21,78 @@
 
 
 
- // include --
-
+// include --
 #include "fontsubs.hrc"
 #include "helpid.hrc"
-
- // pragma ---
-
-
-
-
-/**/
-/**/
-/**/
-/**/
-/**/
+// pragma ---
 
 TabPage RID_SVX_FONT_SUBSTITUTION
 {
 HelpID = HID_OFA_FONT_SUBSTITUTION ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 CheckBox CB_USETABLE
 {
 HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 248 , 10 ) ;
+Pos = MAP_APPFONT ( 6, 6 ) ;
+Size = MAP_APPFONT ( 248, 10 ) ;
 TabStop = TRUE ;
-Text [ en-US ] = "~Apply replacement table";
+Text [ en-US ] = "~Apply replacement table" ;
 };
 FixedText FT_FONT1
 {
-Pos = MAP_APPFONT ( 6 , 20

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-09-24 Thread Libreoffice Gerrit user 
 cui/source/options/optpath.src |   55 +++--
 1 file changed, 26 insertions(+), 29 deletions(-)

New commits:
commit aef46e4d4465b0249d5476bc60277f6e0d482ca7
Author: Matthias Seidel 
AuthorDate: Mon Sep 24 16:59:06 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Sep 24 16:59:06 2018 +

Cleaned up resource file for paths

Removed entries for MASKCOLOR.

diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src
index df137c6bfb49..968b50ecb9df 100644
--- a/cui/source/options/optpath.src
+++ b/cui/source/options/optpath.src
@@ -29,65 +29,62 @@
 #include "helpid.hrc"
 
  // RID_SFXPAGE_PATH -
-#define STD_MASKCOLOR Color { Red=0x; Green=0x; Blue=0x; }
 TabPage RID_SFXPAGE_PATH
 {
 HelpId = HID_OPTIONS_PATH ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 Text [ en-US ] = "Paths" ;
 FixedText FT_TYPE
 {
 Hide = TRUE;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 10 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 40, 10 ) ;
 Text [ en-US ] = "Type" ;
 };
 FixedText FT_PATH
 {
 Hide = TRUE;
-Pos = MAP_APPFONT ( 110 , 14 ) ;
-Size = MAP_APPFONT ( 40 , 10 ) ;
+Pos = MAP_APPFONT ( 110, 14 ) ;
+Size = MAP_APPFONT ( 40, 10 ) ;
 Text [ en-US ] = "Path" ;
 };
 Control LB_PATH
 {
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 236 , 147 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 236, 147 ) ;
 Border = TRUE ;
-TabStop = TRUE;
+TabStop = TRUE ;
 };
 PushButton BTN_PATH
 {
 HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH";
-Pos = MAP_APPFONT ( 183 , 165 ) ;
-Size = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 183, 165 ) ;
+Size = MAP_APPFONT ( 65, 14 ) ;
 Text [ en-US ] = "~Edit..." ;
 };
 PushButton BTN_STANDARD
 {
 HelpID = "cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD";
-Pos = MAP_APPFONT ( 115 , 165 ) ;
-Size = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 115, 165 ) ;
+Size = MAP_APPFONT ( 65, 14 ) ;
 Text [ en-US ] = "~Default" ;
 };
 FixedLine GB_STD
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
 Text [ en-US ] = "Paths used by %PRODUCTNAME" ;
 };
 Image IMG_LOCK
 {
-ImageBitmap = Bitmap { File = "lock.bmp"; };
-MaskColor = STD_MASKCOLOR;
+ImageBitmap = Bitmap { File = "lock.png"; } ;
 };
 Image IMG_LOCK_HC
 {
-ImageBitmap = Bitmap { File = "lock_hc.bmp"; };
-MaskColor = STD_MASKCOLOR;
+ImageBitmap = Bitmap { File = "lock_hc.png"; } ;
 };
 String STR_MULTIPATHDLG
 {
@@ -140,7 +137,7 @@ String RID_SVXSTR_KEY_TEMPLATE_PATH
 };
 String RID_SVXSTR_KEY_GLOSSARY_PATH
 {
-Text [ en-US ] = "AutoText";
+Text [ en-US ] = "AutoText" ;
 };
 String RID_SVXSTR_KEY_DICTIONARY_PATH
 {
@@ -161,38 +158,38 @@ String RID_SVXSTR_KEY_STORAGE_DIR
 };
 String RID_SVXSTR_KEY_TEMP_PATH
 {
-Text [ en-US ] = "Temporary files";
+Text [ en-US ] = "Temporary files" ;
 };
 String RID_SVXSTR_KEY_PLUGINS_PATH
 {
-Text [ en-US ] = "Plug-ins";
+Text [ en-US ] = "Plug-ins" ;
 };
 String RID_SVXSTR_KEY_FAVORITES_DIR
 {
-Text [ en-US ] = "Folder Bookmarks";
+Text [ en-US ] = "Folder Bookmarks" ;
 };
 String RID_SVXSTR_KEY_FILTER_PATH
 {
-Text [ en-US ] = "Filters";
+Text [ en-US ] = "Filters" ;
 };
 String RID_SVXSTR_KEY_ADDINS_PATH
 {
-Text [ en-US ] = "Add-ins";
+Text [ en-US ] = "Add-ins" ;
 };
 String RID_SVXSTR_KEY_USERCONFIG_PATH
 {
-Text [ en-US ] = "User Configuration";
+Text [ en-US ] = "User Configuration" ;
 };
 String RID_SVXSTR_KEY_USERDICTIONARY_DIR
 {
-Text [ en-US ] = "User-defined dictionaries";
+Text [ en-US ] = "User-defined dictionaries" ;
 };
 String RID_SVXSTR_KEY_AUTOCORRECT_DIR
 {
-Text [ en-US ] = "AutoCorrect";
+Text [ en-US ] = "AutoCorrect" ;
 };
 String RID_SVXSTR_KEY_LINGUISTIC_DIR
 {
-Text [ en-US ] = "Writing aids";
+Text [ en-US ] = "Writing aids" ;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-09-09 Thread Libreoffice Gerrit user 
 cui/source/dialogs/hyperdlg.src |  583 +++-
 1 file changed, 230 insertions(+), 353 deletions(-)

New commits:
commit 6660b9949e05c0f28f81e90ed427547258dbc43a
Author: Matthias Seidel 
AuthorDate: Sun Sep 9 09:30:38 2018 +
Commit: Matthias Seidel 
CommitDate: Sun Sep 9 09:30:38 2018 +

Cleaned up resource file for hyperlink dialog.

Removed entries for MASKCOLOR.

diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 7a446606ff95..3f1c47100b22 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -26,166 +26,159 @@
 #include "helpid.hrc"
 #include "hyperdlg.hrc"
 
-#define MASKCOLOR   MaskColor = Color { Red=0x; Green=0x; Blue=0x; 
};
 #define HYPERDLG_IMGBUTTON_HEIGHT RSC_CD_PUSHBUTTON_HEIGHT+2
 
 /*
-|
 | Tabpage : Internet
-|
 */
 
 TabPage RID_SVXPAGE_HYPERLINK_INTERNET
 {
 Hide = TRUE ;
-HelpID = HID_HYPERLINK_INTERNET;
+HelpID = HID_HYPERLINK_INTERNET ;
 OutputSize = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 260 , 162 ) ;
+Size = MAP_APPFONT ( 260, 162 ) ;
 Text [ en-US ] = "Hyperlink" ;
 
 FixedLine GRP_LINKTYPE
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 248, 8 ) ;
 Text [ en-US ] = "Hyperlink type" ;
 };
 RadioButton RB_LINKTYP_INTERNET
 {
-HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET";
-Pos = MAP_APPFONT( COL_2, 13 );
-Size = MAP_APPFONT( 57, 10 );
-Text [ en-US ] = "~Web";
+HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET" ;
+Pos = MAP_APPFONT ( COL_2, 13 ) ;
+Size = MAP_APPFONT ( 57, 10 ) ;
+Text [ en-US ] = "~Web" ;
 };
 RadioButton RB_LINKTYP_FTP
 {
-HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP";
-Pos = MAP_APPFONT( 114 + COL_DIFF, 13 );
-Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
-Text [ en-US ] = "~FTP";
+HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP" ;
+Pos = MAP_APPFONT ( 114 + COL_DIFF, 13 ) ;
+Size = MAP_APPFONT ( 56 - COL_DIFF, 10 ) ;
+Text [ en-US ] = "~FTP" ;
 };
 RadioButton RB_LINKTYP_TELNET
 {
-HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET";
-Pos = MAP_APPFONT( 173, 13 );
-Size = MAP_APPFONT( 56, 10 );
-Text [ en-US ] = "~Telnet";
+HelpID = 
"cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET" ;
+Pos = MAP_APPFONT ( 173, 13 ) ;
+Size = MAP_APPFONT ( 56, 10 ) ;
+Text [ en-US ] = "~Telnet" ;
 };
 FixedText FT_TARGET_HTML
 {
-Pos = MAP_APPFONT ( 12 , 26 ) ;
+Pos = MAP_APPFONT ( 12, 26 ) ;
 Size = MAP_APPFONT ( 39 + COL_DIFF, 8 ) ;
 Text [ en-US ] = "Tar~get" ;
 };
 FixedText FT_LOGIN
 {
-Pos = MAP_APPFONT ( 12 , 43 ) ;
-Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
+Pos = MAP_APPFONT ( 12, 43 ) ;
+Size = MAP_APPFONT ( 39 + COL_DIFF, 8 ) ;
 Text [ en-US ] = "~Login name" ;
 };
 Edit ED_LOGIN
 {
-HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN";
+HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( COL_2 , 42 ) ;
-Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
+Pos = MAP_APPFONT ( COL_2, 42 ) ;
+Size = MAP_APPFONT ( 80 - COL_DIFF, 12 ) ;
 };
 FixedText FT_PASSWD
 {
-Pos = MAP_APPFONT ( 12 , 60 ) ;
-Size = MAP_APPFONT ( 39 + COL_DIFF , 8 ) ;
+Pos = MAP_APPFONT ( 12, 60 ) ;
+Size = MAP_APPFONT ( 39 + COL_DIFF, 8 ) ;
 Text [ en-US ] = "~Password" ;
 };
 Edit ED_PASSWD
 {
-HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD";
+HelpID = "cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD" ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( COL_2 , 59 ) ;
-Size = MAP_APPFONT ( 80 - COL_DIFF , 12 ) ;
+Pos = MAP_APPFONT ( COL_2, 59 ) ;
+Size = MAP_APPFONT ( 80 - COL_DIFF, 12 ) ;
 PassWord = TRUE ;
 };
 CheckBox CBX_ANONYMOUS
 {
-HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS";
-Pos = MAP_APPFONT ( COL_2 , 75 ) ;
-Size = MAP_APPFONT ( 89 - COL_DIFF , 10 ) ;
+HelpID = "cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS" ;
+Pos = MAP_APPFONT ( COL_2, 75 ) ;
+Size = MAP_APPFONT ( 89 - COL_DIFF, 10 ) ;
 TabStop = TRUE ;
 Text [ en-US ] = "Anonymous

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-08-18 Thread Libreoffice Gerrit user 
 cui/source/dialogs/zoom.src |   94 +---
 1 file changed, 46 insertions(+), 48 deletions(-)

New commits:
commit 798989ab8ee7d4c2f4bc28810a549faf48698439
Author: Matthias Seidel 
AuthorDate: Sat Aug 18 15:48:07 2018 +
Commit: Matthias Seidel 
CommitDate: Sat Aug 18 15:48:07 2018 +

Cleaned up dialog for zoom

diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src
index 5f636f3202d8..e93b86c4ee1a 100644
--- a/cui/source/dialogs/zoom.src
+++ b/cui/source/dialogs/zoom.src
@@ -20,67 +20,67 @@
  */
 
 
- // include ---
+// include ---
 #include 
 #include "zoom.hrc"
 #include  // for RID_SVXDLG_ZOOM
 #include "helpid.hrc"
 
- // RID_SVXDLG_ZOOM ---
+// RID_SVXDLG_ZOOM ---
 ModalDialog RID_SVXDLG_ZOOM
 {
 HelpId = CMD_SID_ATTR_ZOOM;
 OutputSize = TRUE ;
 SvLook = TRUE ;
-Size = MAP_APPFONT ( 242 , 112 ) ;
+Size = MAP_APPFONT ( 242, 112 ) ;
 Moveable = TRUE ;
-Text [ en-US ] = "Zoom & View Layout";
+Text [ en-US ] = "Zoom & View Layout" ;
 FixedLine FL_ZOOM
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "Zoom factor";
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 112, 8 ) ;
+Text [ en-US ] = "Zoom factor" ;
 };
 RadioButton BTN_OPTIMAL
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL";
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 105 , 10 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 105, 10 ) ;
 Text [ en-US ] = "~Optimal" ;
 };
 RadioButton BTN_WHOLE_PAGE
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE";
-Pos = MAP_APPFONT ( 12 , 27 ) ;
-Size = MAP_APPFONT ( 105 , 10 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" ;
+Pos = MAP_APPFONT ( 12, 27 ) ;
+Size = MAP_APPFONT ( 105, 10 ) ;
 Text [ en-US ] = "~Fit width and height" ;
 };
 RadioButton BTN_PAGE_WIDTH
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH";
-Pos = MAP_APPFONT ( 12 , 40 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" ;
+Pos = MAP_APPFONT ( 12, 40 ) ;
 Size = MAP_APPFONT ( 105, 10 ) ;
 Text [ en-US ] = "Fit ~width" ;
 };
 RadioButton BTN_100
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100";
-Pos = MAP_APPFONT ( 12 , 53 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" ;
+Pos = MAP_APPFONT ( 12, 53 ) ;
 Size = MAP_APPFONT ( 105, 10 ) ;
 Text = "~100 %" ;
 };
 RadioButton BTN_USER
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER";
-Pos = MAP_APPFONT ( 12 , 67 ) ;
-Size = MAP_APPFONT ( 72 , 10 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" ;
+Pos = MAP_APPFONT ( 12, 67 ) ;
+Size = MAP_APPFONT ( 72, 10 ) ;
 Text [ en-US ] = "~Variable" ;
 };
 MetricField ED_USER
 {
-HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER";
-Pos = MAP_APPFONT ( 86 , 66 ) ;
-Size = MAP_APPFONT ( 32 , 12 ) ;
+HelpID = "cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" ;
+Pos = MAP_APPFONT ( 86, 66 ) ;
+Size = MAP_APPFONT ( 32, 12 ) ;
 Border = TRUE ;
 Group = TRUE ;
 Left = TRUE ;
@@ -91,36 +91,36 @@ ModalDialog RID_SVXDLG_ZOOM
 };
 FixedLine FL_VIEWLAYOUT
 {
-Pos = MAP_APPFONT ( 124 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "View layout";
+Pos = MAP_APPFONT ( 124, 3 ) ;
+Size = MAP_APPFONT ( 112, 8 ) ;
+Text [ en-US ] = "View layout" ;
 };
 RadioButton BTN_AUTOMATIC
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC";
-Pos = MAP_APPFONT ( 130 , 14 ) ;
-Size = MAP_APPFONT ( 106 , 10 ) ;
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC" ;
+Pos = MAP_APPFONT ( 130, 14 ) ;
+Size = MAP_APPFONT ( 106, 10 ) ;
 Text [ en-US ] = "~Automatic" ;
 };
 RadioButton BTN_SINGLE
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE";
+HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE" ;
 Pos = MAP_APPFONT ( 130, 27 ) ;
 Size = MAP_APPFONT ( 106, 10 ) ;
 Text [ en-US ] = "~Single page" ;
 };
 RadioButton BTN_COLUMNS
 {
-HelpID = "cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS";
+HelpID =

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source sw/source

2018-08-03 Thread Libreoffice Gerrit user 
 cui/source/options/optgdlg.src |  506 -
 cui/source/options/optmemory.src   |  117 +++
 sw/source/ui/config/mailconfigpage.src |  383 
 sw/source/ui/frmdlg/wrap.src   |  163 +-
 4 files changed, 583 insertions(+), 586 deletions(-)

New commits:
commit eddf59961747429b8f8a26256c5a1925e574e712
Author: Matthias Seidel 
AuthorDate: Fri Aug 3 16:10:50 2018 +
Commit: Matthias Seidel 
CommitDate: Fri Aug 3 16:10:50 2018 +

Cleaned up resource files.

diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 49ece8cf94d0..fdd84ee8bed4 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -20,131 +20,132 @@
  */
 
 
- // include ---
+
+// include ---
 
 #include 
 #include "optgdlg.hrc"
 #include "helpid.hrc"
 
- //
- //
- // TabPage Sonstiges
- //
- //
+//
+//
+// TabPage General
+//
+//
 
 TabPage OFA_TP_MISC
 {
 HelpID = HID_OFA_TP_MISC ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 Hide = TRUE ;
 FixedLine FL_HELP
 {
-Pos = MAP_APPFONT( COL0, ROW0 );
-Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-Text [ en-US ] = "Help";
+Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+Text [ en-US ] = "Help" ;
 };
 CheckBox CB_TOOLTIP
 {
-HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
-Pos = MAP_APPFONT( COL1, ROW1 );
-Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-Text [ en-US ] = "~Tips";
+HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" ;
+Pos = MAP_APPFONT ( COL1, ROW1 ) ;
+Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+Text [ en-US ] = "~Tips" ;
 };
 CheckBox CB_EXTHELP
 {
-HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
-Pos = MAP_APPFONT( COL2, ROW2 );
-Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
-Text [ en-US ] = "~Extended tips";
+HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" ;
+Pos = MAP_APPFONT ( COL2, ROW2 ) ;
+Size = MAP_APPFONT ( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ) ;
+Text [ en-US ] = "~Extended tips" ;
 };
 CheckBox CB_HELPAGENT
 {
-HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
-Pos = MAP_APPFONT( COL1, ROW3 );
-Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-Text [ en-US ] = "~Help Agent";
+HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" ;
+Pos = MAP_APPFONT ( COL1, ROW3 ) ;
+Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+Text [ en-US ] = "~Help Agent" ;
 };
 PushButton PB_HELPAGENT_RESET
 {
-HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
-Pos = MAP_APPFONT( COL2, ROW4 );
-Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
);
-Text [ en-US ] = "~Reset Help Agent";
+HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" ;
+Pos = MAP_APPFONT ( COL2, ROW4 ) ;
+Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
) ;
+Text [ en-US ] = "~Reset Help Agent" ;
 };
 FixedText FT_HELPFORMAT
 {
-Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) );
-Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
-Text [ en-US ] = "Help ~formatting";
+Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ) ;
+Size = MAP_APPFONT ( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+Text [ en-US ] = "Help ~formatting" ;
 };
 ListBox LB_HELPFORMAT
 {
-HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
-Pos = MAP_APPFONT( COL4, ROW5 );
-Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
+HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT" ;
+Pos = MAP_APPFONT ( COL4, ROW5 ) ;
+Size = MAP_APPFONT ( WHOLE_WIDTH - COL4, 50 ) ;
 DropDown = TRUE ;
 Border = TRUE ;
 TabStop = TRUE ;
 StringList [ en-US ] =
 {
-< "Default" ; > ;
-< "High Contrast #1" ; > ;
-< "High Contrast #2" ; > ;
+< "Default" ; > ;
+< "High Contrast #1"; > ;
+

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-07-31 Thread Libreoffice Gerrit user 
 cui/source/customize/acccfg.src   |   32 ++--
 cui/source/customize/cfg.src  |  270 +++---
 cui/source/customize/eventdlg.src |   51 +++
 cui/source/customize/macropg.src  |   78 +-
 cui/source/customize/selector.src |  225 +++
 5 files changed, 318 insertions(+), 338 deletions(-)

New commits:
commit 9abb5e861c0ccd5f2052b7836ffcc0dbdded86b3
Author: Matthias Seidel 
AuthorDate: Tue Jul 31 15:09:41 2018 +
Commit: Matthias Seidel 
CommitDate: Tue Jul 31 15:09:41 2018 +

Cleaned up resource file for Customize dialog.

Removed entry for MASKCOLOR.

diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 8949729428ca..1b30d028043f 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -60,21 +60,21 @@ TabPage RID_SVXPAGE_KEYBOARD
 Size = MAP_APPFONT ( 273, 258 ) ;
 RadioButton RB_OFFICE
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
+HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" ;
 Pos = MAP_APPFONT ( 192, 6 ) ;
 Size = MAP_APPFONT ( 75, 10 ) ;
 Text = "%PRODUCTNAME" ;
 };
 RadioButton RB_MODULE
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
+HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" ;
 Pos = MAP_APPFONT ( 192, 19 ) ;
 Size = MAP_APPFONT ( 75, 10 ) ;
 Text = "$(MODULE)" ;
 };
 PushButton BTN_ACC_CHANGE
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
+HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" ;
 Pos = MAP_APPFONT ( 192, 35 ) ;
 Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
@@ -82,7 +82,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 };
 PushButton BTN_ACC_REMOVE
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
+HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" ;
 Pos = MAP_APPFONT ( 192, 52 ) ;
 Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
@@ -94,7 +94,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 Pos = MAP_APPFONT ( 6, 3 ) ;
 Size = MAP_APPFONT ( 180, 8 ) ;
 Group = TRUE ;
-Text [ en-US ] = "Shortcut keys";
+Text [ en-US ] = "Shortcut keys" ;
 };
 Control BOX_ACC_ENTRIES
 {
@@ -159,7 +159,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 };
 PushButton BTN_LOAD
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
+HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" ;
 Pos = MAP_APPFONT ( 192, 86 ) ;
 Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
@@ -168,7 +168,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 };
 PushButton BTN_SAVE
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
+HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" ;
 Pos = MAP_APPFONT ( 192, 103 ) ;
 Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
@@ -177,7 +177,7 @@ TabPage RID_SVXPAGE_KEYBOARD
 };
 PushButton BTN_RESET
 {
-HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
+HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" ;
 Pos = MAP_APPFONT ( 192, 120 ) ;
 Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
@@ -202,11 +202,11 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
 {
 String STR_MYMACROS
 {
-Text [ en-US ] = "My Macros";
+Text [ en-US ] = "My Macros" ;
 };
 String STR_PRODMACROS
 {
-Text [ en-US ] = "%PRODUCTNAME Macros";
+Text [ en-US ] = "%PRODUCTNAME Macros" ;
 };
 String STR_BASICMACROS
 {
@@ -234,27 +234,27 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
 };
 Image IMG_LIB
 {
-ImageBitmap = Bitmap { File = "im30820.png"; };
+ImageBitmap = Bitmap { File = "im30820.png" ; };
 };
 Image IMG_LIB_HC
 {
-ImageBitmap = Bitmap { File = "imh30820.png"; };
+ImageBitmap = Bitmap { File = "imh30820.png" ; };
 };
 Image IMG_MACRO
 {
-ImageBitmap = Bitmap { File = "im30821.png"; };
+ImageBitmap = Bitmap { File = "im30821.png" ; };
 };
 Image IMG_MACRO_HC
 {
-ImageBitmap = Bitmap { File = "imh30821.png"; };
+ImageBitmap = Bitmap { File = "imh30821.png" ; };
 };
 Image IMG_DOC
 {
-ImageBitmap = Bitmap { File = "im30826.png"; };
+ImageBitmap = Bitmap { File = "im30826.png" ; };
 };
 Image IMG_DOC_HC
 {
-ImageBitmap = Bitmap { File = "imh30826.png"; };
+ImageBitmap = Bitmap { File = "imh30826.png" ; };
 };
 Image BMP_COLLAPSED
 {
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 05dcc8ddbdc4..ea727acd58ec 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -20,6

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-07-30 Thread Libreoffice Gerrit user 
 cui/source/customize/acccfg.src |  151 +++-
 1 file changed, 44 insertions(+), 107 deletions(-)

New commits:
commit d4ab4fc277752d0bfc76ab72ed314c8b44877577
Author: Matthias Seidel 
AuthorDate: Mon Jul 30 22:53:46 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Jul 30 22:53:46 2018 +

Cleaned up resource file.

Removed entries for MASKCOLOR.

diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 6815fee988d4..8949729428ca 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -20,14 +20,11 @@
  */
 
 
- // include ---
+// include ---
 #include "helpid.hrc"
 #include "cuires.hrc"
 #include "acccfg.hrc"
 
-#define MASKCOLOR  MaskColor = \
-Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
-
 #define PUSHBUTTON_TEXT_SAVE \
 Text [ en-US ] = "~Save..." ; \
 
@@ -55,70 +52,70 @@
 #define GROUPBOX_TEXT_FUNCTIONS \
 Text [ en-US ] = "Functions" ; \
 
- // TP_CONFIG_ACCEL ---
+// TP_CONFIG_ACCEL ---
 TabPage RID_SVXPAGE_KEYBOARD
 {
 HelpId = HID_CONFIG_ACCEL ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 273 , 258 ) ;
+Size = MAP_APPFONT ( 273, 258 ) ;
 RadioButton RB_OFFICE
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
-Pos = MAP_APPFONT ( 192 , 6 ) ;
-Size = MAP_APPFONT ( 75 , 10 ) ;
+Pos = MAP_APPFONT ( 192, 6 ) ;
+Size = MAP_APPFONT ( 75, 10 ) ;
 Text = "%PRODUCTNAME" ;
 };
 RadioButton RB_MODULE
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
-Pos = MAP_APPFONT ( 192 , 19 ) ;
-Size = MAP_APPFONT ( 75 , 10 ) ;
+Pos = MAP_APPFONT ( 192, 19 ) ;
+Size = MAP_APPFONT ( 75, 10 ) ;
 Text = "$(MODULE)" ;
 };
 PushButton BTN_ACC_CHANGE
 {
 HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
-Pos = MAP_APPFONT ( 192 , 35 ) ;
-Size = MAP_APPFONT ( 75 , 14 ) ;
+Pos = MAP_APPFONT ( 192, 35 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
 PUSHBUTTON_TEXT_CHANGE
 };
 PushButton BTN_ACC_REMOVE
 {
 HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
-Pos = MAP_APPFONT ( 192 , 52 ) ;
-Size = MAP_APPFONT ( 75 , 14 ) ;
+Pos = MAP_APPFONT ( 192, 52 ) ;
+Size = MAP_APPFONT ( 75, 14 ) ;
 TabStop = TRUE ;
 Group = TRUE ;
 PUSHBUTTON_TEXT_REMOVE
 };
 FixedLine GRP_ACC_KEYBOARD
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 180 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 180, 8 ) ;
 Group = TRUE ;
 Text [ en-US ] = "Shortcut keys";
 };
 Control BOX_ACC_ENTRIES
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 174 , 120 ) ;
+Pos = MAP_APPFONT ( 12, 14 ) ;
+Size = MAP_APPFONT ( 174, 120 ) ;
 TabStop = TRUE ;
 Group = TRUE ;
 HelpId = HID_ACCELCONFIG_LISTBOX ;
 };
 FixedLine GRP_ACC_FUNCTIONS
 {
-Pos = MAP_APPFONT ( 6 , 140 ) ;
-Size = MAP_APPFONT ( 258 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 140 ) ;
+Size = MAP_APPFONT ( 258, 8 ) ;
 Group = TRUE ;
 GROUPBOX_TEXT_FUNCTIONS
 };
 FixedText TXT_ACC_GROUP
 {
-Pos = MAP_APPFONT ( 12 , 151 ) ;
-Size = MAP_APPFONT ( 78 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 151 ) ;
+Size = MAP_APPFONT ( 78, 8 ) ;
 Group = TRUE ;
 Left = TRUE ;
 FIXEDTEXT_TEXT_GROUP
@@ -126,45 +123,45 @@ TabPage RID_SVXPAGE_KEYBOARD
 Control BOX_ACC_GROUP
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 12 , 161 ) ;
-Size = MAP_APPFONT ( 78 , 91 ) ;
+Pos = MAP_APPFONT ( 12, 161 ) ;
+Size = MAP_APPFONT ( 78, 91 ) ;
 TabStop = TRUE ;
 HelpId = HID_CONFIGGROUP_ACC_LISTBOX ;
 };
 FixedText TXT_ACC_FUNCTION
 {
-Pos = MAP_APPFONT ( 93 , 151 ) ;
-Size = MAP_APPFONT ( 88 , 8 ) ;
+Pos = MAP_APPFONT ( 93, 151 ) ;
+Size = MAP_APPFONT ( 88, 8 ) ;
 Left = TRUE ;
 FIXEDTEXT_TEXT_FUNCTION
 };
 Control BOX_ACC_FUNCTION
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 93 , 161 ) ;
-Size = MAP_APPFONT ( 88 , 91 ) ;
+Pos = MAP_APPFONT ( 93, 161 ) ;
+Size = MAP_APPFONT ( 88, 91 ) ;
 TabStop = TRUE ;
 HelpId = HID_CONFIGFUNCTION_ACC_LISTBOX ;
 };
 FixedText TXT_ACC_KEY
 {
-Pos = MAP_APPFONT ( 184 , 151 ) ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-07-03 Thread Matthias Seidel 
 cui/source/tabpages/page.cxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit fbdc623e8c9e1688f2261320ae6b8d87838da9bf
Author: Matthias Seidel 
Date:   Tue Jul 3 12:39:09 2018 +

Fixing German Umlaute in comments for later translation

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 887a882f609d..7aa17089dcb2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -226,7 +226,7 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const 
Size& rSize )
 
 // class SvxPageDescPage --
 
-// gibt den Bereich der Which-Werte zur"uck
+// gibt den Bereich der Which-Werte zurück
 
 sal_uInt16* SvxPageDescPage::GetRanges()
 {
@@ -372,7 +372,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const 
SfxItemSet& rAttr )
 MapMode aOldMode = mpDefPrinter->GetMapMode();
 mpDefPrinter->SetMapMode( MAP_TWIP );
 
-// First- und Last-Werte f"ur die R"ander setzen
+// First- und Last-Werte für die Ränder setzen
 Size aPaperSize = mpDefPrinter->GetPaperSize();
 Size aPrintSize = mpDefPrinter->GetOutputSize();
 /*
@@ -492,7 +492,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 DBG_ASSERT( pPool, "Wo ist der Pool" );
 SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) );
 
-// R"ander (Links/Rechts) einstellen
+// Ränder (Links/Rechts) einstellen
 const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE );
 
 if ( pItem )
@@ -506,7 +506,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 (sal_uInt16)ConvertLong_Impl( (long)rLRSpace.GetRight(), eUnit ) );
 }
 
-// R"ander (Oben/Unten) einstellen
+// Ränder (Oben/Unten) einstellen
 pItem = GetItem( rSet, SID_ATTR_ULSPACE );
 
 if ( pItem )
@@ -688,7 +688,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 // Header Footer anzeigen
 InitHeadFoot_Impl( rSet );
 
-// R"ander auf Hoch/Quer updaten, dann Beispiel updaten
+// Ränder auf Hoch/Quer updaten, dann Beispiel updaten
 bBorderModified = sal_False;
 SwapFirstValues_Impl( sal_False );
 UpdateExample_Impl();
@@ -763,7 +763,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 // alten linken und rechten Rand kopieren
 SvxLRSpaceItem aMargin( (const SvxLRSpaceItem&)rOldSet.Get( nWhich ) );
 
-// alten  oberen und unteren Rand kopieren
+// alten oberen und unteren Rand kopieren
 nWhich = GetWhich( SID_ATTR_ULSPACE );
 SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
 
@@ -978,7 +978,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 
 IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *, EMPTYARG )
 {
-// innen au\sen umschalten
+// Innen/Außen umschalten
 const sal_uInt16 nPos = PosToPageUsage_Impl( 
aLayoutBox.GetSelectEntryPos() );
 
 if ( nPos == SVX_PAGE_MIRROR )
@@ -1006,7 +1006,7 @@ IMPL_LINK( SvxPageDescPage, LayoutHdl_Impl, ListBox *, 
EMPTYARG )
 IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG )
 {
 if ( aPaperTrayBox.GetEntryCount() > 1 )
-// schon gef"ullt
+// schon gefüllt
 return 0;
 
 // Schacht-Box initialisieren
@@ -1062,7 +1062,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox 
*, pBox )
 SetMetricValue( aPaperHeightEdit, aSize.Height(), SFX_MAPUNIT_100TH_MM 
);
 SetMetricValue( aPaperWidthEdit, aSize.Width(), SFX_MAPUNIT_100TH_MM );
 
-// R"ander ggf. neu berechnen
+// Ränder ggf. neu berechnen
 CalcMargin_Impl();
 
 RangeHdl_Impl( 0 );
@@ -1078,7 +1078,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox 
*, pBox )
 // bei Bildschirm keinen Rand
 nTmp = 1; // entspr. 1cm
 
-// Abfragen, ob fuer Raender 0 gesetzt ist:
+// Abfragen, ob für Ränder 0 gesetzt ist:
 if ( bScreen || aRightMarginEdit.GetValue() == 0 )
 {
 SetMetricValue( aRightMarginEdit, nTmp, SFX_MAPUNIT_CM );
@@ -1180,7 +1180,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( FASTBOOL bSet 
)
 mpDefPrinter->SetOrientation( eOri );
 mpDefPrinter->SetMapMode( MAP_TWIP );
 
-// First- und Last-Werte f"ur die R"ander setzen
+// First- und Last-Werte für die Ränder setzen
 Size aPaperSize = mpDefPrinter->GetPaperSize();
 Size aPrintSize = mpDefPrinter->GetOutputSize();
 /*
@@ -1257,7 +1257,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool 
bResetbackground )
 
 aBspWin.SetSize( aSize );
 
-// R"ander
+// Ränder
 aBspWin.SetTop( GetCoreValue( aTopMarginEdit, SFX_MAPUNIT_TWIP ) );
 aBspWin.SetBottom( GetCoreValue( aBottomMarginEdit, SFX_MAPUNIT_TWIP ) );
 aBspWin.SetLeft( GetCoreValue( aLeftMarginEdit, SFX_MAPUNIT_TWIP ) );
@@ -1543,8 +1543,8 @@ void

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-07-03 Thread Matthias Seidel 
 cui/source/tabpages/page.src |  162 +--
 1 file changed, 81 insertions(+), 81 deletions(-)

New commits:
commit 425b62ddc26adb5e9a2e21ebfe1d46b9005caba5
Author: Matthias Seidel 
Date:   Tue Jul 3 11:18:08 2018 +

Cleaned up page dialog

diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 7971ffe96b61..65a1f1fc7022 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -35,31 +35,31 @@ TabPage RID_SVXPAGE_PAGE
 {
 HelpId = HID_FORMAT_PAGE ;
 Hide = TRUE ;
-Size = MAP_APPFONT ( 260 , 185 ) ;
+Size = MAP_APPFONT ( 260, 185 ) ;
 FixedLine FL_PAPER_SIZE
 {
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 164 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 3 ) ;
+Size = MAP_APPFONT ( 164, 8 ) ;
 Text [ en-US ] = "Paper format" ;
 };
 FixedText FT_PAPER_FORMAT
 {
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 16 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
 Text [ en-US ] = "~Format";
 };
 ListBox LB_PAPER_SIZE
 {
 HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
-Pos = MAP_APPFONT ( 50 , 14 ) ;
-Size = MAP_APPFONT ( 50 , 64 ) ;
+Pos = MAP_APPFONT ( 50, 14 ) ;
+Size = MAP_APPFONT ( 75, 64 ) ;
 DropDown = TRUE ;
 DDExtraWidth = TRUE ;
 };
 FixedText FT_PAPER_WIDTH
 {
-Pos = MAP_APPFONT ( 12 , 32 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 32 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
 Text [ en-US ] = "~Width" ;
 Left = TRUE ;
 };
@@ -68,7 +68,7 @@ TabPage RID_SVXPAGE_PAGE
 HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
 Border = TRUE ;
 Pos = MAP_APPFONT ( 50, 30 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+Size = MAP_APPFONT ( 40, 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -80,8 +80,8 @@ TabPage RID_SVXPAGE_PAGE
 };
 FixedText FT_PAPER_HEIGHT
 {
-Pos = MAP_APPFONT ( 12 , 48 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 48 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
 Text [ en-US ] = "~Height" ;
 Left = TRUE ;
 };
@@ -89,8 +89,8 @@ TabPage RID_SVXPAGE_PAGE
 {
 HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 46 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+Pos = MAP_APPFONT ( 50, 46 ) ;
+Size = MAP_APPFONT ( 40, 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -102,35 +102,35 @@ TabPage RID_SVXPAGE_PAGE
 };
 FixedText FT_ORIENTATION
 {
-Pos = MAP_APPFONT ( 12 , 62 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 12, 62 ) ;
+Size = MAP_APPFONT ( 35, 8 ) ;
 Text [ en-US ] = "Orientation";
 };
 RadioButton RB_PORTRAIT
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
-Pos = MAP_APPFONT ( 50 , 62 ) ;
-Size = MAP_APPFONT ( 53 , 10 ) ;
+Pos = MAP_APPFONT ( 50, 62 ) ;
+Size = MAP_APPFONT ( 53, 10 ) ;
 Check = TRUE ;
 Text [ en-US ] = "~Portrait" ;
 };
 RadioButton RB_LANDSCAPE
 {
 HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
-Pos = MAP_APPFONT ( 50 , 74 ) ;
-Size = MAP_APPFONT ( 53 , 10 ) ;
+Pos = MAP_APPFONT ( 50, 74 ) ;
+Size = MAP_APPFONT ( 53, 10 ) ;
 Text [ en-US ] = "L~andscape";
 };
 Window WN_BSP
 {
-Pos = MAP_APPFONT ( 176 , 6 ) ;
-Size = MAP_APPFONT ( 75 , 46 ) ;
+Pos = MAP_APPFONT ( 176, 6 ) ;
+Size = MAP_APPFONT ( 75, 46 ) ;
 };
 
 FixedText FT_TEXT_FLOW
 {
-Pos = MAP_APPFONT ( 113 , 60 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 113, 60 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
 Left = TRUE ;
 Hide = TRUE ;
 Text [ en-US ] = "~Text direction";
@@ -139,37 +139,37 @@ TabPage RID_SVXPAGE_PAGE
 {
 HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW";
 Border = TRUE ;
-Pos = MAP_APPFONT ( 165 , 58 ) ;
-Size = MAP_APPFONT ( 83 , 50 ) ;
+Pos = MAP_APPFONT ( 165, 58 ) ;
+Size = MAP_APPFONT ( 83, 50 ) ;
 DropDown = TRUE ;
 Hide = TRUE ;
 };
 
 FixedText FT_PAPER_TRAY
 {
-Pos = MAP_APPFONT ( 113 , 74 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 113, 74 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
 Left = TRUE ;
 Text [ en-US ] = "Paper ~tray";
 };
 ListBox LB_PAPER_TRAY
 {
 HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY";
-Pos = MAP_APPFONT ( 165 , 72 ) ;
-

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2018-06-17 Thread Matthias Seidel 
 cui/source/tabpages/page.src |   86 +--
 1 file changed, 10 insertions(+), 76 deletions(-)

New commits:
commit a66fd13e809230b03bb085828a7be3c1299edb91
Author: Matthias Seidel 
Date:   Sun Jun 17 15:46:58 2018 +

Fixed typos:

congiguration -> configuration

Deleted whitespace

diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index f4348f9417da..7971ffe96b61 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -72,7 +72,7 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum = 11900 ;
+// #i4219# taken from configuration now Maximum = 11900 ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
 // #i4219# Last = 11900 ;
@@ -94,7 +94,7 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum = 11900 ;
+// #i4219# taken from configuration now Maximum = 11900 ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
 // #i4219# Last = 11900 ;
@@ -182,10 +182,10 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum =  ;
+// #i4219# taken from configuration now Maximum =  ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
-// #i4219# Last =  ;
+// #i4219# Last =  ;
 SpinSize = 10 ;
 };
 FixedText FT_RIGHT_MARGIN
@@ -204,10 +204,10 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum =  ;
+// #i4219# taken from configuration now Maximum =  ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
-// #i4219# Last =  ;
+// #i4219# Last =  ;
 SpinSize = 10 ;
 };
 FixedText FT_TOP_MARGIN
@@ -226,10 +226,10 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum =  ;
+// #i4219# taken from configuration now Maximum =  ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
-// #i4219# Last =  ;
+// #i4219# Last =  ;
 SpinSize = 10 ;
 };
 FixedText FT_BOTTOM_MARGIN
@@ -248,10 +248,10 @@ TabPage RID_SVXPAGE_PAGE
 Left = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
-// #i4219# taken from congiguration now Maximum =  ;
+// #i4219# taken from configuration now Maximum =  ;
 DecimalDigits = 2 ;
 Unit = FUNIT_CM ;
-// #i4219# Last =  ;
+// #i4219# Last =  ;
 SpinSize = 10 ;
 };
 FixedLine FL_BOTTOM_SEP
@@ -452,69 +452,3 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
 };
  // ** EOF
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source LICENSE_ALv2 NOTICE

2018-01-18 Thread Matthias Seidel 
 LICENSE_ALv2 |2 +-
 NOTICE   |2 +-
 cui/source/dialogs/about.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8e0650e18f94d9dec1c5c854bd3a93fa97b1964b
Author: Matthias Seidel 
Date:   Thu Jan 18 22:09:22 2018 +

Update the Copyright year to 2018

According to:
https://svn.apache.org/viewvc?view=revision=1780015

diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index 6e6b45666151..f999ddb9659c 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
   same "printed page" as the copyright notice for easier
   identification within third-party archives.
 
-   Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 Apache Software 
Foundation
+   Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Apache Software 
Foundation
 
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index 2d2dbe1fee7a..68d964b9fd9f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
 
 Apache OpenOffice (https://www.openoffice.org)
-Copyright 2011, 2017 The Apache Software Foundation
+Copyright 2011, 2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ff944f69f59a..5e77cdf61f24 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & 
rId ) :
 sbcopyright.appendAscii("Copyright ");
 sbcopyright.append((sal_Unicode)0x00a9);
 sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2017") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2018") );
 if (vendor.EqualsAscii("Apache Software Foundation")) {
 sbcopyright.append(sYear);
 sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2015-10-06 Thread Andrea Pescetti 
 cui/source/dialogs/about.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f50bd8ccc170a4e47ed7c5a694c1c9739601764b
Author: Andrea Pescetti 
Date:   Wed Oct 7 00:55:44 2015 +

#i126567# Update copyright year.

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a5151d3..a457c2d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & 
rId ) :
 sbcopyright.appendAscii("Copyright ");
 sbcopyright.append((sal_Unicode)0x00a9);
 sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2014") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") );
 if (vendor.EqualsAscii("Apache Software Foundation")) {
 sbcopyright.append(sYear);
 sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2015-08-30 Thread Andrea Pescetti 
 cui/source/dialogs/SpellDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54c0e817a2db81d438e945bb4f0599e046df7459
Author: Andrea Pescetti pesce...@apache.org
Date:   Sun Aug 30 15:36:27 2015 +

#i126447# Fix text deletion when toggling Check grammar in spell checker.

Patch by: Stefan Heinemann stefan.heinem...@adfinis-sygroup.ch

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 6c95a20..5366370 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -787,7 +787,7 @@ void SpellDialog::Impl_Restore()
 //get a new sentence
 aSentenceED.SetText(rtl::OUString());
 aSentenceED.ResetModified();
-SpellContinue_Impl();
+SpellContinue_Impl(true);
 aIgnorePB.SetText(aIgnoreOnceST);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2015-01-02 Thread Regina Henschel 
 cui/source/options/optpath.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c89ffc354b116410d61650551924a02bac953d8
Author: Regina Henschel reg...@apache.org
Date:   Fri Jan 2 23:25:07 2015 +

#i125987 Table header within paths dialog too small

Patch by:Thorsten Wagner thorsten.wagne...@gmail.com

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 538ddb0..d7375be 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -230,7 +230,7 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const 
SfxItemSet rSet ) :
 aPathBtn.SetClickHdl( aLink );
 Size aBoxSize = aPathCtrl.GetOutputSizePixel();
 pHeaderBar = new HeaderBar( aPathCtrl, WB_BUTTONSTYLE | WB_BOTTOMBORDER );
-pHeaderBar-SetPosSizePixel( Point( 0, 0 ), Size( aBoxSize.Width(), 16 ) );
+pHeaderBar-SetPosSizePixel( Point( 0, 0 ), Size( aBoxSize.Width(), 20 ) );
 pHeaderBar-SetSelectHdl( LINK( this, SvxPathTabPage, HeaderSelect_Impl ) 
);
 pHeaderBar-SetEndDragHdl( LINK( this, SvxPathTabPage, HeaderEndDrag_Impl 
) );
 Size aSz;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source sfx2/inc sfx2/source

2014-06-12 Thread Jürgen Schmidt 
 cui/source/options/optsave.cxx |   11 +++
 cui/source/options/optsave.hrc |1 +
 cui/source/options/optsave.hxx |1 +
 cui/source/options/optsave.src |   25 -
 cui/source/options/treeopt.cxx |1 +
 sfx2/inc/sfx2/sfxsids.hrc  |1 +
 sfx2/source/appl/appcfg.cxx|   20 
 7 files changed, 51 insertions(+), 9 deletions(-)

New commits:
commit f5d074090c8cf24a27e610d1dc70e8d6af68cc88
Author: Jürgen Schmidt j...@apache.org
Date:   Thu Jun 12 12:46:11 2014 +

#125083# add new checkbox in options dialog load/save-general to enable ODF 
1.2 encryption AES-256

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 99d58e6..c71a1ee 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -178,6 +178,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const 
SfxItemSet rCoreSet ) :
 aDefaultFormatFL( this, CUI_RES( FL_FILTER ) ),
 aODFVersionFT   ( this, CUI_RES( FT_ODF_VERSION ) ),
 aODFVersionLB   ( this, CUI_RES( LB_ODF_VERSION ) ),
+aODFEncryptionCB( this, CUI_RES( BTN_ODFENCRYPTION ) ),
 aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
 aWarnAlienFormatCB  ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
 aDocTypeFT  ( this, CUI_RES( FT_APP ) ),
@@ -384,6 +385,12 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet rSet )
 bModified |= sal_True;
 }
 
+if ( aODFEncryptionCB.IsChecked() != aODFEncryptionCB.GetSavedValue() )
+{
+rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_ODFENCRYPTION ), 
aODFEncryptionCB.IsChecked() ) );
+bModified |= sal_True;
+}
+
 if ( aSizeOptimizationCB.IsChecked() != 
aSizeOptimizationCB.GetSavedValue() )
 {
 rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ), 
!aSizeOptimizationCB.IsChecked() ) );
@@ -596,6 +603,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
 
aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 //aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
 
+// ODF encryption
+aODFEncryptionCB.Check( !aSaveOpt.IsUseSHA1InODF12());
+
 // the pretty printing
 aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting());
 //
aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING
 ));
@@ -620,6 +630,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
 aDocInfoCB.SaveValue();
 aBackupCB.SaveValue();
 aWarnAlienFormatCB.SaveValue();
+aODFEncryptionCB.SaveValue();
 aSizeOptimizationCB.SaveValue();
 aAutoSaveCB.SaveValue();
 aAutoSaveEdit.SaveValue();
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index a637f4a..e705793 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -40,6 +40,7 @@
 #define BTN_WARNALIENFORMAT 22
 #define FT_ODF_VERSION  23
 #define LB_ODF_VERSION  24
+#define BTN_ODFENCRYPTION   25
 
 #define GB_RELATIVE 40
 #define BTN_RELATIVE_FSYS   41
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index a2e2c5d..cf5d7e4 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -66,6 +66,7 @@ private:
 FixedLine   aDefaultFormatFL;
 FixedText   aODFVersionFT;
 ListBox aODFVersionLB;
+CheckBoxaODFEncryptionCB;
 CheckBoxaSizeOptimizationCB;
 CheckBoxaWarnAlienFormatCB;
 FixedText   aDocTypeFT;
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 4ab58c7..892cf7b 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -156,36 +156,43 @@ TabPage RID_SFXPAGE_SAVE
  1.2 Extended (recommended); 0x7fff ;  ;
 };
 };
+CheckBox BTN_ODFENCRYPTION
+{
+HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_ODFENCRYPTION;
+Pos = MAP_APPFONT ( 12 , 120 ) ;
+Size = MAP_APPFONT ( 248 , 10 ) ;
+Text [ en-US ] = Enable AES-256 encryption (ODF 1.2) ;
+};
 CheckBox BTN_NOPRETTYPRINTING
 {
 HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING;
-Pos = MAP_APPFONT ( 12 , 120 ) ;
+Pos = MAP_APPFONT ( 12 , 131 ) ;
 Size = MAP_APPFONT ( 248 , 10 ) ;
 Text [ en-US ] = Size optimization for ODF format ;
 };
 CheckBox BTN_WARNALIENFORMAT
 {
 HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT;
-Pos = MAP_APPFONT ( 12 , 131 ) ;
+Pos = MAP_APPFONT ( 12 , 142 ) ;
 Size = MAP_APPFONT ( 248 , 10 ) ;
 Text [ en-US ] = Warn when not saving in ODF or default format ;
 };
 FixedText FT_APP
 {
-Pos = MAP_APPFONT ( 12 , 142 ) ;
+Pos = MAP_APPFONT ( 12 , 153 ) ;
 Size = MAP_APPFONT ( 120 , 8 )

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2014-05-17 Thread Tsutomu Uchino 
 cui/source/tabpages/page.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cda643a4d4c5a32b3d171aaa888d718409b3d5f3
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat May 17 07:06:55 2014 +

#i53447# update example view for Draw during the activation of the tab page

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index c5c3495..3edba4b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1458,6 +1458,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const 
SfxItemSet rSet )
 void SvxPageDescPage::ActivatePage( const SfxItemSet rSet )
 {
 InitHeadFoot_Impl( rSet );
+UpdateExample_Impl();
 ResetBackground_Impl( rSet );
 RangeHdl_Impl( 0 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2014-05-15 Thread Herbert Dürr 
 cui/source/options/optcolor.hrc |8 
 cui/source/options/optcolor.src |8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 4df4135e32f950925088acd7920af3861c6f3675
Author: Herbert Dürr h...@apache.org
Date:   Thu May 15 15:45:20 2014 +

#i124796# fix Preferences-OpenOffice-Appearance tabpage listbox column 
width

Patch-by: Thorsten Wagner thorsten.wagne...@gmail.com

diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc
index 809f04f..0e0cbd5 100644
--- a/cui/source/options/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
@@ -187,16 +187,16 @@
 
 
 #define _FT_WIDTH   120
-#define _LINE_HEIGHT15
+#define _LINE_HEIGHT16
 #define _FT_HEIGHT  10
 #define _CB_WIDTH   130
 #define _FT_XPOS14
 #define _CB_XPOS6
-#define _LB_XPOS139
-#define _LB_WIDTH   50
+#define _LB_XPOS119
+#define _LB_WIDTH   70
 #define _LB_HEIGHT  50
 #define _WN_WIDTH   30
-#define _WN_HEIGHT  12
+#define _WN_HEIGHT  14
 #define _WN_XPOS195
 
 #define FT_SMARTTAGS168
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 4983f1f..04f0c7a 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -49,7 +49,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 ListBox LB_COLORSCHEME
 {
 HelpID = cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME;
-Pos = MAP_APPFONT ( 65 , 14 ) ;
+Pos = MAP_APPFONT ( 65 , 13 ) ;
 Size = MAP_APPFONT ( 77 , 58 ) ;
 Border = TRUE;
 Sort = TRUE;
@@ -79,14 +79,14 @@ TabPage RID_SVXPAGE_COLORCONFIG
 Control CT_COLORCONFIG
 {
 Pos = MAP_APPFONT ( 12 , 45 ) ;
-Size = MAP_APPFONT ( 236 , 134 ) ;
+Size = MAP_APPFONT ( 236 , 138 ) ;
 Border = TRUE;
 DialogControl = TRUE;
 OutputSize = TRUE ;
 ScrollBar VB_VSCROLL
 {
 Pos = MAP_APPFONT ( 228 , 10 ) ;
-Size = MAP_APPFONT ( 8 , 124 ) ;
+Size = MAP_APPFONT ( 8 , 128 ) ;
 VScroll = TRUE;
 };
 String ST_ON
@@ -131,7 +131,7 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
 OutputSize = TRUE ;
 Pos = MAP_APPFONT ( 0 , 10 ) ;
-Size = MAP_APPFONT ( 228 , 124 ) ;
+Size = MAP_APPFONT ( 228 , 128 ) ;
 DialogControl = TRUE;
 
 FixedText FT_GENERAL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2014-01-16 Thread Andrea Pescetti 
 cui/source/customize/cfg.src |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 91eb528b63cdee73afc2dc4a48d5dca1b96dedd5
Author: Andrea Pescetti pesce...@apache.org
Date:   Thu Jan 16 21:20:39 2014 +

#i123887# Factory settings - Default settings

diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 51cc925..05dcc8d 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -777,7 +777,7 @@ QueryBox QBX_CONFIRM_DELETE_TOOLBAR
 */
 QueryBox QBX_CONFIRM_RESET
 {
-Message [ en-US ] = The menu configuration for %SAVE IN SELECTION% will 
be reset to the factory settings. Do you want to continue?;
+Message [ en-US ] = The menu configuration for %SAVE IN SELECTION% will 
be reset to the default settings. Do you want to continue?;
 BUTTONS = WB_YES_NO ;
 DEFBUTTON = WB_DEF_NO ;
 };
@@ -788,12 +788,12 @@ QueryBox QBX_CONFIRM_RESET
 */
 String RID_SVXSTR_CONFIRM_MENU_RESET
 {
-Text [ en-US ] = The menu configuration for %SAVE IN SELECTION% will be 
reset to the factory settings. Do you want to continue?;
+Text [ en-US ] = The menu configuration for %SAVE IN SELECTION% will be 
reset to the default settings. Do you want to continue?;
 };
 
 String RID_SVXSTR_CONFIRM_TOOLBAR_RESET
 {
-Text [ en-US ] = The toolbar configuration for %SAVE IN SELECTION% will 
be reset to the factory settings. Do you want to continue?;
+Text [ en-US ] = The toolbar configuration for %SAVE IN SELECTION% will 
be reset to the default settings. Do you want to continue?;
 };
 
 QueryBox QBX_CONFIRM_RESTORE_DEFAULT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-11-26 Thread Pavel Janík 
 cui/source/dialogs/cuicharmap.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ffb3bedc183791815eca699ef247f7109b9ffc21
Author: Pavel Janík pavelja...@apache.org
Date:   Tue Nov 26 10:15:10 2013 +

WaE: reorder initializations to prevent compiler warnings.

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 9161c08..a271516 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -257,7 +257,12 @@ SvxShowText::~SvxShowText()
 
 SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, 
ResMgr* pResContext )
 :   mpDialog( pDialog ),
+aFontText   ( pDialog, ResId( FT_FONT, *pResContext ) ),
+aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
+aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
+aSubsetLB   ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
 aShowSet( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
+aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
 aShowText   ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
 //aShowShortcut   ( pDialog, ResId( CT_ASSIGN, *pResContext ) ),
 aOKBtn  ( pDialog, ResId( BTN_CHAR_OK, *pResContext ) ),
@@ -265,11 +270,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, 
sal_Bool bOne_, ResMgr*
 aHelpBtn( pDialog, ResId( BTN_CHAR_HELP, *pResContext ) ),
 aDeleteBtn  ( pDialog, ResId( BTN_DELETE, *pResContext ) ),
 //aAssignBtn  ( pDialog, ResId( BT_ASSIGN, *pResContext ) ),
-aFontText   ( pDialog, ResId( FT_FONT, *pResContext ) ),
-aFontLB ( pDialog, ResId( LB_FONT, *pResContext ) ),
-aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
-aSubsetLB   ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
-aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
 aShowChar   ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ),
 aCharCodeText   ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
 //aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-10-25 Thread Armin Le Grand 
 cui/source/tabpages/tpbitmap.cxx |7 +--
 cui/source/tabpages/tpcolor.cxx  |   10 ++
 cui/source/tabpages/tplneend.cxx |   25 +
 3 files changed, 28 insertions(+), 14 deletions(-)

New commits:
commit 03fa6020a862b1b6faf69f33274022cb871e8f4b
Author: Armin Le Grand a...@apache.org
Date:   Fri Oct 25 16:22:15 2013 +

i123497 corrected modify implementations for bitmap, lineend and color

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 17b0d7e..1c86921 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -756,9 +756,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, 
EMPTYARG )
 bLoop = sal_False;
 
 const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx());
-const XBitmapEntry aEntry(Graphic(aBitmapEx), aName);
 
-aLbBitmaps.Modify( 
rStyleSettings.GetListBoxPreviewDefaultPixelSize(), aEntry, nPos );
+// #123497# Need to replace the existing entry with a new one 
(old returned needs to be deleted)
+XBitmapEntry* pEntry = new XBitmapEntry(Graphic(aBitmapEx), 
aName);
+delete maBitmapList-Replace(pEntry, nPos);
+
+aLbBitmaps.Modify( 
rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos );
 aLbBitmaps.SelectEntryPos( nPos );
 
 // Flag fuer modifiziert setzen
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d94816c..e9763e0 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -631,13 +631,15 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, 
EMPTYARG )
 if (eCM != CM_RGB)
 ConvertColorValues (aTmpColor, CM_RGB);
 
-const XColorEntry aEntry(aTmpColor, aName);
+// #123497# Need to replace the existing entry with a new one (old 
returned needs to be deleted)
+XColorEntry* pEntry = new XColorEntry(aTmpColor, aName);
+delete maColorTab-Replace(pEntry, nPos);
 
-aLbColor.Modify( aEntry, nPos );
+aLbColor.Modify( *pEntry, nPos );
 aLbColor.SelectEntryPos( nPos );
 
-aValSetColorTable.SetItemColor( nPos + 1, aEntry.GetColor() );
-aValSetColorTable.SetItemText( nPos + 1, aEntry.GetName() );
+aValSetColorTable.SetItemColor( nPos + 1, pEntry-GetColor() );
+aValSetColorTable.SetItemText( nPos + 1, pEntry-GetName() );
 aEdtName.SetText( aName );
 
 aCtlPreviewOld.Invalidate();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 0059e87..8114d16 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -402,19 +402,28 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, 
void *, EMPTYARG )
 // Wenn nicht vorhanden, wird Eintrag aufgenommen
 if( bDifferent )
 {
-const XLineEndEntry* pEntry = maLineEndList-GetLineEnd( nPos );
+const XLineEndEntry* pOldEntry = maLineEndList-GetLineEnd( nPos );
 
-aEdtName.SetText( aName );
+if(pOldEntry)
+{
+// #123497# Need to replace the existing entry with a new one 
(old returned needs to be deleted)
+XLineEndEntry* pEntry = new 
XLineEndEntry(pOldEntry-GetLineEnd(), aName);
+delete maLineEndList-Replace(pEntry, nPos);
 
-const XLineEndEntry aEntry(pEntry-GetLineEnd(), aName);
+aEdtName.SetText( aName );
 
-aLbLineEnds.Modify( aEntry, nPos, maLineEndList-GetUiBitmap( nPos 
) );
-aLbLineEnds.SelectEntryPos( nPos );
+aLbLineEnds.Modify( *pEntry, nPos, maLineEndList-GetUiBitmap( 
nPos ) );
+aLbLineEnds.SelectEntryPos( nPos );
 
-// Flag fuer modifiziert setzen
-*pnLineEndListState |= CT_MODIFIED;
+// Flag fuer modifiziert setzen
+*pnLineEndListState |= CT_MODIFIED;
 
-*pPageType = 3;
+*pPageType = 3;
+}
+else
+{
+OSL_ENSURE(false, LineEnd to be modified not existing (!));
+}
 }
 }
 return( 0L );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-10-15 Thread Ariel Constenla-Haile 
 cui/source/options/optsave.cxx |   35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit a17e221225915c140c7840904cb9b46d75731edc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue Oct 15 21:17:30 2013 +

i122759 - Pass the Sequence by reference

Despite it's name, rProperties, the Sequence is not a reference in the
function signature.

Besides, some small improvements:

- remove the unused code related to the Flags
- instead of compareToAscii, use equalsAsciiL, which is  optimized for
performance

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a67b864..99d58e6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -655,32 +655,29 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, 
pBox )
 /* -05.04.01 13:10
 
  ---*/
-OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
+OUString lcl_ExtracUIName(const SequencePropertyValue rProperties)
 {
-OUString sRet;
-sal_Int32 nFlags;
-const PropertyValue* pProperties = rProperties.getConstArray();
-for(int nProp = 0; nProp  rProperties.getLength(); nProp++)
+OUString sName;
+const PropertyValue* pPropVal = rProperties.getConstArray();
+const PropertyValue* const pEnd = pPropVal + rProperties.getLength();
+for( ; pPropVal != pEnd; pPropVal++ )
 {
-if(!pProperties[nProp].Name.compareToAscii(UIName))
+const OUString rName = pPropVal-Name;
+if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( UIName ) ) )
 {
-if ( pProperties[nProp].Value = sRet )
-break;
+OUString sUIName;
+if ( ( pPropVal-Value = sUIName )  sUIName.getLength() )
+return sUIName;
 }
-else if(!pProperties[nProp].Name.compareToAscii(Flags))
+else if( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( Name ) ) )
 {
-if ( pProperties[nProp].Value = nFlags )
-{
-nFlags = 0x100;
-}
-}
-else if(!pProperties[nProp].Name.compareToAscii(Name))
-{
-if ( !sRet.getLength() )
-pProperties[nProp].Value = sRet;
+pPropVal-Value = sName;
 }
 }
-return sRet;
+
+OSL_ENSURE( false, Filter without UIName! );
+
+return sName;
 }
 /* -05.04.01 13:37
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-08-09 Thread Herbert Dürr 
 cui/source/options/optupdt.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit bd363910bb80e61805672430de7870e1583b0052
Author: Herbert Dürr h...@apache.org
Date:   Fri Aug 9 15:03:18 2013 +

#i122818# fix crash in online-update-check when no application is active

Closing all application windows and retaining access to the application menu
is only possible on MacOSX. The DispatchProvider used for the update check
seems to depend on having an active application window. Maybe it is possible
to get the update check working without it but this patch doesn't attempt
that, it prevent further escalation such as crashes.

Fixed by: Herbert Duerr
Debugged by: Oliver-Rainer Wittmann, Herbert Duerr
Found by: Frantisek Erben

diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 54517b5..e379215 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -371,13 +371,14 @@ IMPL_LINK( SvxOnlineUpdateTabPage, CheckNowHdl_Impl, 
PushButton *, EMPTYARG )
 uno::Reference frame::XDispatchProvider  xDispatchProvider(
 xDesktop-getCurrentFrame(), uno::UNO_QUERY );
 
-uno::Reference frame::XDispatch  xDispatch = 
xDispatchProvider-queryDispatch(aURL, rtl::OUString(), 0);
+uno::Reference frame::XDispatch  xDispatch;
+if( xDispatchProvider.is() )
+xDispatch = xDispatchProvider-queryDispatch(aURL, 
rtl::OUString(), 0);
 
 if( xDispatch.is() )
-{
 xDispatch-dispatch(aURL, uno::Sequence beans::PropertyValue  
());
-UpdateLastCheckedText();
-}
+
+UpdateLastCheckedText();
 }
 catch( const uno::Exception e )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-07-10 Thread Pavel Janík 
 cui/source/dialogs/cuifmsearch.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7986627ca418ec7c6fcaaa91367eda7f4b9aadaf
Author: Pavel Janík pavelja...@apache.org
Date:   Wed Jul 10 21:14:12 2013 +

Return zero value from non-void function to prevent compiler warnings.

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index 9ed5619..6f8ffcb 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -447,6 +447,7 @@ IMPL_LINK(FmSearchDialog, OnSearchTextModified, ComboBox*, 
EMPTYARG)
 IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
 {
 m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+return 0;
 }
 
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2013-05-21 Thread Jürgen Schmidt 
 cui/source/dialogs/about.cxx   |   40 +---
 cui/source/dialogs/about.hrc   |   19 +++
 cui/source/dialogs/about.src   |   16 ++--
 cui/source/dialogs/makefile.mk |4 
 4 files changed, 66 insertions(+), 13 deletions(-)

New commits:
commit 11f657e989d677f53609af82f9002f50f064953e
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 05:53:21 2013 +

#122265# split resource string to get more flexibility and drop general 
copyright from translation, remains untranslated

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 3b586d0..7dfe13d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -28,6 +28,7 @@
 #include dialmgr.hxx
 #include osl/file.hxx
 #include rtl/bootstrap.hxx
+//#include rtl/ustrbuf.hxx
 #include sfx2/sfxcommands.h
 #include sfx2/sfxdefs.hxx
 #include sfx2/sfxuno.hxx
@@ -279,15 +280,15 @@ namespace
 
 // ---
 
-AboutDialog::AboutDialog( Window* pParent, const ResId rId ) :
+AboutDialog::AboutDialog( Window* pParent, const ResId   rId ) :
 SfxModalDialog( pParent, rId ),
 maOKButton( this, ResId( RID_CUI_ABOUT_BTN_OK, *rId.GetResMgr() ) ),
 maReadmeButton( this, ResId( RID_CUI_ABOUT_BTN_README, *rId.GetResMgr() ) 
),
 maVersionText( this, ResId( RID_CUI_ABOUT_FTXT_VERSION, *rId.GetResMgr() ) 
),
 maBuildInfoEdit( this, ResId( RID_CUI_ABOUT_FTXT_BUILDDATA, 
*rId.GetResMgr() ) ),
 maCopyrightEdit( this, ResId( RID_CUI_ABOUT_FTXT_COPYRIGHT, 
*rId.GetResMgr() ) ),
-maCreditsLink( this, ResId( RID_CUI_ABOUT_FTXT_WELCOME_LINK, 
*rId.GetResMgr() )  ),
-maCopyrightTextStr( ResId( RID_CUI_ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) 
)
+maCreditsLink( this, ResId( RID_CUI_ABOUT_FTXT_WELCOME_LINK, 
*rId.GetResMgr() )  )
+//maCopyrightTextStr( ResId( RID_CUI_ABOUT_STR_COPYRIGHT, *rId.GetResMgr() 
) )
 {
 bool bLoad = vcl::ImageRepository::loadBrandingImage(
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(about)),
@@ -299,6 +300,39 @@ AboutDialog::AboutDialog( Window* pParent, const ResId 
rId ) :
 maMainLogo );
 OSL_ENSURE( bLoad, Can't load logo image);
 
+const String vendor( ResId( RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR, 
*rId.GetResMgr() ) );
+String createdRes( ResId( RID_CUI_ABOUT_STR_CREATED, *rId.GetResMgr() ) );
+if ( !vendor.EqualsAscii(Apache Software Foundation) ) {
+createdRes = String( ResId( RID_CUI_ABOUT_STR_CREATED_VENDOR, 
*rId.GetResMgr() ));
+}
+const String copyrightAcknowledge( ResId( RID_CUI_ABOUT_STR_ACKNOWLEDGE, 
*rId.GetResMgr() ) );
+
+rtl::OUStringBuffer sbcopyright(250);
+sbcopyright.appendAscii(Copyright );
+sbcopyright.append((sal_Unicode)0x00a9);
+sbcopyright.appendAscii( );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM(2013) );
+if (vendor.EqualsAscii(Apache Software Foundation)) {
+sbcopyright.append(sYear);
+sbcopyright.appendAscii( The Apache Software Foundation.\n\n);
+} else {
+#ifdef COPYRIGHT_YEAR
+const rtl::OUString sDefYear( RTL_CONSTASCII_USTRINGPARAM( STRINGIFY( 
COPYRIGHT_YEAR ) ) );
+if ( sDefYear.getLength()  0 )
+{
+sYear = sDefYear;
+}
+#endif
+sbcopyright.append(sYear);
+sbcopyright.appendAscii( );
+sbcopyright.append(vendor);
+sbcopyright.appendAscii(.\nPortion copyright The Apache Software 
Foundation.\n\n);
+}
+sbcopyright.append( createdRes );
+sbcopyright.appendAscii(\n\n);
+sbcopyright.append( copyrightAcknowledge );
+maCopyrightTextStr = sbcopyright.makeStringAndClear();
+
 InitControls();
 
 // set links
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index fa2cbfb..9944a58 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -28,12 +28,15 @@
 #define RID_CUI_ABOUT_FTXT_VERSION  3
 #define RID_CUI_ABOUT_FTXT_COPYRIGHT4
 #define RID_CUI_ABOUT_FTXT_BUILDDATA5
-#define RID_CUI_ABOUT_STR_COPYRIGHT 6
-#define RID_CUI_ABOUT_FTXT_WELCOME_LINK 7
+#define RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR  6
+#define RID_CUI_ABOUT_STR_CREATED   7
+#define RID_CUI_ABOUT_STR_CREATED_VENDOR8
+#define RID_CUI_ABOUT_STR_ACKNOWLEDGE   9
+#define RID_CUI_ABOUT_FTXT_WELCOME_LINK 10
 
-#define RID_CUI_README_TBCTL8
-#define RID_CUI_README_OKBTN9
-#define RID_CUI_READMEPAGE  10
-#define RID_CUI_LICENSEPAGE 11
-#define RID_CUI_NOTICEPAGE  12
-#define RID_CUI_README_TBPAGE_EDIT  13
+#define RID_CUI_README_TBCTL20
+#define RID_CUI_README_OKBTN21
+#define RID_CUI_READMEPAGE