openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1842277 - /openoffice/trunk/main/vcl/
Date Fri, 28 Sep 2018 18:18:47 GMT
Author: mseidel
Date: Fri Sep 28 18:18:47 2018
New Revision: 1842277

URL: http://svn.apache.org/viewvc?rev=1842277&view=rev
Log:
Minor cleanup according to vim modeline

Modified:
    openoffice/trunk/main/vcl/AllLangResTarget_vcl.mk
    openoffice/trunk/main/vcl/Library_desktop_detector.mk
    openoffice/trunk/main/vcl/Library_vcl.mk
    openoffice/trunk/main/vcl/Library_vclplug_gen.mk
    openoffice/trunk/main/vcl/Library_vclplug_gtk.mk
    openoffice/trunk/main/vcl/Library_vclplug_kde.mk
    openoffice/trunk/main/vcl/Library_vclplug_kde4.mk
    openoffice/trunk/main/vcl/Library_vclplug_svp.mk
    openoffice/trunk/main/vcl/Module_vcl.mk
    openoffice/trunk/main/vcl/Package_inc.mk
    openoffice/trunk/main/vcl/Package_osx.mk
    openoffice/trunk/main/vcl/WinResTarget_vcl.mk

Modified: openoffice/trunk/main/vcl/AllLangResTarget_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/AllLangResTarget_vcl.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/AllLangResTarget_vcl.mk (original)
+++ openoffice/trunk/main/vcl/AllLangResTarget_vcl.mk Fri Sep 28 18:18:47 2018
@@ -32,20 +32,19 @@ $(eval $(call gb_AllLangResTarget_add_sr
 $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
 
 $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
-        $$(INCLUDE) \
-        -I$(SRCDIR)/vcl/inc \
+		$$(INCLUDE) \
+		-I$(SRCDIR)/vcl/inc \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
-    vcl/source/src/btntext.src \
-    vcl/source/src/helptext.src \
-    vcl/source/src/images.src \
-    vcl/source/src/menu.src \
-    vcl/source/src/print.src \
-    vcl/source/src/stdtext.src \
-    vcl/source/src/throbber.src \
-    vcl/source/src/units.src \
+	vcl/source/src/btntext.src \
+	vcl/source/src/helptext.src \
+	vcl/source/src/images.src \
+	vcl/source/src/menu.src \
+	vcl/source/src/print.src \
+	vcl/source/src/stdtext.src \
+	vcl/source/src/throbber.src \
+	vcl/source/src/units.src \
 ))
 
-
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_desktop_detector.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_desktop_detector.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_desktop_detector.mk (original)
+++ openoffice/trunk/main/vcl/Library_desktop_detector.mk Fri Sep 28 18:18:47 2018
@@ -42,31 +42,31 @@ $(eval $(call gb_Library_set_include,des
 ))
 
 $(eval $(call gb_Library_add_defs,desktop_detector,\
-    -DDESKTOP_DETECTOR_IMPLEMENTATION \
+	-DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
-    $(gb_STDLIBS) \
+	X11 \
+	Xext \
+	SM \
+	ICE \
+	$(gb_STDLIBS) \
 ))
 
 $(call gb_Library_use_externals,desktop_detector,\
@@ -75,7 +75,7 @@ $(call gb_Library_use_externals,desktop_
 )
 
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
-    vcl/unx/generic/desktopdetect/desktopdetector \
+	vcl/unx/generic/desktopdetect/desktopdetector \
 ))
 
 ifeq ($(OS),LINUX)
@@ -85,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs
 	pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Fri Sep 28 18:18:47 2018
@@ -57,28 +57,28 @@ endif
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_set_include,vcl,\
 	$$(INCLUDE) \
