date:20120115

[Libreoffice-commits] .: solenv/inc

2012-01-15 Thread Andras Timar

 solenv/inc/rules.mk|7 ---
 solenv/inc/target.mk   |   20 
 solenv/inc/tg_merge.mk |5 -
 solenv/inc/unitools.mk |1 -
 4 files changed, 33 deletions(-)

New commits:
commit 1f536f3166fd1d6c22771117c51497193abe8fd3
Author: Andras Timar ati...@suse.com
Date:   Sun Jan 15 14:56:44 2012 +0100

remove dmake rules for unused file type *.xrb

diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 6700845..f45d46b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -646,13 +646,6 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
 $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
 $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
-$(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
-$(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
-$(COMMAND_ECHO)-$(RM) $@
-$(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) 
-m $(LOCALIZESDF) -l all
-$(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
-$(COMMAND_ECHO)-$(RM) $@.$(INPATH)
-
 $(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm
 $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
 $(COMMAND_ECHO)-$(RM) $@
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index f166e80..3cca55d 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -928,10 +928,6 @@ SDI4TARGET=$(MISC)/$(SDI4NAME).don
 SDI5TARGET=$(MISC)/$(SDI5NAME).don
 .ENDIF
 
-.IF $(XMLPROPERTIES)!=
-XMLPROPERTIESN:=$(foreach,i,$(XMLPROPERTIES) 
$(MISC)/$(TARGET)_$(i:s/.xrb/.done/))
-.ENDIF # $(XMLPROPERTIES)!=
-
 .IF $(UNIXTEXT)!=
 .IF $(GUI)==UNX
 CONVERTUNIXTEXT:=$(UNIXTEXT)
@@ -988,7 +984,6 @@ ALLTAR: \
 $(ZIPALL) \
 $(SDITARGET)   $(SDI1TARGET)   $(SDI2TARGET)   \
 $(SDI3TARGET)  $(SDI4TARGET)   $(SDI5TARGET)   \
-$(XMLPROPERTIESN) \
 $(RCTARGET) \
 $(SCP_PRODUCT_TYPE) \
 $(ALLPARFILES) \
@@ -1066,7 +1061,6 @@ ALLTAR: \
 $(NOLIBOBJTARGET) \
 $(NOLIBSLOTARGET) \
 $(OTHERTARRGET) \
-$(XMLPROPERTIESN) \
 $(ALL_JAVA_TARGETS) \
 $(OBJTARGET)   $(SLOTARGET)$(SMRSLOTARGET) \
 $($(SECOND_BUILD)SLOTARGET) \
@@ -1444,20 +1438,6 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) 
$(LOCALIZESDF)
 .ENDIF # $(WITH_LANG)==
 .ENDIF  # $(LOCALIZE_ME_DEST)!=
 
-.IF $(XMLPROPERTIES)!=
-.IF $(L10N_framework)!=
-XML_ISO_CODE*=-ISO99 $(L10N_framework)
-.ENDIF
-.IF $(WITH_LANG)!=
-$(MISC)/$(TARGET)_%.done : $(COMMONMISC)/$(TARGET)/%.xrb
-.ELSE  # $(WITH_LANG)!=
-$(MISC)/$(TARGET)_%.done : %.xrb
-.ENDIF # $(WITH_LANG)!=
-@@-$(RM) $(MISC)/$(:b).interm$(TARGET)
-native2ascii -encoding UTF8 $ $(MISC)/$(:b).interm$(TARGET)  $(XMLEX) 
-i $(MISC)/$(:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
-@@$(RM)  $(MISC)/$(:b).interm$(TARGET)
-.ENDIF # $(XMLPROPERTIES)!=
-
 .IF 
$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)!=
 .INCLUDE : _tg_sdi.mk
 .ENDIF # 
$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)!=
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 19f44cb..d535f03 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -34,11 +34,6 @@ MKFILENAME:=tg_merge.mk
 $(foreach,i,$(ULFFILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
 .ENDIF
 
-# *.xrb merge
-.IF $(XMLPROPERTIES)!=
-$(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) 
$(LOCALIZESDF)
-.ENDIF
-
 # *.xrm merge
 .IF $(READMEFILES)!=
 $(foreach,i,$(READMEFILES) $(COMMONMISC)/$(TARGET)/$(i:b).xrm) : $$(@:f) 
$(LOCALIZESDF)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6d7ef05..a46e082 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -28,7 +28,6 @@
 # Common tools - move this to the end / consolidate
 TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/transex3
 ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfex
-XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmlex
 XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xrmex
 CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cfgex
 AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

2012-01-15 Thread Ivan Timofeev

 framework/source/services/backingwindow.cxx |   20 ++--
 framework/source/services/backingwindow.hxx |2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1f628c7bf8361086be2044d0d6aa8bbf3f128162
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Sat Jan 14 00:14:45 2012 +0100

The Open... button's more room problem solved fdo#33794

By adding a int i_nExtraWidth parameter to the layoutButton function
there will be enough space for the open button and its black triangle.

diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index a28f80f..2db5879 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -572,33 +572,33 @@ void BackingWindow::initControls()
 }
 
 // layout the buttons
-layoutButton( WRITER_URL, 0, aFileNewAppsAvailable,
+layoutButton( WRITER_URL, 0, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SWRITER,
   maWriterButton, aMnemns );
-layoutButton( DRAW_URL, 1, aFileNewAppsAvailable,
+layoutButton( DRAW_URL, 1, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SDRAW,
   maDrawButton, aMnemns );
 nYPos += maButtonImageSize.Height() + 10;
-layoutButton( CALC_URL, 0, aFileNewAppsAvailable,
+layoutButton( CALC_URL, 0, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SCALC,
   maCalcButton, aMnemns );
-layoutButton( BASE_URL, 1, aFileNewAppsAvailable,
+layoutButton( BASE_URL, 1, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SDATABASE,
   maDBButton, aMnemns );
 nYPos += maButtonImageSize.Height() + 10;
-layoutButton( IMPRESS_WIZARD_URL, 0, aFileNewAppsAvailable,
+layoutButton( IMPRESS_WIZARD_URL, 0, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SIMPRESS,
   maImpressButton, aMnemns );
-layoutButton( MATH_URL, 1, aFileNewAppsAvailable,
+layoutButton( MATH_URL, 1, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SMATH,
   maMathButton, aMnemns );
 
 nYPos += 3*maButtonImageSize.Height() / 2;
 
-layoutButton( NULL, 0, aFileNewAppsAvailable,
+layoutButton( NULL, 0, 18, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SWRITER,
   maOpenButton, aMnemns, maOpenString );
-layoutButton( NULL, 1, aFileNewAppsAvailable,
+layoutButton( NULL, 1, 0, aFileNewAppsAvailable,
   aModuleOptions, SvtModuleOptions::E_SWRITER,
   maTemplateButton, aMnemns, maTemplateString );
 nYPos += 10;
@@ -664,7 +664,7 @@ void BackingWindow::loadImage( const ResId i_rId, 
PushButton i_rButton )
 }
 
 void BackingWindow::layoutButton(
-  const char* i_pURL, int nColumn,
+  const char* i_pURL, int nColumn, int i_nExtraWidth,
   const std::setrtl::OUString i_rURLS,
   SvtModuleOptions i_rOpt, SvtModuleOptions::EModule 
i_eMod,
   PushButton i_rBtn,
@@ -690,7 +690,7 @@ void BackingWindow::layoutButton(
 
 long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
-nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the 
safe side
+nTextWidth += maButtonImageSize.Width() + 8 + i_nExtraWidth; // add some 
fuzz to be on the safe side
 if( nColumn = 0  nColumn  
static_castint(SAL_N_ELEMENTS(mnColumnWidth)) )
 {
 if( nTextWidth  mnColumnWidth[nColumn] )
diff --git a/framework/source/services/backingwindow.hxx 
b/framework/source/services/backingwindow.hxx
index 410862f..179a632 100644
--- a/framework/source/services/backingwindow.hxx
+++ b/framework/source/services/backingwindow.hxx
@@ -144,7 +144,7 @@ namespace framework
 
 void loadImage( const ResId i_rId, PushButton i_rButton );
 
-void layoutButton( const char* i_pURL, int nColumn, const 
std::setrtl::OUString i_rURLS,
+void layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, 
const std::setrtl::OUString i_rURLS,
SvtModuleOptions i_rOpt, SvtModuleOptions::EModule 
i_eMod,
PushButton i_rBtn,
MnemonicGenerator i_rMnemonicGen,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/scripts set_soenv.in

2012-01-15 Thread David Tardon

 config_host.mk.in  |2 +-
 configure.in   |4 ++--
 desktop/Module_desktop.mk  |5 -
 desktop/Package_scripts.mk |8 
 desktop/scripts/Makefile   |6 +-
 set_soenv.in   |3 ---
 6 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c475316c00056ab2c59438fb78705c2a851f292b
Author: David Tardon dtar...@redhat.com
Date:   Sat Jan 14 10:23:57 2012 +0100

simplify handling of JITC_PROCESSOR_TYPE

diff --git a/config_host.mk.in b/config_host.mk.in
index 280c844..f8b0d81 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -173,7 +173,7 @@ export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
-export JITC_PROCESSOR_TYPE_EXPORT=@JITC_PROCESSOR_TYPE_EXPORT@
+export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export KDE4_CFLAGS=@KDE4_CFLAGS@
 export KDE4_LIBS=@KDE4_LIBS@
diff --git a/configure.in b/configure.in
index cef039e..84c1dcc 100644
--- a/configure.in
+++ b/configure.in
@@ -4309,13 +4309,13 @@ dnl empty or non-empty.
 
 dnl SOLAR_JAVA= indicate no java support at all
 
+JITC_PROCESSOR_TYPE=
 if test $_os = Linux  test $host_cpu = powerpc; then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
-JITC_PROCESSOR_TYPE_EXPORT=export 
JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
+AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = WINNT; then
 WITH_VC_REDIST=TRUE
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ed2c1fe..17fe079 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -71,14 +71,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
-ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
 Package_soffice_sh \
 ))
 endif
 endif
 endif
-endif
 
 ifeq ($(OS),WNT)
 
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 7611765..9492306 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -46,14 +46,6 @@ $(eval $(call 
gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
-ifneq ($(OS),MACOSX)
-ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
-
-endif
-endif
-
 endif
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile
index 349c5dd..a654b6b 100644
--- a/desktop/scripts/Makefile
+++ b/desktop/scripts/Makefile
@@ -26,7 +26,11 @@
 # instead of those above.
 
 soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
-   sed -e 
s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/ $  $@
+ifneq ($(JITC_PROCESSOR_TYPE),)
+   sed -e s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export 
JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/ $  $@
+else
+   cp $ $@
+endif
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/set_soenv.in b/set_soenv.in
index e558deb..53b388f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -888,9 +888,6 @@ if (@ENABLE_WERROR@ eq FALSE) {
 ToFile( EXTERNAL_WARNINGS_NOT_ERRORS, TRUE,  e );
 }
 ToFile( PROEXT,$PROEXT,e );
-if ($platform =~ m/linux/  $platform =~ m/powerpc/) {
-ToFile( JITC_PROCESSOR_TYPE,6, e );
-}
 ToFile( nodep, @nodep@,  e );
 ToFile( TARFILE_LOCATION,  $TARFILE_LOCATION,  e );
 
commit f4092cb7657b0a403078d593cb612431858150ca
Author: David Tardon dtar...@redhat.com
Date:   Sat Jan 14 15:28:10 2012 +0100

do not build on macosx and win

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 267cc2c..ed2c1fe 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -68,12 +68,17 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Pagein_impress \
 Pagein_writer \
 ))
+
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
 ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
 Package_soffice_sh \
 ))
 endif
 endif
+endif
+endif
 
 ifeq ($(OS),WNT)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - solenv/gbuild

2012-01-15 Thread Matus Kukan

 solenv/gbuild/Helper.mk |4 
 solenv/gbuild/UnoApiTarget.mk   |   11 ---
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |   13 -
 solenv/gbuild/platform/com_GCC_defs.mk  |2 --
 solenv/gbuild/platform/solaris.mk   |4 +---
 5 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 82633cdad36083e537886b832483f4e73263735a
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 15:04:07 2012 +0100

gbuild: simplify gb_Helper_abbreviate_dirs*

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 84e6cd9..9655424 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -47,6 +47,10 @@ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR))  \
 $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR)  $(subst 
$(WORKDIR)/,$$W/,$(1)
 endef
 
+define gb_Helper_abbreviate_dirs_native
+$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1)))
+endef
+
 define gb_Helper_make_clean_target
 gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4aa2a91..e0d6f12 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -241,11 +241,6 @@ gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) 
| $(gb_AWK) -- '{ prin
 gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ 
print tolower(substr($$0,1,1)) substr($$0,2) }')
 
-define gb_Helper_abbreviate_dirs_native
-R=$(gb_Helper_REPODIR_NATIVE)  $(subst $(REPODIR)/,$$R/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE)  
W=$(gb_Helper_WORKDIR_NATIVE)  S=$(gb_Helper_SRCDIR_NATIVE)))  \
-$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst 
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst 
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst 
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst 
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst 
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
-endef
-
 gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 
 # convert parameters filesystem root to native notation
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 33aa936..9e055ed 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -160,5 +160,3 @@ $(1)
 endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index afb9629..c826bea 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -139,8 +139,6 @@ gb_COMPILERNOOPTFLAGS :=
 
 # Helper class
 
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
 gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
 # $(1): list of directory pathnames to append at the end of the ld path
@@ -382,7 +380,7 @@ endef
 # Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that
 # do not have the right suffix, so use makedepend here...
 define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs_native,\
+$(call gb_Helper_abbreviate_dirs,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(INCLUDE) \
$(DEFS) \
commit 39c347b2d9ffe285160e13207a4df79d0972cbce
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 14:38:37 2012 +0100

gbuild: platform/WNT_INTEL_MSC: use subst in gb_Helper_convert_native

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0c953f1..4aa2a91 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -252,10 +252,10 @@ gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
-$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
-$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
-$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
+$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
+$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
 $(1)
 endef
 
commit 6cd9c42eb69202bb16b975e227f8870729465fbc
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Sun Jan 15 14:33:10 2012 +0100

gbuild: UnoApiTarget: refactor slightly

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 426d967..704659b 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -225,15 +225,12 @@ define gb_UnoApiTarget__command
 endef
 
 define

[Libreoffice-commits] .: sal/qa sal/rtl

2012-01-15 Thread Stephan Bergmann

 sal/qa/osl/mutex/osl_Mutex.cxx |8 
 sal/rtl/source/uri.cxx |6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 5eea018d806f96e70c42e6d26922bb6a0c35d466
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sun Jan 15 22:42:25 2012 +0100

Clang -Wdangling-else, -Wuninitialized.

diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index f4f34d6..745f35b 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -266,7 +266,7 @@ protected:
 {
 // block here if the mutex has been acquired
 Mutex* pGlobalMutex;
-pGlobalMutex = pGlobalMutex-getGlobalMutex( );
+pGlobalMutex = Mutex::getGlobalMutex( );
 pGlobalMutex-acquire( );
 printf(# Global Mutex acquired. \n );
 pGlobalMutex-release( );
@@ -522,7 +522,7 @@ namespace osl_Mutex
 void getGlobalMutex_001()
 {
 Mutex* pGlobalMutex;
-pGlobalMutex = pGlobalMutex-getGlobalMutex();
+pGlobalMutex = Mutex::getGlobalMutex();
 pGlobalMutex-acquire();
 
 GlobalMutexThread myThread;
@@ -545,11 +545,11 @@ namespace osl_Mutex
 sal_Bool bRes;
 
 Mutex *pGlobalMutex;
-pGlobalMutex = pGlobalMutex-getGlobalMutex( );
+pGlobalMutex = Mutex::getGlobalMutex( );
 pGlobalMutex-acquire( );
 {
 Mutex *pGlobalMutex1;
-pGlobalMutex1 = pGlobalMutex1-getGlobalMutex( );
+pGlobalMutex1 = Mutex::getGlobalMutex( );
 bRes = pGlobalMutex1-release( );
 }
 
diff --git a/sal/rtl/source/uri.cxx b/sal/rtl/source/uri.cxx
index af5da83..2c42abb 100644
--- a/sal/rtl/source/uri.cxx
+++ b/sal/rtl/source/uri.cxx
@@ -391,7 +391,9 @@ void parseUriRef(rtl_uString const * pUriRef, Components * 
pComponents)
 sal_Unicode const * pPos = pBegin;
 
 if (pPos != pEnd  isAlpha(*pPos))
+{
 for (sal_Unicode const * p = pPos + 1; p != pEnd; ++p)
+{
 if (*p == ':')
 {
 pComponents-aScheme.pBegin = pBegin;
@@ -401,7 +403,11 @@ void parseUriRef(rtl_uString const * pUriRef, Components * 
pComponents)
 }
 else if (!isAlpha(*p)  !isDigit(*p)  *p != '+'  *p != '-'
   *p != '.')
+{
 break;
+}
+}
+}
 
 if (pEnd - pPos = 2  pPos[0] == '/'  pPos[1] == '/')
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: stoc/source

2012-01-15 Thread Stephan Bergmann

 stoc/source/security/lru_cache.h |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2ca0ab44b4c0f028aa246c28da8fbff0c79a87b4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sun Jan 15 22:55:08 2012 +0100

Clang -Wunused-variable.

diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index d4b5a8e..6853a37 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -242,6 +242,7 @@ inline void lru_cache t_key, t_val, t_hashKey, t_equalKey 
::set(
 #ifdef __CACHE_DIAGNOSE
 OSL_ENSURE( insertion.second, ### inserting new cache entry 
failed?! );
 #endif
+(void) insertion; // avoid warnings
 }
 else
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/inc tools/source

2012-01-15 Thread Takeshi Abe

 tools/inc/tools/resmgr.hxx  |2 --
 tools/source/fsys/tdir.cxx  |2 --
 tools/source/fsys/unx.hxx   |2 --
 tools/source/fsys/wntmsc.hxx|2 --
 tools/source/generic/config.cxx |2 --
 tools/source/rc/resmgr.cxx  |4 
 6 files changed, 14 deletions(-)

New commits:
commit 1074c1ab9ee4aa537ea18a3128121ef591bd803f
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Jan 16 07:38:19 2012 +0900

removed unused macro

diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index 7e7e7ce..8000e5a 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -37,8 +37,6 @@
 #define CREATEVERSIONRESMGR_NAME( Name )   #Name
 #define CREATEVERSIONRESMGR( Name )ResMgr::CreateResMgr( 
CREATEVERSIONRESMGR_NAME( Name ) )
 
-#define LOCALE_MAX_FALLBACK 6
-
 #include vector
 
 class SvStream;
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index eef2a03..0747c70 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -39,8 +39,6 @@
 
 DBG_NAME( Dir )
 
-#define APPEND (sal_uInt16) 65535
-
 /*
 |*
 |*Dir::InsertPointReached()
diff --git a/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index a930f83..d6e74e1 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.hxx
@@ -35,9 +35,7 @@
 #include sys/param.h
 #include dirent.h
 #include unistd.h
-/* #include sysent.h */
 
-#define FSYS_UNIX TRUE
 #define DRIVE_EXISTS(c) ( TRUE )
 
 #define _mkdir(p)   mkdir(p, 0777)
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index b7b3391..6cda2a1 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -45,8 +45,6 @@
 
 //
 
-#define FSYS_UNIX sal_False
-
 #define DOS_DIRECT  _A_SUBDIR
 #define DOS_VOLUMEID0x08
 #ifndef S_IFBLK
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index ed21da9..dc0c08b 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -45,8 +45,6 @@
 #include osl/security.h
 #include rtl/strbuf.hxx
 
-#define MAXBUFLEN   1024// Fuer Buffer bei VOS-Funktionen
-
 // -
 // - ImplConfigData -
 // -
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 5bc5d2c..68c8b4c 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -57,15 +57,11 @@
 #include set
 
 #ifdef UNX
-#define SEARCH_PATH_DELIMITER_CHAR_STRING :
 #define SEARCH_PATH_DELIMITER ':'
 #else
-#define SEARCH_PATH_DELIMITER_CHAR_STRING ;
 #define SEARCH_PATH_DELIMITER ';'
 #endif
 
-#define SEARCH_PATH_DELIMITER_STRING ::rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SEARCH_PATH_DELIMITER_CHAR_STRING ) )
-
 using ::rtl::OUString;
 using ::rtl::OString;
 using ::rtl::OUStringBuffer;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[Libreoffice-commits] .: framework/source

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/scripts set_soenv.in

[Libreoffice-commits] .: 3 commits - solenv/gbuild

[Libreoffice-commits] .: sal/qa sal/rtl

[Libreoffice-commits] .: stoc/source

[Libreoffice-commits] .: tools/inc tools/source

7 matches

Site Navigation

Mail list logo

Footer information