[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - rat-excludes sd/source solenv/gbuild
Matthias Seidel
mseidel at apache.org
Thu Jul 5 18:09:57 UTC 2018
rat-excludes | 12 ++--
sd/source/ui/dlg/layeroptionsdlg.src | 95 +++++++++--------------------------
solenv/gbuild/platform/macosx.mk | 9 +++
3 files changed, 40 insertions(+), 76 deletions(-)
New commits:
commit 8018da421604d0f0e72db93b024b818aa21ef068
Author: Matthias Seidel <mseidel at apache.org>
Date: Thu Jul 5 17:56:35 2018 +0000
Cleaned up dialog for layers
diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src
index 1a88a772dbe5..3dc7e2f28bd5 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.src
+++ b/sd/source/ui/dlg/layeroptionsdlg.src
@@ -30,14 +30,14 @@ ModalDialog DLG_INSERT_LAYER
HelpID = CMD_SID_INSERTLAYER ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 200 , 172 ) ;
+ Size = MAP_APPFONT ( 200, 172 ) ;
Text [ en-US ] = "Insert Layer" ;
Moveable = TRUE ;
FixedText FT_NAME
{
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 188 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Name" ;
};
@@ -45,15 +45,15 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME";
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 17 ) ;
- Size = MAP_APPFONT ( 188 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 17 ) ;
+ Size = MAP_APPFONT ( 188, 12 ) ;
TabStop = TRUE ;
};
FixedText FT_TITLE
{
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 188 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 32 ) ;
+ Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Title" ;
};
@@ -61,15 +61,15 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE";
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 43 ) ;
- Size = MAP_APPFONT ( 188 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 43 ) ;
+ Size = MAP_APPFONT ( 188, 12 ) ;
TabStop = TRUE ;
};
FixedText FT_DESCRIPTION
{
- Pos = MAP_APPFONT ( 6 , 58 ) ;
- Size = MAP_APPFONT ( 188 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 58 ) ;
+ Size = MAP_APPFONT ( 188, 8 ) ;
Text [ en-US ] = "~Description" ;
};
@@ -77,8 +77,8 @@ ModalDialog DLG_INSERT_LAYER
{
HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION";
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 69 ) ;
- Size = MAP_APPFONT ( 188 , 34 ) ;
+ Pos = MAP_APPFONT ( 6, 69 ) ;
+ Size = MAP_APPFONT ( 188, 34 ) ;
TabStop = TRUE ;
IgnoreTab = TRUE;
VScroll = TRUE;
@@ -87,8 +87,8 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_VISIBLE
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE";
- Pos = MAP_APPFONT ( 6 , 106 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 106 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Visible" ;
TabStop = TRUE ;
};
@@ -96,8 +96,8 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_PRINTABLE
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE";
- Pos = MAP_APPFONT ( 6 , 119 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 119 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Printable" ;
TabStop = TRUE ;
};
@@ -105,82 +105,37 @@ ModalDialog DLG_INSERT_LAYER
CheckBox CBX_LOCKED
{
HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED";
- Pos = MAP_APPFONT ( 6 , 132 ) ;
- Size = MAP_APPFONT ( 188 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 132 ) ;
+ Size = MAP_APPFONT ( 188, 10 ) ;
Text [ en-US ] = "~Locked" ;
TabStop = TRUE ;
};
- // divider
+ // Divider
FixedLine FL_SEPARATOR_B
{
- Pos = MAP_APPFONT ( 0 , 144 ) ;
- Size = MAP_APPFONT ( 200 , 4 ) ;
+ Pos = MAP_APPFONT ( 0, 144 ) ;
+ Size = MAP_APPFONT ( 200, 4 ) ;
};
// Buttons
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 6, 152 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 200 - (50 + 50 + 9), 152) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 200 - (50 + 6), 152) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 891d5f8f1b7dea5436fde2c22d24aa20997f6f56
Author: Jim Jagielski <jim at apache.org>
Date: Thu Jul 5 17:56:20 2018 +0000
Ugg. It looks like versioning has also crept in other
places so we need to "handle" it somehow w/ macOS.
The easiest way is simply make hard links to the
real dylibs to the "versioned" number ones.
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1f6345cffbf8..463cba4a513d 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -302,6 +302,14 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $${DYLIB_FILE})
endef
+define gb_LinkTarget__command_symlink_udk_versioned_library
+ $(if $(call gb_Library_is_udk_versioned,$(1)),
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(1).$(gb_UDK_MAJOR) $(notdir $(1)).$(gb_UDK_MAJOR) && \
+ ln $(1) $(1).$(gb_UDK_MAJOR) && \
+ ln $(1) $(notdir $(1)).$(gb_UDK_MAJOR) ))
+endef
+
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
define gb_LinkTarget__command_staticlink
$(call gb_Helper_abbreviate_dirs,\
@@ -317,6 +325,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(call gb_LinkTarget__command_symlink_udk_versioned_library,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
commit 07ffdb086a0b6f4d96a5a4ae5c948e0babec8954
Author: Matthias Seidel <mseidel at apache.org>
Date: Thu Jul 5 16:29:48 2018 +0000
Updated excludes
See:
https://ci.apache.org/projects/openoffice/rat-output.html
diff --git a/rat-excludes b/rat-excludes
index d9ac3d17c2db..0eed4454d789 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -513,8 +513,8 @@ main/testautomation/writer/optional/input/export/filter/*.w95
# part of SGA
# patch files
-main/redland/raptor/raptor-1.4.18.patch.win32
-main/redland/rasqal/rasqal-0.9.16.patch.win32
+main/redland/raptor/raptor2-2.0.15.patch.win32
+main/redland/rasqal/rasqal-0.9.33.patch.win32
main/redland/redland/redland-1.0.17.patch.win32
# (1000+), part of SGA
@@ -851,8 +851,8 @@ main/qadevOOo/testdocs/backend/org/openoffice/manifest
main/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/manifest
main/qadevOOo/testdocs/qadevlibs/source/test/manifest
main/rat-excludes
-main/redland/raptor/raptor-1.4.18.patch.os2
-main/redland/rasqal/rasqal-0.9.16.patch.os2
+main/redland/raptor/raptor2-2.0.15.patch.os2
+main/redland/rasqal/rasqal-0.9.33.patch.os2
main/redland/redland/redland-1.0.17.patch.os2
main/reportbuilder/java/com/sun/star/report/pentaho/parser/style-mapping.txt
main/reportbuilder/template/delzip
@@ -1074,8 +1074,8 @@ main/setup_native/source/packinfo/package_names.txt
main/officecfg/registry/schema/oo-common.conf
main/icu/createmak.cfg
main/icu/createmakWin64.cfg
-main/redland/raptor/raptor-1.4.18.patch.ooo_build
-main/redland/rasqal/rasqal-0.9.16.patch.ooo_build
+main/redland/raptor/raptor2-2.0.15.patch.ooo_build
+main/redland/rasqal/rasqal-0.9.33.patch.ooo_build
main/redland/redland/redland-1.0.17.patch.ooo_build
main/binfilter/bf_sfx2/util/makefile.prj
main/testautomation/spreadsheet/optional/input/loadsave/microsoft/dif.DIF
More information about the Libreoffice-commits
mailing list