-     $$(FREETYPE_CFLAGS) \
+	$$(FREETYPE_CFLAGS) \
 ))
 endif
 
 $(eval $(call gb_Library_add_defs,vcl,\
 	-DVCL_DLLIMPLEMENTATION \
-    -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
-    -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT))
\
+	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
+	-DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT))
\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vcl,\
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
@@ -93,29 +93,29 @@ $(call gb_Library_use_externals,vcl,\
 
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
-    freetype \
+	freetype \
 ))
 endif
 
 ifeq ($(GUIBASE),os2)
 # YD FIXME this is not working... needs ldflags hack...
 $(eval $(call gb_Library_add_libs,vcl,\
-    -lft2lib \
+	-lft2lib \
 ))
 
 endif
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_ldflags,vcl,\
-    $$(LDFLAGS) \
+	$$(LDFLAGS) \
 ))
 endif
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
-    $(gb_OBJCXXFLAGS) \
+	$$(CXXFLAGS) \
+	$$(OBJCXXFLAGS) \
+	$(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
 $(eval $(call gb_Library_add_defs,vcl,\
@@ -123,130 +123,130 @@ $(eval $(call gb_Library_add_defs,vcl,\
 ))
 endif
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
-    vcl/aqua/source/a11y/aqua11yactionwrapper \
-    vcl/aqua/source/a11y/aqua11ycomponentwrapper \
-    vcl/aqua/source/a11y/aqua11yfactory \
-    vcl/aqua/source/a11y/aqua11yrolehelper \
-    vcl/aqua/source/a11y/aqua11yselectionwrapper \
-    vcl/aqua/source/a11y/aqua11ytablewrapper \
-    vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
-    vcl/aqua/source/a11y/aqua11ytextwrapper \
-    vcl/aqua/source/a11y/aqua11yutil \
-    vcl/aqua/source/a11y/aqua11yvaluewrapper \
-    vcl/aqua/source/a11y/aqua11ywrapper \
-    vcl/aqua/source/a11y/aqua11ywrapperbutton \
-    vcl/aqua/source/a11y/aqua11ywrappercheckbox \
-    vcl/aqua/source/a11y/aqua11ywrappercombobox \
-    vcl/aqua/source/a11y/aqua11ywrappergroup \
-    vcl/aqua/source/a11y/aqua11ywrapperlist \
-    vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
-    vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
-    vcl/aqua/source/a11y/aqua11ywrapperrow \
-    vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
-    vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
-    vcl/aqua/source/a11y/aqua11ywrappersplitter \
-    vcl/aqua/source/a11y/aqua11ywrapperstatictext \
-    vcl/aqua/source/a11y/aqua11ywrappertabgroup \
-    vcl/aqua/source/a11y/aqua11ywrappertextarea \
-    vcl/aqua/source/a11y/aqua11ywrappertoolbar \
-    vcl/aqua/source/app/salnstimer \
-    vcl/aqua/source/app/vclnsapp \
-    vcl/aqua/source/gdi/aquaprintaccessoryview \
-    vcl/aqua/source/gdi/aquaprintview \
-    vcl/aqua/source/window/salframeview \
-    vcl/aqua/source/window/salnsmenu \
+	vcl/aqua/source/a11y/aqua11yactionwrapper \
+	vcl/aqua/source/a11y/aqua11ycomponentwrapper \
+	vcl/aqua/source/a11y/aqua11yfactory \
+	vcl/aqua/source/a11y/aqua11yrolehelper \
+	vcl/aqua/source/a11y/aqua11yselectionwrapper \
+	vcl/aqua/source/a11y/aqua11ytablewrapper \
+	vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
+	vcl/aqua/source/a11y/aqua11ytextwrapper \
+	vcl/aqua/source/a11y/aqua11yutil \
+	vcl/aqua/source/a11y/aqua11yvaluewrapper \
+	vcl/aqua/source/a11y/aqua11ywrapper \
+	vcl/aqua/source/a11y/aqua11ywrapperbutton \
+	vcl/aqua/source/a11y/aqua11ywrappercheckbox \
+	vcl/aqua/source/a11y/aqua11ywrappercombobox \
+	vcl/aqua/source/a11y/aqua11ywrappergroup \
+	vcl/aqua/source/a11y/aqua11ywrapperlist \
+	vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
+	vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
+	vcl/aqua/source/a11y/aqua11ywrapperrow \
+	vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
+	vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
+	vcl/aqua/source/a11y/aqua11ywrappersplitter \
+	vcl/aqua/source/a11y/aqua11ywrapperstatictext \
+	vcl/aqua/source/a11y/aqua11ywrappertabgroup \
+	vcl/aqua/source/a11y/aqua11ywrappertextarea \
+	vcl/aqua/source/a11y/aqua11ywrappertoolbar \
+	vcl/aqua/source/app/salnstimer \
+	vcl/aqua/source/app/vclnsapp \
+	vcl/aqua/source/gdi/aquaprintaccessoryview \
+	vcl/aqua/source/gdi/aquaprintview \
+	vcl/aqua/source/window/salframeview \
+	vcl/aqua/source/window/salnsmenu \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/aqua/source/a11y/aqua11yfocuslistener \
-    vcl/aqua/source/a11y/aqua11yfocustracker \
-    vcl/aqua/source/a11y/aqua11ylistener \
-    vcl/aqua/source/a11y/documentfocuslistener \
-    vcl/aqua/source/app/saldata \
-    vcl/aqua/source/app/salinst \
-    vcl/aqua/source/app/salsys \
-    vcl/aqua/source/app/saltimer \
-    vcl/aqua/source/dtrans/DataFlavorMapping \
-    vcl/aqua/source/dtrans/DragActionConversion \
-    vcl/aqua/source/dtrans/DragSource \
-    vcl/aqua/source/dtrans/DragSourceContext \
-    vcl/aqua/source/dtrans/DropTarget \
-    vcl/aqua/source/dtrans/HtmlFmtFlt \
-    vcl/aqua/source/dtrans/OSXTransferable \
-    vcl/aqua/source/dtrans/PictToBmpFlt \
-    vcl/aqua/source/dtrans/aqua_clipboard \
-    vcl/aqua/source/dtrans/service_entry \
-    vcl/aqua/source/gdi/ctfonts \
-    vcl/aqua/source/gdi/ctlayout \
-    vcl/aqua/source/gdi/salbmp \
-    vcl/aqua/source/gdi/salcolorutils \
-    vcl/aqua/source/gdi/salgdi \
-    vcl/aqua/source/gdi/salgdiutils \
-    vcl/aqua/source/gdi/salmathutils \
-    vcl/aqua/source/gdi/salnativewidgets \
-    vcl/aqua/source/gdi/salprn \
-    vcl/aqua/source/gdi/salvd \
-    vcl/aqua/source/window/salframe \
-    vcl/aqua/source/window/salmenu \
-    vcl/aqua/source/window/salobj \
+	vcl/aqua/source/a11y/aqua11yfocuslistener \
+	vcl/aqua/source/a11y/aqua11yfocustracker \
+	vcl/aqua/source/a11y/aqua11ylistener \
+	vcl/aqua/source/a11y/documentfocuslistener \
+	vcl/aqua/source/app/saldata \
+	vcl/aqua/source/app/salinst \
+	vcl/aqua/source/app/salsys \
+	vcl/aqua/source/app/saltimer \
+	vcl/aqua/source/dtrans/DataFlavorMapping \
+	vcl/aqua/source/dtrans/DragActionConversion \
+	vcl/aqua/source/dtrans/DragSource \
+	vcl/aqua/source/dtrans/DragSourceContext \
+	vcl/aqua/source/dtrans/DropTarget \
+	vcl/aqua/source/dtrans/HtmlFmtFlt \
+	vcl/aqua/source/dtrans/OSXTransferable \
+	vcl/aqua/source/dtrans/PictToBmpFlt \
+	vcl/aqua/source/dtrans/aqua_clipboard \
+	vcl/aqua/source/dtrans/service_entry \
+	vcl/aqua/source/gdi/ctfonts \
+	vcl/aqua/source/gdi/ctlayout \
+	vcl/aqua/source/gdi/salbmp \
+	vcl/aqua/source/gdi/salcolorutils \
+	vcl/aqua/source/gdi/salgdi \
+	vcl/aqua/source/gdi/salgdiutils \
+	vcl/aqua/source/gdi/salmathutils \
+	vcl/aqua/source/gdi/salnativewidgets \
+	vcl/aqua/source/gdi/salprn \
+	vcl/aqua/source/gdi/salvd \
+	vcl/aqua/source/window/salframe \
+	vcl/aqua/source/window/salmenu \
+	vcl/aqua/source/window/salobj \
 ))
 endif
 
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_defs,vcl,\
-    -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-    -DSAL_DLLPOSTFIX=\"\" \
-    -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+	-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
+	-DSAL_DLLPOSTFIX=\"\" \
+	-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 ## handle fontconfig
 ifeq ($(ENABLE_FONTCONFIG),TRUE)
 $(eval $(call gb_Library_add_defs,vcl,\
-    -DENABLE_FONTCONFIG \
+	-DENABLE_FONTCONFIG \
 ))
 ## handle CUPS
 ifeq ($(ENABLE_CUPS),TRUE)
 $(eval $(call gb_Library_add_defs,vcl,\
-    -DENABLE_CUPS \
+	-DENABLE_CUPS \
 ))
 endif
 endif
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/glyphs/gcach_ftyp \
-    vcl/source/glyphs/gcach_layout \
-    vcl/source/glyphs/gcach_rbmp \
-    vcl/source/glyphs/glyphcache \
-    vcl/unx/generic/fontmanager/fontcache \
-    vcl/unx/generic/fontmanager/fontconfig \
-    vcl/unx/generic/fontmanager/fontmanager \
-    vcl/unx/generic/fontmanager/helper \
-    vcl/unx/generic/fontmanager/parseAFM \
+	vcl/source/glyphs/gcach_ftyp \
+	vcl/source/glyphs/gcach_layout \
+	vcl/source/glyphs/gcach_rbmp \
+	vcl/source/glyphs/glyphcache \
+	vcl/unx/generic/fontmanager/fontcache \
+	vcl/unx/generic/fontmanager/fontconfig \
+	vcl/unx/generic/fontmanager/fontmanager \
+	vcl/unx/generic/fontmanager/helper \
+	vcl/unx/generic/fontmanager/parseAFM \
 	vcl/unx/generic/plugadapt/salplug \
-    vcl/unx/generic/printer/cupsmgr \
-    vcl/unx/generic/printer/jobdata \
-    vcl/unx/generic/printer/ppdparser \
-    vcl/unx/generic/printer/printerinfomanager \
+	vcl/unx/generic/printer/cupsmgr \
+	vcl/unx/generic/printer/jobdata \
+	vcl/unx/generic/printer/ppdparser \
+	vcl/unx/generic/printer/printerinfomanager \
 ))
 endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/win/source/app/saldata \
