desktop/source/pagein/makefile.mk | 5 - odk/setsdkenv_unix.sh.in | 10 +- odk/settings/settings.mk | 34 +++---- sal/prj/d.lst | 4 solenv/gbuild/platform/macosx.mk | 9 +- solenv/inc/libs.mk | 13 +- sw/source/ui/frmdlg/column.src | 170 +++++++++++++++++++------------------- 7 files changed, 121 insertions(+), 124 deletions(-)
New commits: commit 4c184a25474995d41296f1c59eef364b3c710842 Author: Jim Jagielski <[email protected]> Date: Thu Jul 12 18:50:38 2018 +0000 Update targets for macOS diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk index e4588785cd6a..fdf2988001fa 100644 --- a/desktop/source/pagein/makefile.mk +++ b/desktop/source/pagein/makefile.mk @@ -63,13 +63,8 @@ ALL: \ .INCLUDE : target.mk ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) -.IF "$(OS)" == "MACOSX" -UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST) -UNODLLPOST=.uno$(DLLPOST) -.ELSE UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR) UNODLLPOST=.uno$(DLLPOST) -.ENDIF DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default URELIBPATH=..$/ure-link$/lib diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 7b3a39874ef0..5a7fa6382f64 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -293,15 +293,15 @@ then if [ "${OFFICE_HOME}" ] then mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}" \ + ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" fi diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 276fa3091b2a..f22d2d1eedb2 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -436,23 +436,23 @@ URLPREFIX=file:// # Include UDK version numbers include $(PRJ)/include/udkversion.mk -SALLIB=-luno_sal3 -CPPULIB=-luno_cppu3 -CPPUHELPERLIB=-luno_cppuhelper3$(COMID) -SALHELPERLIB=-luno_salhelper3$(COMID) -REGLIB=-lreg3 -STORELIB=-lstore3 - -SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib' -CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib' -CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' -SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib' -REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' -STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib' - -INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno3_sal.dylib @executable_path/libuno_sal3.dylib -change @__________________________________________________URELIB/libuno_cppu3.dylib @executable_path/libuno_cppu3.dylib -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib @executable_path/libuno_cppuhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib @executable_path/libuno_salhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libreg3.dylib @executable_path/libreg3.dylib -change @__________________________________________________URELIB/libstore3.dylib @executable_path/libstore3.dylib - -INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal3.dylib libuno_sal3.dylib -change @__________________________________________________URELIB/libuno_cppu3.dylib libuno_cppu3.dylib -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib libuno_cppuhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib libuno_salhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libreg3.dylib libreg3.dylib -change @__________________________________________________URELIB/libstore3.dylib libstore3.dylib +SALLIB=-luno_sal +CPPULIB=-luno_cppu +CPPUHELPERLIB=-luno_cppuhelper$(COMID) +SALHELPERLIB=-luno_salhelper$(COMID) +REGLIB=-lreg +STORELIB=-lstore + +SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib' +CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib' +CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' +SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib' +REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' +STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib' + +INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3 + +INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 EMPTYSTRING= PATH_SEPARATOR=: diff --git a/sal/prj/d.lst b/sal/prj/d.lst index 404ce2337609..0a22cda9676d 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -18,8 +18,8 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32 symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so ..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3 symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so -..\%__SRC%\lib\libuno_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal3.dylib -symlink: %_DEST%\lib%_EXT%\libuno_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal.dylib +..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3 +symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 2f237f54d99a..3b2fbcb6650f 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -294,7 +294,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ $(LIBS) \ - -o $(if $(call gb_Library_is_udk_versioned,$(1)),$(patsubst %.dylib,%$(gb_UDK_MAJOR).dylib,$(1)),$(1)) \ + -o $(if $(call gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \ `cat $${DYLIB_FILE}` && \ $(if $(filter Library,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \ @@ -305,7 +305,7 @@ 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) && ln -s $(patsubst %.dylib,%$(gb_UDK_MAJOR).dylib,$(notdir $(1))) $(1))) + rm -f $(1) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR) $(1))) endef # parameters: 1-linktarget 2-cobjects 3-cxxobjects @@ -380,6 +380,11 @@ endef define gb_Library_Library_platform $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1)) $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1)) +ifneq (,$(call gb_Library_is_udk_versioned,$(call gb_Library_get_target,$(1)))) +$(call gb_Library_get_target,$(1)) \ +$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ + $(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR) +endif endef diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index e90eea9dd8b0..153e2eabd3e5 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -21,7 +21,7 @@ LIBSMKREV!:="$$Revision$$" -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC" || "$(OS)"=="MACOSX") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") # #externe libs in plattform.mk @@ -98,7 +98,7 @@ OPENSSLLIBST=-lssl_static -lcrypto_static OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC) .ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(SYSTEM_OPENSSL)" == "YES" -.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX" +.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" REGLIB=-lreg$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" REGLIB=-lreg @@ -109,9 +109,6 @@ XMLOFFLLIB=-lxol .IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" STORELIB=-lstore$(UDK_MAJOR) SALLIB=-lsal$(UDK_MAJOR) -.ELIF "$(OS)"=="MACOSX" -STORELIB=-lstore$(UDK_MAJOR) -SALLIB=-luno_sal$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" STORELIB=-lstore SALLIB=-luno_sal @@ -120,7 +117,7 @@ SALLIB=-luno_sal ODBCLIB=-lodbc$(DLLPOSTFIX) ODBCBASELIB=-lodbcbase$(DLLPOSTFIX) DBFILELIB=-lfile$(DLLPOSTFIX) -.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX" +.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" RMCXTLIB=-lrmcxt$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" RMCXTLIB=-lrmcxt @@ -273,7 +270,7 @@ ISCLIB=-lsc$(DLLPOSTFIX) ISDLIB=-lsd$(DLLPOSTFIX) PKGCHKLIB=-lpkgchk$(DLLPOSTFIX) HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX) -.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX" +.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) .ELSE # "$(GUI)$(COM)"=="WNTGCC" JVMACCESSLIB = -ljvmaccess$(COMID) @@ -286,7 +283,7 @@ XSLTLIB=$(LIBXSLT_LIBS) .ELSE XSLTLIB=-lxslt $(LIBXML2LIB) .ENDIF -.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX" +.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" JVMFWKLIB = -ljvmfwk$(UDK_MAJOR) .ELSE # "$(GUI)$(COM)"=="WNTGCC" JVMFWKLIB = -ljvmfwk commit 7d05182426f3e819aa306f6006e0004e3774817a Author: Matthias Seidel <[email protected]> Date: Thu Jul 12 18:33:06 2018 +0000 Cleaned up dialog for Columns, increased the height a bit diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index 3c8a2c01f736..a7bde6116e5a 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -28,17 +28,17 @@ #include "helpid.h" #include "access.hrc" - // #define TP_COLUMN 256 +// #define TP_COLUMN 256 TabPage TP_COLUMN { HelpID = HID_COLUMN ; Hide = TRUE; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( 260, 188 ) ; Text [ en-US ] = "Columns" ; FixedText FT_NUMBER { - Pos = MAP_APPFONT ( 12 , 19 ) ; - Size = MAP_APPFONT ( 28 , 8 ) ; + Pos = MAP_APPFONT ( 12, 19 ) ; + Size = MAP_APPFONT ( 28, 8 ) ; Left = TRUE ; Text [ en-US ] = "Columns"; }; @@ -46,8 +46,8 @@ TabPage TP_COLUMN { HelpID = "sw:NumericField:TP_COLUMN:ED_NUMBER"; Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 30 ) ; - Size = MAP_APPFONT ( 24 , 12 ) ; + Pos = MAP_APPFONT ( 12, 30 ) ; + Size = MAP_APPFONT ( 24, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -61,63 +61,63 @@ TabPage TP_COLUMN }; Control VS_DEFAULTS { - Pos = MAP_APPFONT ( 50 , 14 ) ; - Size = MAP_APPFONT ( 110 , 28 ) ; + Pos = MAP_APPFONT ( 50, 14 ) ; + Size = MAP_APPFONT ( 110, 28 ) ; TabStop = TRUE ; }; CheckBox CB_BALANCECOLS { HelpID = "sw:CheckBox:TP_COLUMN:CB_BALANCECOLS"; - Pos = MAP_APPFONT ( 7 , 46 ) ; - Size = MAP_APPFONT ( 163 , 10 ) ; + Pos = MAP_APPFONT ( 7, 46 ) ; + Size = MAP_APPFONT ( 163, 10 ) ; Hide = TRUE; Text [ en-US ] = "Evenly distribute contents ~to all columns"; }; FixedLine FL_COLUMNS { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 164 , 8 ) ; + Pos = MAP_APPFONT ( 6, 3 ) ; + Size = MAP_APPFONT ( 164, 8 ) ; Text [ en-US ] = "Settings"; }; FixedText FT_COLUMN { - Pos = MAP_APPFONT ( 12 , 70 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; + Pos = MAP_APPFONT ( 12, 70 ) ; + Size = MAP_APPFONT ( 50, 8 ) ; Left = TRUE ; Text [ en-US ] = "Column"; }; Window WN_BSP { - Pos = MAP_APPFONT ( 176 , 6 ) ; - Size = MAP_APPFONT ( 75 , 46 ) ; + Pos = MAP_APPFONT ( 176, 6 ) ; + Size = MAP_APPFONT ( 75, 46 ) ; }; ImageButton BTN_DOWN { HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN"; Disable = TRUE ; - Pos = MAP_APPFONT ( 62 , 69 ) ; - Size = MAP_APPFONT ( 10 , 10 ) ; + Pos = MAP_APPFONT ( 62, 69 ) ; + Size = MAP_APPFONT ( 10, 10 ) ; TabStop = TRUE ; SYMBOL = IMAGEBUTTON_ARROW_LEFT ; }; FixedText FT_1 { - Pos = MAP_APPFONT ( 100 , 71 ) ; - Size = MAP_APPFONT ( 10 , 8 ) ; + Pos = MAP_APPFONT ( 100, 71 ) ; + Size = MAP_APPFONT ( 10, 8 ) ; Text = "~1" ; Center = TRUE ; }; FixedText FT_2 { - Pos = MAP_APPFONT ( 150 , 71 ) ; - Size = MAP_APPFONT ( 10 , 8 ) ; + Pos = MAP_APPFONT ( 150, 71 ) ; + Size = MAP_APPFONT ( 10, 8 ) ; Text = "~2" ; Center = TRUE ; }; FixedText FT_3 { - Pos = MAP_APPFONT ( 200 , 71 ) ; - Size = MAP_APPFONT ( 10 , 8 ) ; + Pos = MAP_APPFONT ( 200, 71 ) ; + Size = MAP_APPFONT ( 10, 8 ) ; Text = "~3" ; Center = TRUE ; }; @@ -125,15 +125,15 @@ TabPage TP_COLUMN { HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP"; Disable = TRUE ; - Pos = MAP_APPFONT ( 238 , 69 ) ; - Size = MAP_APPFONT ( 10 , 10 ) ; + Pos = MAP_APPFONT ( 238, 69 ) ; + Size = MAP_APPFONT ( 10, 10 ) ; TabStop = TRUE ; SYMBOL = IMAGEBUTTON_ARROW_RIGHT ; }; FixedText FT_WIDTH { - Pos = MAP_APPFONT ( 12 , 85 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; + Pos = MAP_APPFONT ( 12, 85 ) ; + Size = MAP_APPFONT ( 50, 8 ) ; Left = TRUE ; Text [ en-US ] = "Width" ; }; @@ -142,8 +142,8 @@ TabPage TP_COLUMN HelpID = "sw:MetricField:TP_COLUMN:ED_1"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 87 , 83 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 87, 83 ) ; + Size = MAP_APPFONT ( 36, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -161,8 +161,8 @@ TabPage TP_COLUMN HelpID = "sw:MetricField:TP_COLUMN:ED_2"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 137 , 83 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 137, 83 ) ; + Size = MAP_APPFONT ( 36, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -180,8 +180,8 @@ TabPage TP_COLUMN HelpID = "sw:MetricField:TP_COLUMN:ED_3"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 187 , 83 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 187, 83 ) ; + Size = MAP_APPFONT ( 36, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -196,8 +196,8 @@ TabPage TP_COLUMN }; FixedText FT_DIST { - Pos = MAP_APPFONT ( 12 , 101 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; + Pos = MAP_APPFONT ( 12, 101 ) ; + Size = MAP_APPFONT ( 50, 8 ) ; Left = TRUE ; Text [ en-US ] = "Spacing" ; }; @@ -206,8 +206,8 @@ TabPage TP_COLUMN HelpID = "sw:MetricField:TP_COLUMN:ED_DIST1"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 112 , 99 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 112, 99 ) ; + Size = MAP_APPFONT ( 36, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -225,8 +225,8 @@ TabPage TP_COLUMN HelpID = "sw:MetricField:TP_COLUMN:ED_DIST2"; Disable = TRUE ; Border = TRUE ; - Pos = MAP_APPFONT ( 162 , 99 ) ; - Size = MAP_APPFONT ( 36 , 12 ) ; + Pos = MAP_APPFONT ( 162, 99 ) ; + Size = MAP_APPFONT ( 36, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -242,30 +242,30 @@ TabPage TP_COLUMN CheckBox CB_AUTO_WIDTH { HelpID = "sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH"; - Pos = MAP_APPFONT ( 87 , 115 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; + Pos = MAP_APPFONT ( 87, 115 ) ; + Size = MAP_APPFONT ( 100, 10 ) ; Text [ en-US ] = "Auto~Width" ; TabStop = TRUE ; }; FixedLine FL_LAYOUT { - Pos = MAP_APPFONT ( 6 , 58 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; + Pos = MAP_APPFONT ( 6, 58 ) ; + Size = MAP_APPFONT ( 248, 8 ) ; Text [ en-US ] = "Width and spacing"; }; FixedText FT_STYLE { - Pos = MAP_APPFONT ( 12 , 140 ) ; - Size = MAP_APPFONT ( 35 , 8 ) ; + Pos = MAP_APPFONT ( 12, 140 ) ; + Size = MAP_APPFONT ( 35, 8 ) ; Text [ en-US ] = "~Line" ; Left = TRUE ; }; ListBox LB_STYLE { HelpID = "sw:ListBox:TP_COLUMN:LB_STYLE"; - Pos = MAP_APPFONT ( 50 , 138 ) ; - Size = MAP_APPFONT ( 60 , 66 ) ; + Pos = MAP_APPFONT ( 50, 138 ) ; + Size = MAP_APPFONT ( 60, 66 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList [ en-US ] = @@ -275,8 +275,8 @@ TabPage TP_COLUMN }; FixedText FT_HEIGHT { - Pos = MAP_APPFONT ( 12 , 156 ) ; - Size = MAP_APPFONT ( 35 , 8 ) ; + Pos = MAP_APPFONT ( 12, 156 ) ; + Size = MAP_APPFONT ( 35, 8 ) ; Text [ en-US ] = "H~eight" ; Left = TRUE ; }; @@ -284,8 +284,8 @@ TabPage TP_COLUMN { HelpID = "sw:MetricField:TP_COLUMN:ED_HEIGHT"; Border = TRUE ; - Pos = MAP_APPFONT ( 50 , 154 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; + Pos = MAP_APPFONT ( 50, 154 ) ; + Size = MAP_APPFONT ( 60, 12 ) ; TabStop = TRUE ; Left = TRUE ; Repeat = TRUE ; @@ -299,16 +299,16 @@ TabPage TP_COLUMN }; FixedText FT_POSITION { - Pos = MAP_APPFONT ( 12 , 172 ) ; - Size = MAP_APPFONT ( 35 , 8 ) ; + Pos = MAP_APPFONT ( 12, 172 ) ; + Size = MAP_APPFONT ( 35, 8 ) ; Left = TRUE ; Text [ en-US ] = "~Position" ; }; ListBox LB_POSITION { HelpID = "sw:ListBox:TP_COLUMN:LB_POSITION"; - Pos = MAP_APPFONT ( 50 , 170 ) ; - Size = MAP_APPFONT ( 60 , 40 ) ; + Pos = MAP_APPFONT ( 50, 170 ) ; + Size = MAP_APPFONT ( 60, 40 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList [ en-US ] = @@ -320,42 +320,42 @@ TabPage TP_COLUMN }; FixedLine FL_LINETYPE { - Pos = MAP_APPFONT ( 6 , 127 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; + Pos = MAP_APPFONT ( 6, 127 ) ; + Size = MAP_APPFONT ( 248, 8 ) ; Text [ en-US ] = "Separator line" ; }; - FixedLine FL_VERT + FixedLine FL_VERT { - Pos = MAP_APPFONT ( 116 , 138 ) ; - Size = MAP_APPFONT ( 4 , 43 ) ; + Pos = MAP_APPFONT ( 116, 138 ) ; + Size = MAP_APPFONT ( 4, 43 ) ; Hide = TRUE ; Vert = TRUE; }; - FixedLine FL_PROPERTIES + FixedLine FL_PROPERTIES { - Pos = MAP_APPFONT ( 121 , 127 ) ; - Size = MAP_APPFONT ( 133 , 8 ) ; + Pos = MAP_APPFONT ( 121, 127 ) ; + Size = MAP_APPFONT ( 133, 8 ) ; Hide = TRUE ; Text [ en-US ] = "Properties"; }; - FixedText FT_TEXTDIRECTION + FixedText FT_TEXTDIRECTION { - Pos = MAP_APPFONT ( 127 , 138 ) ; - Size = MAP_APPFONT ( 127 , 8 ) ; + Pos = MAP_APPFONT ( 127, 138 ) ; + Size = MAP_APPFONT ( 127, 8 ) ; Hide = TRUE ; Text [ en-US ] = "Text ~direction"; }; - ListBox LB_TEXTDIRECTION + ListBox LB_TEXTDIRECTION { HelpID = "sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION"; Border = TRUE ; - Pos = MAP_APPFONT ( 127 , 149 ) ; - Size = MAP_APPFONT ( 127 , 50 ) ; + Pos = MAP_APPFONT ( 127, 149 ) ; + Size = MAP_APPFONT ( 127, 50 ) ; DropDown = TRUE ; Hide = TRUE ; StringList [ en-US ] = { - < "Left-to-right" ; 0; > ; + < "Left-to-right" ; 0; > ; < "Right-to-left" ; 1; > ; < "Use superordinate object settings" ; 4; > ; }; @@ -367,47 +367,47 @@ ModalDialog DLG_COLUMN HelpID = HID_FORMAT_COLUMN; Hide = TRUE; Moveable = TRUE; - Size = MAP_APPFONT ( 316 , 135 ) ; + Size = MAP_APPFONT ( 316, 135 ) ; OKButton PB_OK { DefButton = TRUE ; - Pos = MAP_APPFONT ( 260 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 260, 6 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( 260 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 260, 23 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; HelpButton PB_HELP { - Pos = MAP_APPFONT ( 260 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 260, 43 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; FixedText FT_APPLY_TO { - Pos = MAP_APPFONT ( 260 , 63 ) ; - Size = MAP_APPFONT ( 50 , 8 ) ; + Pos = MAP_APPFONT ( 260, 63 ) ; + Size = MAP_APPFONT ( 50, 8 ) ; Left = TRUE ; Text [ en-US ] = "~Apply to"; }; ListBox LB_APPLY_TO { HelpID = "sw:ListBox:DLG_COLUMN:LB_APPLY_TO"; - Pos = MAP_APPFONT ( 260 , 74 ) ; - Size = MAP_APPFONT ( 50 , 66 ) ; + Pos = MAP_APPFONT ( 260, 74 ) ; + Size = MAP_APPFONT ( 50, 66 ) ; TabStop = TRUE ; DropDown = TRUE ; StringList [ en-US ] = { - < "Selection" ; LISTBOX_SELECTION; > ; + < "Selection" ; LISTBOX_SELECTION ; > ; < "Current Section" ; LISTBOX_SECTION ; > ; < "Selected section" ; LISTBOX_SECTIONS ; > ; - < "Frame" ; LISTBOX_FRAME ; > ; - < "Page Style: " ; LISTBOX_PAGE ; > ; + < "Frame" ; LISTBOX_FRAME ; > ; + < "Page Style: " ; LISTBOX_PAGE ; > ; }; }; Text [ en-US ] = "Columns"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
