[ooo-build-commit] Branch 'ooo/master' - 3 commits - sfx2/source sysui/desktop xmlhelp/source

[Jan Holesovsky]

 sfx2/source/appl/appcfg.cxx                  |    8 ++++----
 sysui/desktop/tg_rpm.mk                      |    2 --
 xmlhelp/source/com/sun/star/help/makefile.mk |    1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 2b4d4cba6d03e852a3947a3d4d18c967ddd6e26d
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Sep 21 11:39:40 2009 +0000

    #i10000# makes no sense

diff --git a/sysui/desktop/tg_rpm.mk b/sysui/desktop/tg_rpm.mk
index 6389515..269ff27 100644
--- a/sysui/desktop/tg_rpm.mk
+++ b/sysui/desktop/tg_rpm.mk
@@ -31,9 +31,7 @@
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
-.IF "L10N_framework"==""
 ALLTAR : $(RPMFLAGFILES)
-.ENDIF
 
 $(RPMFLAGFILES) : $(SPECFILE)
     @-$(MKDIRHIER) $(@:d)
commit d3fa76eeae17062acac48784c2484074fbe1b8b9
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Sep 21 10:31:34 2009 +0000

    #i10000# #i105236# added dep

diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index 75823ce..1e1a2c5 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -96,6 +96,7 @@ CUSTOMMANIFESTFILE = MANIFEST.MF
 ALLTAR : $(ADDFILES)
 
 .IF "$(JARTARGETN)"!=""
+$(JARTARGETN) : $(ADDFILES)
 $(JARTARGETN) : $(COMP)
 .ENDIF
 
commit f146e2df578788d426589d3bcd26435f81f49388
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Sep 21 10:29:39 2009 +0000

    #i10000# removed debug code

diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 8f18b37..172c584 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1049,10 +1049,10 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync
         return;
 
 #ifdef DBG_UTIL
-    ::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
-    ByteString aTmp( "SfxEvent: ");
-    aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-    DBG_TRACE( aTmp.GetBuffer() );
+    //::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
+    //ByteString aTmp( "SfxEvent: ");
+    //aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
+    //DBG_TRACE( aTmp.GetBuffer() );
 #endif
 
     if ( bSynchron )