-    vcl/win/source/app/salinfo \
-    vcl/win/source/app/salinst \
-    vcl/win/source/app/salshl \
-    vcl/win/source/app/saltimer \
-    vcl/win/source/gdi/salbmp \
-    vcl/win/source/gdi/salgdi \
-    vcl/win/source/gdi/salgdi2 \
-    vcl/win/source/gdi/salgdi3 \
-    vcl/win/source/gdi/salgdi_gdiplus \
-    vcl/win/source/gdi/salnativewidgets-luna \
-    vcl/win/source/gdi/salprn \
-    vcl/win/source/gdi/salvd \
-    vcl/win/source/gdi/winlayout \
-    vcl/win/source/gdi/wntgdi \
-    vcl/win/source/window/salframe \
-    vcl/win/source/window/salmenu \
-    vcl/win/source/window/salobj \
+	vcl/win/source/app/saldata \
+	vcl/win/source/app/salinfo \
+	vcl/win/source/app/salinst \
+	vcl/win/source/app/salshl \
+	vcl/win/source/app/saltimer \
+	vcl/win/source/gdi/salbmp \
+	vcl/win/source/gdi/salgdi \
+	vcl/win/source/gdi/salgdi2 \
+	vcl/win/source/gdi/salgdi3 \
+	vcl/win/source/gdi/salgdi_gdiplus \
+	vcl/win/source/gdi/salnativewidgets-luna \
+	vcl/win/source/gdi/salprn \
+	vcl/win/source/gdi/salvd \
+	vcl/win/source/gdi/winlayout \
+	vcl/win/source/gdi/wntgdi \
+	vcl/win/source/window/salframe \
+	vcl/win/source/window/salmenu \
+	vcl/win/source/window/salobj \
 ))
 
 $(eval $(call gb_Library_add_nativeres,vcl,src))
@@ -255,21 +255,21 @@ endif
 
 ifeq ($(OS),OS2)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/os2/source/app/salinfo \
-    vcl/os2/source/app/salinst \
-    vcl/os2/source/app/sallang \
-    vcl/os2/source/app/salshl \
-    vcl/os2/source/app/saltimer \
-    vcl/os2/source/gdi/salbmp \
-    vcl/os2/source/gdi/salgdi \
-    vcl/os2/source/gdi/salgdi2 \
-    vcl/os2/source/gdi/salgdi3 \
-    vcl/os2/source/gdi/salprn \
-    vcl/os2/source/gdi/salvd \
-    vcl/os2/source/gdi/os2layout \
-    vcl/os2/source/window/salframe \
-    vcl/os2/source/window/salmenu \
-    vcl/os2/source/window/salobj \
+	vcl/os2/source/app/salinfo \
+	vcl/os2/source/app/salinst \
+	vcl/os2/source/app/sallang \
+	vcl/os2/source/app/salshl \
+	vcl/os2/source/app/saltimer \
+	vcl/os2/source/gdi/salbmp \
+	vcl/os2/source/gdi/salgdi \
+	vcl/os2/source/gdi/salgdi2 \
+	vcl/os2/source/gdi/salgdi3 \
+	vcl/os2/source/gdi/salprn \
+	vcl/os2/source/gdi/salvd \
+	vcl/os2/source/gdi/os2layout \
+	vcl/os2/source/window/salframe \
+	vcl/os2/source/window/salmenu \
+	vcl/os2/source/window/salobj \
 ))
 
 $(eval $(call gb_Library_add_nativeres,vcl,src))
@@ -277,183 +277,183 @@ $(eval $(call gb_Library_add_nativeres,v
 endif
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/app/dbggui \
-    vcl/source/app/dndhelp \
-    vcl/source/app/help \
-    vcl/source/app/i18nhelp \
-    vcl/source/app/idlemgr \
-    vcl/source/app/salvtables \
-    vcl/source/app/session \
-    vcl/source/app/settings \
-    vcl/source/app/sound \
-    vcl/source/app/stdtext \
-    vcl/source/app/svapp \
-    vcl/source/app/svdata \
-    vcl/source/app/svmain \
-    vcl/source/app/svmainhook \
-    vcl/source/app/timer \
-    vcl/source/app/unohelp2 \
-    vcl/source/app/unohelp \
-    vcl/source/app/vclevent \
-    vcl/source/components/display \
-    vcl/source/components/dtranscomp \
-    vcl/source/components/factory \
-    vcl/source/components/fontident \
-    vcl/source/components/stringmirror \
-    vcl/source/control/button \
-    vcl/source/control/combobox \
-    vcl/source/control/ctrl \
-    vcl/source/control/edit \
-    vcl/source/control/field2 \
-    vcl/source/control/field \
-    vcl/source/control/fixbrd \
-    vcl/source/control/fixed \
-    vcl/source/control/group \
-    vcl/source/control/ilstbox \
-    vcl/source/control/imgctrl \
-    vcl/source/control/longcurr \
-    vcl/source/control/lstbox \
-    vcl/source/control/menubtn \
-    vcl/source/control/morebtn \
-    vcl/source/control/quickselectionengine \
-    vcl/source/control/scrbar \
-    vcl/source/control/slider \
-    vcl/source/control/spinbtn \
-    vcl/source/control/spinfld \
-    vcl/source/control/tabctrl \
-    vcl/source/control/throbber \
-    vcl/source/fontsubset/cff \
-    vcl/source/fontsubset/fontsubset \
-    vcl/source/fontsubset/gsub \
-    vcl/source/fontsubset/list \
-    vcl/source/fontsubset/sft \
-    vcl/source/fontsubset/ttcr \
-    vcl/source/fontsubset/xlat \
-    vcl/source/gdi/alpha \
-    vcl/source/gdi/animate \
-    vcl/source/gdi/base14 \
-    vcl/source/gdi/bitmap3 \
-    vcl/source/gdi/bitmap4 \
-    vcl/source/gdi/bitmap \
-    vcl/source/gdi/bitmapex \
-    vcl/source/gdi/bmpacc2 \
-    vcl/source/gdi/bmpacc3 \
-    vcl/source/gdi/bmpacc \
-    vcl/source/gdi/bmpconv \
-    vcl/source/gdi/bmpfast \
-    vcl/source/gdi/configsettings \
-    vcl/source/gdi/cvtgrf \
-    vcl/source/gdi/cvtsvm \
-    vcl/source/gdi/dibtools \
-    vcl/source/gdi/extoutdevdata \
-    vcl/source/gdi/font \
-    vcl/source/gdi/gdimtf \
-    vcl/source/gdi/gdimetafiletools \
-    vcl/source/gdi/gfxlink \
-    vcl/source/gdi/gradient \
-    vcl/source/gdi/graph \
-    vcl/source/gdi/graphictools \
-    vcl/source/gdi/hatch \
-    vcl/source/gdi/image \
-    vcl/source/gdi/imagerepository \
-    vcl/source/gdi/impanmvw \
-    vcl/source/gdi/impbmp \
-    vcl/source/gdi/impfont \
-    vcl/source/gdi/impgraph \
-    vcl/source/gdi/impimage \
-    vcl/source/gdi/impimagetree \
-    vcl/source/gdi/impvect \
-    vcl/source/gdi/jobset \
-    vcl/source/gdi/lineinfo \
-    vcl/source/gdi/mapmod \
-    vcl/source/gdi/metaact \
-    vcl/source/gdi/metric \
-    vcl/source/gdi/octree \
-    vcl/source/gdi/oldprintadaptor \
-    vcl/source/gdi/outdev2 \
-    vcl/source/gdi/outdev3 \
-    vcl/source/gdi/outdev4 \
-    vcl/source/gdi/outdev5 \
-    vcl/source/gdi/outdev6 \
-    vcl/source/gdi/outdev \
-    vcl/source/gdi/outdevnative \
-    vcl/source/gdi/outmap \
-    vcl/source/gdi/pdfextoutdevdata \
-    vcl/source/gdi/pdffontcache \
-    vcl/source/gdi/pdfwriter \
-    vcl/source/gdi/pdfwriter_impl2 \
-    vcl/source/gdi/pdfwriter_impl \
-    vcl/source/gdi/pngread \
-    vcl/source/gdi/pngwrite \
-    vcl/source/gdi/print2 \
-    vcl/source/gdi/print3 \
-    vcl/source/gdi/print \
-    vcl/source/gdi/regband \
-    vcl/source/gdi/region \
-    vcl/source/gdi/regionband \
-    vcl/source/gdi/salgdilayout \
-    vcl/source/gdi/sallayout \
-    vcl/source/gdi/salmisc \
-    vcl/source/gdi/salnativewidgets-none \
-    vcl/source/gdi/svgdata \
-    vcl/source/gdi/textlayout \
-    vcl/source/gdi/virdev \
-    vcl/source/gdi/wall \
-    vcl/source/helper/canvasbitmap \
-    vcl/source/helper/canvastools \
-    vcl/source/helper/evntpost \
-    vcl/source/helper/lazydelete \
-    vcl/source/helper/strhelper \
-    vcl/source/helper/threadex \
-    vcl/source/helper/xconnection \
-    vcl/source/salmain/salmain \
-    vcl/source/window/abstdlg \
-    vcl/source/window/accel \
-    vcl/source/window/accmgr \
-    vcl/source/window/arrange \
-    vcl/source/window/brdwin \
-    vcl/source/window/btndlg \
-    vcl/source/window/cmdevt \
-    vcl/source/window/cursor \
-    vcl/source/window/decoview \
-    vcl/source/window/dialog \
-    vcl/source/window/dlgctrl \
-    vcl/source/window/dndevdis \
-    vcl/source/window/dndlcon \
-    vcl/source/window/dockingarea \
-    vcl/source/window/dockmgr \
-    vcl/source/window/dockwin \
-    vcl/source/window/floatwin \
-    vcl/source/window/introwin \
-    vcl/source/window/javachild \
-    vcl/source/window/keycod \
-    vcl/source/window/keyevent \
-    vcl/source/window/menu \
-    vcl/source/window/mnemonic \
-    vcl/source/window/mnemonicengine \
-    vcl/source/window/mouseevent \
-    vcl/source/window/msgbox \
-    vcl/source/window/popupmenuwindow \
-    vcl/source/window/printdlg \
-    vcl/source/window/scrwnd \
-    vcl/source/window/seleng \
-    vcl/source/window/split \
-    vcl/source/window/splitwin \
-    vcl/source/window/status \
-    vcl/source/window/syschild \
-    vcl/source/window/syswin \
-    vcl/source/window/tabdlg \
-    vcl/source/window/tabpage \
-    vcl/source/window/taskpanelist \
-    vcl/source/window/toolbox2 \
-    vcl/source/window/toolbox \
-    vcl/source/window/window2 \
-    vcl/source/window/window3 \
-    vcl/source/window/window4 \
-    vcl/source/window/window \
-    vcl/source/window/winproc \
-    vcl/source/window/wpropset \
-    vcl/source/window/wrkwin \
+	vcl/source/app/dbggui \
+	vcl/source/app/dndhelp \
+	vcl/source/app/help \
+	vcl/source/app/i18nhelp \
+	vcl/source/app/idlemgr \
+	vcl/source/app/salvtables \
+	vcl/source/app/session \
+	vcl/source/app/settings \
+	vcl/source/app/sound \
+	vcl/source/app/stdtext \
+	vcl/source/app/svapp \
+	vcl/source/app/svdata \
+	vcl/source/app/svmain \
+	vcl/source/app/svmainhook \
+	vcl/source/app/timer \
+	vcl/source/app/unohelp2 \
+	vcl/source/app/unohelp \
+	vcl/source/app/vclevent \
+	vcl/source/components/display \
+	vcl/source/components/dtranscomp \
+	vcl/source/components/factory \
+	vcl/source/components/fontident \
+	vcl/source/components/stringmirror \
+	vcl/source/control/button \
+	vcl/source/control/combobox \
+	vcl/source/control/ctrl \
+	vcl/source/control/edit \
+	vcl/source/control/field2 \
+	vcl/source/control/field \
+	vcl/source/control/fixbrd \
+	vcl/source/control/fixed \
+	vcl/source/control/group \
+	vcl/source/control/ilstbox \
+	vcl/source/control/imgctrl \
+	vcl/source/control/longcurr \
+	vcl/source/control/lstbox \
+	vcl/source/control/menubtn \
+	vcl/source/control/morebtn \
+	vcl/source/control/quickselectionengine \
+	vcl/source/control/scrbar \
+	vcl/source/control/slider \
+	vcl/source/control/spinbtn \
+	vcl/source/control/spinfld \
+	vcl/source/control/tabctrl \
+	vcl/source/control/throbber \
+	vcl/source/fontsubset/cff \
+	vcl/source/fontsubset/fontsubset \
+	vcl/source/fontsubset/gsub \
+	vcl/source/fontsubset/list \
+	vcl/source/fontsubset/sft \
+	vcl/source/fontsubset/ttcr \
+	vcl/source/fontsubset/xlat \
+	vcl/source/gdi/alpha \
+	vcl/source/gdi/animate \
+	vcl/source/gdi/base14 \
+	vcl/source/gdi/bitmap3 \
+	vcl/source/gdi/bitmap4 \
+	vcl/source/gdi/bitmap \
+	vcl/source/gdi/bitmapex \
+	vcl/source/gdi/bmpacc2 \
+	vcl/source/gdi/bmpacc3 \
+	vcl/source/gdi/bmpacc \
+	vcl/source/gdi/bmpconv \
+	vcl/source/gdi/bmpfast \
+	vcl/source/gdi/configsettings \
+	vcl/source/gdi/cvtgrf \
+	vcl/source/gdi/cvtsvm \
+	vcl/source/gdi/dibtools \
+	vcl/source/gdi/extoutdevdata \
+	vcl/source/gdi/font \
+	vcl/source/gdi/gdimtf \
+	vcl/source/gdi/gdimetafiletools \
+	vcl/source/gdi/gfxlink \
+	vcl/source/gdi/gradient \
+	vcl/source/gdi/graph \
+	vcl/source/gdi/graphictools \
+	vcl/source/gdi/hatch \
+	vcl/source/gdi/image \
+	vcl/source/gdi/imagerepository \
+	vcl/source/gdi/impanmvw \
+	vcl/source/gdi/impbmp \
+	vcl/source/gdi/impfont \
+	vcl/source/gdi/impgraph \
+	vcl/source/gdi/impimage \
+	vcl/source/gdi/impimagetree \
+	vcl/source/gdi/impvect \
+	vcl/source/gdi/jobset \
+	vcl/source/gdi/lineinfo \
+	vcl/source/gdi/mapmod \
+	vcl/source/gdi/metaact \
+	vcl/source/gdi/metric \
+	vcl/source/gdi/octree \
+	vcl/source/gdi/oldprintadaptor \
+	vcl/source/gdi/outdev2 \
+	vcl/source/gdi/outdev3 \
+	vcl/source/gdi/outdev4 \
+	vcl/source/gdi/outdev5 \
+	vcl/source/gdi/outdev6 \
+	vcl/source/gdi/outdev \
+	vcl/source/gdi/outdevnative \
+	vcl/source/gdi/outmap \
+	vcl/source/gdi/pdfextoutdevdata \
+	vcl/source/gdi/pdffontcache \
+	vcl/source/gdi/pdfwriter \
+	vcl/source/gdi/pdfwriter_impl2 \
+	vcl/source/gdi/pdfwriter_impl \
+	vcl/source/gdi/pngread \
+	vcl/source/gdi/pngwrite \
+	vcl/source/gdi/print2 \
+	vcl/source/gdi/print3 \
+	vcl/source/gdi/print \
+	vcl/source/gdi/regband \
+	vcl/source/gdi/region \
+	vcl/source/gdi/regionband \
+	vcl/source/gdi/salgdilayout \
+	vcl/source/gdi/sallayout \
+	vcl/source/gdi/salmisc \
+	vcl/source/gdi/salnativewidgets-none \
+	vcl/source/gdi/svgdata \
+	vcl/source/gdi/textlayout \
+	vcl/source/gdi/virdev \
+	vcl/source/gdi/wall \
+	vcl/source/helper/canvasbitmap \
+	vcl/source/helper/canvastools \
+	vcl/source/helper/evntpost \
+	vcl/source/helper/lazydelete \
+	vcl/source/helper/strhelper \
+	vcl/source/helper/threadex \
+	vcl/source/helper/xconnection \
+	vcl/source/salmain/salmain \
+	vcl/source/window/abstdlg \
+	vcl/source/window/accel \
+	vcl/source/window/accmgr \
+	vcl/source/window/arrange \
+	vcl/source/window/brdwin \
+	vcl/source/window/btndlg \
+	vcl/source/window/cmdevt \
+	vcl/source/window/cursor \
+	vcl/source/window/decoview \
+	vcl/source/window/dialog \
+	vcl/source/window/dlgctrl \
+	vcl/source/window/dndevdis \
+	vcl/source/window/dndlcon \
+	vcl/source/window/dockingarea \
+	vcl/source/window/dockmgr \
+	vcl/source/window/dockwin \
+	vcl/source/window/floatwin \
+	vcl/source/window/introwin \
+	vcl/source/window/javachild \
+	vcl/source/window/keycod \
+	vcl/source/window/keyevent \
+	vcl/source/window/menu \
+	vcl/source/window/mnemonic \
+	vcl/source/window/mnemonicengine \
+	vcl/source/window/mouseevent \
+	vcl/source/window/msgbox \
+	vcl/source/window/popupmenuwindow \
+	vcl/source/window/printdlg \
+	vcl/source/window/scrwnd \
+	vcl/source/window/seleng \
+	vcl/source/window/split \
+	vcl/source/window/splitwin \
+	vcl/source/window/status \
+	vcl/source/window/syschild \
+	vcl/source/window/syswin \
+	vcl/source/window/tabdlg \
+	vcl/source/window/tabpage \
+	vcl/source/window/taskpanelist \
+	vcl/source/window/toolbox2 \
+	vcl/source/window/toolbox \
+	vcl/source/window/window2 \
+	vcl/source/window/window3 \
+	vcl/source/window/window4 \
+	vcl/source/window/window \
+	vcl/source/window/winproc \
+	vcl/source/window/wpropset \
+	vcl/source/window/wrkwin \
 ))
 
 ## handle Graphite
@@ -463,17 +463,17 @@ $(eval $(call gb_Library_add_defs,vcl,\
 	-DENABLE_GRAPHITE \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/glyphs/graphite_cache \
-    vcl/source/glyphs/graphite_features \
-    vcl/source/glyphs/graphite_layout \
-    vcl/source/glyphs/graphite_textsrc \
+	vcl/source/glyphs/graphite_cache \
+	vcl/source/glyphs/graphite_features \
+	vcl/source/glyphs/graphite_layout \
+	vcl/source/glyphs/graphite_textsrc \
 ))
 
 # handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/glyphs/graphite_adaptors \
-    vcl/source/glyphs/graphite_serverfont \
+	vcl/source/glyphs/graphite_adaptors \
+	vcl/source/glyphs/graphite_serverfont \
 ))
 endif
 
@@ -491,11 +491,11 @@ endif
 ifeq ($(OS),SOLARIS)
 ifeq ($(CPUNAME)$(CPU),SPARCU)
 $(eval $(call gb_Library_add_ldflags,vcl,\
-    -R/usr/sfw/lib/64 \
+	-R/usr/sfw/lib/64 \
 ))
 else
 $(eval $(call gb_Library_add_ldflags,vcl,\
-    -R/usr/sfw/lib \
+	-R/usr/sfw/lib \
 ))
 endif
 endif
@@ -505,10 +505,10 @@ $(eval $(call gb_Library_add_linked_libs
 	AppleRemote \
 ))
 $(eval $(call gb_Library_add_libs,vcl,\
-    $$(LDFLAGS) \
-    -framework Cocoa \
-    -framework Carbon \
-    -framework CoreFoundation \
+	$$(LDFLAGS) \
+	-framework Cocoa \
+	-framework Carbon \
+	-framework CoreFoundation \
 ))
 # ??? what about this
 #ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
@@ -520,7 +520,7 @@ endif
 ifeq ($(OS),WNT)
 ifeq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_ldflags,vcl,\
-    /ENTRY:LibMain@12 \
+	/ENTRY:LibMain@12 \
 ))
 endif
 $(eval $(call gb_Library_add_linked_libs,vcl,\
@@ -538,4 +538,5 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_gen.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_gen.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_gen.mk Fri Sep 28 18:18:47 2018
@@ -38,26 +38,26 @@ $(eval $(call gb_Library_set_include,vcl
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
+	X11 \
+	Xext \
+	SM \
+	ICE \
 	$(gb_STDLIBS) \
 ))
 
@@ -67,61 +67,61 @@ $(call gb_Library_use_externals,vclplug_
 )
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
-    vcl/unx/generic/app/i18n_cb \
-    vcl/unx/generic/app/i18n_ic \
-    vcl/unx/generic/app/i18n_im \
-    vcl/unx/generic/app/i18n_keysym \
-    vcl/unx/generic/app/i18n_status \
-    vcl/unx/generic/app/i18n_wrp \
-    vcl/unx/generic/app/i18n_xkb \
-    vcl/unx/generic/app/keysymnames \
-    vcl/unx/generic/app/randrwrapper \
-    vcl/unx/generic/app/saldata \
-    vcl/unx/generic/app/saldisp \
-    vcl/unx/generic/app/salinst \
-    vcl/unx/generic/app/salsys \
-    vcl/unx/generic/app/saltimer \
-    vcl/unx/generic/app/sm \
-    vcl/unx/generic/app/soicon \
-    vcl/unx/generic/app/wmadaptor \
-    vcl/unx/generic/dtrans/bmp \
-    vcl/unx/generic/dtrans/config \
-    vcl/unx/generic/dtrans/X11_clipboard \
-    vcl/unx/generic/dtrans/X11_dndcontext \
-    vcl/unx/generic/dtrans/X11_droptarget \
-    vcl/unx/generic/dtrans/X11_selection \
-    vcl/unx/generic/dtrans/X11_service \
-    vcl/unx/generic/dtrans/X11_transferable \
-    vcl/unx/generic/gdi/cdeint \
-    vcl/unx/generic/gdi/dtint \
-    vcl/unx/generic/gdi/gcach_xpeer \
-    vcl/unx/generic/gdi/pspgraphics \
-    vcl/unx/generic/gdi/salbmp \
-    vcl/unx/generic/gdi/salcvt \
-    vcl/unx/generic/gdi/salgdi2 \
-    vcl/unx/generic/gdi/salgdi3 \
-    vcl/unx/generic/gdi/salgdi \
-    vcl/unx/generic/gdi/salprnpsp \
-    vcl/unx/generic/gdi/salvd \
-    vcl/unx/generic/gdi/xrender_peer \
-    vcl/unx/generic/printergfx/bitmap_gfx \
-    vcl/unx/generic/printergfx/common_gfx \
-    vcl/unx/generic/printergfx/glyphset \
-    vcl/unx/generic/printergfx/printerjob \
-    vcl/unx/generic/printergfx/psputil \
-    vcl/unx/generic/printergfx/text_gfx \
-    vcl/unx/generic/window/FWS \
-    vcl/unx/generic/window/salframe \
-    vcl/unx/generic/window/salobj \
+	vcl/unx/generic/app/i18n_cb \
+	vcl/unx/generic/app/i18n_ic \
+	vcl/unx/generic/app/i18n_im \
+	vcl/unx/generic/app/i18n_keysym \
+	vcl/unx/generic/app/i18n_status \
+	vcl/unx/generic/app/i18n_wrp \
+	vcl/unx/generic/app/i18n_xkb \
+	vcl/unx/generic/app/keysymnames \
+	vcl/unx/generic/app/randrwrapper \
+	vcl/unx/generic/app/saldata \
+	vcl/unx/generic/app/saldisp \
+	vcl/unx/generic/app/salinst \
+	vcl/unx/generic/app/salsys \
+	vcl/unx/generic/app/saltimer \
+	vcl/unx/generic/app/sm \
+	vcl/unx/generic/app/soicon \
+	vcl/unx/generic/app/wmadaptor \
+	vcl/unx/generic/dtrans/bmp \
+	vcl/unx/generic/dtrans/config \
+	vcl/unx/generic/dtrans/X11_clipboard \
+	vcl/unx/generic/dtrans/X11_dndcontext \
+	vcl/unx/generic/dtrans/X11_droptarget \
+	vcl/unx/generic/dtrans/X11_selection \
+	vcl/unx/generic/dtrans/X11_service \
+	vcl/unx/generic/dtrans/X11_transferable \
+	vcl/unx/generic/gdi/cdeint \
+	vcl/unx/generic/gdi/dtint \
+	vcl/unx/generic/gdi/gcach_xpeer \
+	vcl/unx/generic/gdi/pspgraphics \
+	vcl/unx/generic/gdi/salbmp \
+	vcl/unx/generic/gdi/salcvt \
+	vcl/unx/generic/gdi/salgdi2 \
+	vcl/unx/generic/gdi/salgdi3 \
+	vcl/unx/generic/gdi/salgdi \
+	vcl/unx/generic/gdi/salprnpsp \
+	vcl/unx/generic/gdi/salvd \
+	vcl/unx/generic/gdi/xrender_peer \
+	vcl/unx/generic/printergfx/bitmap_gfx \
+	vcl/unx/generic/printergfx/common_gfx \
+	vcl/unx/generic/printergfx/glyphset \
+	vcl/unx/generic/printergfx/printerjob \
+	vcl/unx/generic/printergfx/psputil \
+	vcl/unx/generic/printergfx/text_gfx \
+	vcl/unx/generic/window/FWS \
+	vcl/unx/generic/window/salframe \
+	vcl/unx/generic/window/salobj \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
-    -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-    -DVCLPLUG_GEN_IMPLEMENTATION \
+	-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+	-DVCLPLUG_GEN_IMPLEMENTATION \
 ))
 
 
-## handle RandR 
+## handle RandR
 ifeq ($(ENABLE_RANDR),TRUE)
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
 	-DUSE_RANDR \
@@ -131,7 +131,7 @@ $(eval $(call gb_Library_set_include,vcl
 	$$(INCLUDE) \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
-    $(XRANDR_LIBS) \
+	$(XRANDR_LIBS) \
 ))
 else
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
@@ -154,7 +154,7 @@ $(eval $(call gb_Library_add_libs,vclplu
 
 else
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
-    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+	-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
 else
@@ -167,11 +167,11 @@ ifeq ($(USE_XINERAMA_VERSION),Xorg)
 # Solaris, Xorg
 ifeq ($(XINERAMA_LINK),dynamic)
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
-    -lXinerama \
+	-lXinerama \
 ))
 else
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
-    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+	-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
 ))
 endif
 endif
@@ -184,7 +184,7 @@ $(eval $(call gb_Library_add_defs,vclplu
 	-DXRENDER_LINK \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_gen,\
-    $(shell pkg-config --libs xrender) \
+	$(shell pkg-config --libs xrender) \
 ))
 endif
 
@@ -203,4 +203,5 @@ $(eval $(call gb_Library_add_libs,vclplu
 	-lXinerama -lXrandr \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_gtk.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_gtk.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_gtk.mk Fri Sep 28 18:18:47 2018
@@ -39,12 +39,12 @@ $(eval $(call gb_Library_set_include,vcl
 
 $(eval $(call gb_Library_set_include,vclplug_gtk,\
 	$$(INCLUDE) \
-    $$(GTK_CFLAGS) \
+	$$(GTK_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_gtk,\
-    -DVCLPLUG_GTK_IMPLEMENTATION \
-    -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
+	-DVCLPLUG_GTK_IMPLEMENTATION \
+	-DVERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
 ifeq ($(ENABLE_DBUS),TRUE)
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl
 	$(shell pkg-config --cflags-only-I dbus-glib-1) \
 ))
 $(eval $(call gb_Library_add_defs,vclplug_gtk,\
-    -DENABLE_DBUS \
+	-DENABLE_DBUS \
 ))
 $(eval $(call gb_Library_add_libs,vclplug_gtk,\
 	$(shell pkg-config --libs dbus-glib-1) \
@@ -61,33 +61,33 @@ $(eval $(call gb_Library_add_libs,vclplu
 endif
 
 $(eval $(call gb_Library_add_libs,vclplug_gtk,\
-    $(GTK_LIBS) \
-    $(GTHREAD_LIBS) \
+	$(GTK_LIBS) \
+	$(GTHREAD_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
-    vclplug_gen \
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vclplug_gen \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
-    $(gb_STDLIBS) \
+	X11 \
+	Xext \
+	SM \
+	ICE \
+	$(gb_STDLIBS) \
 ))
 
 $(call gb_Library_use_externals,vclplug_gtk,\
@@ -96,29 +96,29 @@ $(call gb_Library_use_externals,vclplug_
 )
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
-    vcl/unx/gtk/a11y/atkaction \
-    vcl/unx/gtk/a11y/atkbridge \
-    vcl/unx/gtk/a11y/atkcomponent \
-    vcl/unx/gtk/a11y/atkeditabletext \
-    vcl/unx/gtk/a11y/atkfactory \
-    vcl/unx/gtk/a11y/atkhypertext \
-    vcl/unx/gtk/a11y/atkimage \
-    vcl/unx/gtk/a11y/atklistener \
-    vcl/unx/gtk/a11y/atkregistry \
-    vcl/unx/gtk/a11y/atkselection \
-    vcl/unx/gtk/a11y/atktable \
-    vcl/unx/gtk/a11y/atktextattributes \
-    vcl/unx/gtk/a11y/atktext \
-    vcl/unx/gtk/a11y/atkutil \
-    vcl/unx/gtk/a11y/atkvalue \
-    vcl/unx/gtk/a11y/atkwindow \
-    vcl/unx/gtk/a11y/atkwrapper \
-    vcl/unx/gtk/app/gtkdata \
-    vcl/unx/gtk/app/gtkinst \
-    vcl/unx/gtk/app/gtksys \
-    vcl/unx/gtk/gdi/salnativewidgets-gtk \
-    vcl/unx/gtk/window/gtkframe \
-    vcl/unx/gtk/window/gtkobject \
+	vcl/unx/gtk/a11y/atkaction \
+	vcl/unx/gtk/a11y/atkbridge \
+	vcl/unx/gtk/a11y/atkcomponent \
+	vcl/unx/gtk/a11y/atkeditabletext \
+	vcl/unx/gtk/a11y/atkfactory \
+	vcl/unx/gtk/a11y/atkhypertext \
+	vcl/unx/gtk/a11y/atkimage \
+	vcl/unx/gtk/a11y/atklistener \
+	vcl/unx/gtk/a11y/atkregistry \
+	vcl/unx/gtk/a11y/atkselection \
+	vcl/unx/gtk/a11y/atktable \
+	vcl/unx/gtk/a11y/atktextattributes \
+	vcl/unx/gtk/a11y/atktext \
+	vcl/unx/gtk/a11y/atkutil \
+	vcl/unx/gtk/a11y/atkvalue \
+	vcl/unx/gtk/a11y/atkwindow \
+	vcl/unx/gtk/a11y/atkwrapper \
+	vcl/unx/gtk/app/gtkdata \
+	vcl/unx/gtk/app/gtkinst \
+	vcl/unx/gtk/app/gtksys \
+	vcl/unx/gtk/gdi/salnativewidgets-gtk \
+	vcl/unx/gtk/window/gtkframe \
+	vcl/unx/gtk/window/gtkobject \
 ))
 
 ifeq ($(OS),LINUX)

Modified: openoffice/trunk/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_kde.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_kde.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_kde.mk Fri Sep 28 18:18:47 2018
@@ -39,39 +39,39 @@ $(eval $(call gb_Library_set_include,vcl
 
 $(eval $(call gb_Library_set_include,vclplug_kde,\
 	$$(INCLUDE) \
-    $$(KDE_CFLAGS) \
+	$$(KDE_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_kde,\
-    -DVCLPLUG_KDE_IMPLEMENTATION \
+	-DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_libs,vclplug_kde,\
-    $$(KDE_LIBS) \
+	$$(KDE_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
-    vclplug_gen \
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vclplug_gen \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
+	X11 \
+	Xext \
+	SM \
+	ICE \
 ))
 
 $(call gb_Library_use_externals,vclplug_kde,\
@@ -80,8 +80,8 @@ $(call gb_Library_use_externals,vclplug_
 )
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
-    vcl/unx/kde/kdedata \
-    vcl/unx/kde/salnativewidgets-kde \
+	vcl/unx/kde/kdedata \
+	vcl/unx/kde/salnativewidgets-kde \
 ))
 
 ifeq ($(OS),LINUX)
@@ -91,4 +91,5 @@ $(eval $(call gb_Library_add_linked_libs
 	pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_kde4.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_kde4.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_kde4.mk Fri Sep 28 18:18:47 2018
@@ -39,39 +39,39 @@ $(eval $(call gb_Library_set_include,vcl
 
 $(eval $(call gb_Library_set_include,vclplug_kde4,\
 	$$(INCLUDE) \
-    $$(KDE4_CFLAGS) \
+	$$(KDE4_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_kde4,\
-    -DVCLPLUG_KDE4_IMPLEMENTATION \
+	-DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_libs,vclplug_kde4,\
-    $$(KDE4_LIBS) \
+	$$(KDE4_LIBS) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
-    vclplug_gen \
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vclplug_gen \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
+	X11 \
+	Xext \
+	SM \
+	ICE \
 ))
 
 $(call gb_Library_use_externals,vclplug_kde4,\
@@ -80,14 +80,14 @@ $(call gb_Library_use_externals,vclplug_
 )
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
-    vcl/unx/kde4/KDEData \
-    vcl/unx/kde4/KDESalDisplay \
-    vcl/unx/kde4/KDESalFrame \
-    vcl/unx/kde4/KDESalGraphics \
-    vcl/unx/kde4/KDESalInstance \
-    vcl/unx/kde4/KDEXLib \
-    vcl/unx/kde4/main \
-    vcl/unx/kde4/VCLKDEApplication \
+	vcl/unx/kde4/KDEData \
+	vcl/unx/kde4/KDESalDisplay \
+	vcl/unx/kde4/KDESalFrame \
+	vcl/unx/kde4/KDESalGraphics \
+	vcl/unx/kde4/KDESalInstance \
+	vcl/unx/kde4/KDEXLib \
+	vcl/unx/kde4/main \
+	vcl/unx/kde4/VCLKDEApplication \
 ))
 
 ifeq ($(OS),LINUX)
@@ -97,4 +97,5 @@ $(eval $(call gb_Library_add_linked_libs
 	pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Library_vclplug_svp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vclplug_svp.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vclplug_svp.mk (original)
+++ openoffice/trunk/main/vcl/Library_vclplug_svp.mk Fri Sep 28 18:18:47 2018
@@ -38,31 +38,31 @@ $(eval $(call gb_Library_set_include,vcl
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_svp,\
-    -DVCLPLUG_SVP_IMPLEMENTATION \
+	-DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
+	vcl \
+	tl \
+	utl \
+	sot \
+	ucbhelper \
 	basegfx \
 	basebmp \
 	comphelper \
-    cppuhelper \
+	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
-    i18nutil \
-    jvmaccess \
+	i18nutil \
+	jvmaccess \
 	stl \
 	cppu \
 	sal \
 	vos3 \
-    X11 \
-    Xext \
-    SM \
-    ICE \
+	X11 \
+	Xext \
+	SM \
+	ICE \
 	$(gb_STDLIBS) \
 ))
 
@@ -72,22 +72,22 @@ $(call gb_Library_use_externals,vclplug_
 )
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
-    vcl/unx/generic/printergfx/bitmap_gfx \
-    vcl/unx/generic/printergfx/common_gfx \
-    vcl/unx/generic/printergfx/glyphset \
-    vcl/unx/generic/printergfx/printerjob \
-    vcl/unx/generic/printergfx/psputil \
-    vcl/unx/generic/printergfx/text_gfx \
-    vcl/unx/headless/svpbmp \
-    vcl/unx/headless/svpdummies \
-    vcl/unx/headless/svpelement \
-    vcl/unx/headless/svpframe \
-    vcl/unx/headless/svpgdi \
-    vcl/unx/headless/svpinst \
-    vcl/unx/headless/svpprn \
-    vcl/unx/headless/svppspgraphics \
-    vcl/unx/headless/svptext \
-    vcl/unx/headless/svpvd \
+	vcl/unx/generic/printergfx/bitmap_gfx \
+	vcl/unx/generic/printergfx/common_gfx \
+	vcl/unx/generic/printergfx/glyphset \
+	vcl/unx/generic/printergfx/printerjob \
+	vcl/unx/generic/printergfx/psputil \
+	vcl/unx/generic/printergfx/text_gfx \
+	vcl/unx/headless/svpbmp \
+	vcl/unx/headless/svpdummies \
+	vcl/unx/headless/svpelement \
+	vcl/unx/headless/svpframe \
+	vcl/unx/headless/svpgdi \
+	vcl/unx/headless/svpinst \
+	vcl/unx/headless/svpprn \
+	vcl/unx/headless/svppspgraphics \
+	vcl/unx/headless/svptext \
+	vcl/unx/headless/svpvd \
 ))
 
 ifeq ($(OS),LINUX)
@@ -97,4 +97,5 @@ $(eval $(call gb_Library_add_linked_libs
 	pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Module_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Module_vcl.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Module_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Module_vcl.mk Fri Sep 28 18:18:47 2018
@@ -21,21 +21,20 @@
 
 
 
-
 $(eval $(call gb_Module_Module,vcl))
 
 $(eval $(call gb_Module_add_targets,vcl,\
 	Library_vcl \
-    StaticLibrary_vclmain \
+	StaticLibrary_vclmain \
 	Package_inc \
-    AllLangResTarget_vcl \
+	AllLangResTarget_vcl \
 ))
 
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Module_add_targets,vcl,\
 	Library_vclplug_gen \
 	Library_vclplug_svp \
-    Library_desktop_detector \
+	Library_desktop_detector \
 ))
 
 
@@ -59,19 +58,19 @@ endif
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Module_add_targets,vcl,\
-    Package_osx \
+	Package_osx \
 ))
 endif
 
 ifeq ($(GUIBASE),WIN)
 $(eval $(call gb_Module_add_targets,vcl,\
-    WinResTarget_vcl \
+	WinResTarget_vcl \
 ))
 endif
 
 ifeq ($(GUIBASE),os2)
 $(eval $(call gb_Module_add_targets,vcl,\
-    WinResTarget_vcl \
+	WinResTarget_vcl \
 ))
 endif
 

Modified: openoffice/trunk/main/vcl/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Package_inc.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Package_inc.mk (original)
+++ openoffice/trunk/main/vcl/Package_inc.mk Fri Sep 28 18:18:47 2018
@@ -162,3 +162,4 @@ $(eval $(call gb_Package_add_file,vcl_in
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
 
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/Package_osx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Package_osx.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Package_osx.mk (original)
+++ openoffice/trunk/main/vcl/Package_osx.mk Fri Sep 28 18:18:47 2018
@@ -25,8 +25,9 @@
 $(eval $(call gb_Package_Package,vcl_zip,))
 $(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip))
 
-/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png

+/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png
 	cd $(SRCDIR)/vcl/aqua/source/res ; \
 	mkdir -p $(dir $@) ; \
 	zip $@ MainMenu.nib/*.nib cursors/*.png
 
+# vim: set noet sw=4 ts=4:

Modified: openoffice/trunk/main/vcl/WinResTarget_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/WinResTarget_vcl.mk?rev=1842277&r1=1842276&r2=1842277&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/WinResTarget_vcl.mk (original)
+++ openoffice/trunk/main/vcl/WinResTarget_vcl.mk Fri Sep 28 18:18:47 2018
@@ -211,3 +211,5 @@ $(eval $(call gb_WinResTarget_set_includ
 ))
 
 endif
+
+# vim: set noet sw=4 ts=4:



Mime
View raw message