[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - codemaker/source extensions/source instsetoo_native/res sc/source solenv/bin

[Ariel Constenla-Haile]

 codemaker/source/javamaker/classfile.cxx   |    6 ++++--
 extensions/source/activex/main/makefile.mk |    6 ++++--
 instsetoo_native/res/nologoinstall.bmp     |binary
 sc/source/ui/optdlg/tpcalc.cxx             |   11 +++++++++++
 sc/source/ui/src/optdlg.src                |    3 ++-
 solenv/bin/make_installer.pl               |    2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 3c8d9a3e00bb62a98d375898ff30b8dfcc670ca9
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Mon Feb 25 14:09:43 2013 +0000

    i117782 - Re-size controls according to the optimal size

diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index eab9018..608b6f6 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -112,6 +112,17 @@ __EXPORT ScTpCalcOptions::~ScTpCalcOptions()
 
 void ScTpCalcOptions::Init()
 {
+    const Size a6Size = aFtPrec.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
+    const Size aMin = aFtPrec.CalcMinimumSize();
+    const Point aPos = aFtPrec.GetPosPixel();
+    const long nNewX = aPos.X() + aFtPrec.GetSizePixel().Width() - aMin.Width();
+
+    aFtPrec.SetPosPixel( Point( nNewX, aPos.Y() ) );
+    aFtPrec.SetSizePixel( aMin );
+    aBtnGeneralPrec.SetSizePixel( Size(
+        nNewX - a6Size.Width() - aBtnGeneralPrec.GetPosPixel().X(),
+        aBtnGeneralPrec.GetSizePixel().Height() ) );
+
     aBtnIterate .SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
     aBtnGeneralPrec.SetClickHdl( LINK(this, ScTpCalcOptions, CheckClickHdl) );
     aBtnDateStd .SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index b8c5332..782396b 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -160,8 +160,9 @@ TabPage RID_SCPAGE_CALC
     {
         HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC";
         Pos = MAP_APPFONT ( 12 , 147 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
+        Size = MAP_APPFONT ( 148 , 26 ) ;
         Text [ en-US ] = "Limit decimals for general number format" ;
+        WordBreak = TRUE ;
     };
     FixedText FT_PREC
     {
commit f94bdb4d6184ece5b2cafebd2ede207ef331cf16
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Feb 25 13:30:46 2013 +0000

    #121456# ifdef atlthunk.lib

diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index d3c9b7d..76c8f44 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -137,8 +137,10 @@ SHL1STDLIBS_X64+=\
 SHL1OBJS_X64=$(SLOFILES_X64)
 SHL1DEF_X64=$(TARGET).def
 
-SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib  $(ATL_LIB_X64)$/atlthunk.lib 
-
+SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atls.lib 
+.IF "$(HAVE_ATLTHUNK)" == "YES"
+    SHL1STDLIBS_X64+= $(ATL_LIB_X64)$/atlthunk.lib
+.ENDIF
 .ENDIF # "$(BUILD_X64)"!=""
 
 # --- Targets ----------------------------------
commit 04a187ccdd160ba251541bf210b893fc1e138134
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Feb 25 11:56:37 2013 +0000

    #121802 add temporary changed installer image

diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp
index 8fc53c5..66807c1 100644
Binary files a/instsetoo_native/res/nologoinstall.bmp and b/instsetoo_native/res/nologoinstall.bmp differ
commit 6b0d8ec082c2da9e5be2e815f29ca009a1714a0d
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Feb 25 11:52:05 2013 +0000

    #121388# tweak special handling for dev buuidls on MacOS

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 41f8428..fe8c944 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -339,7 +339,7 @@ if ( $installer::globals::iswindowsbuild ) { installer::control::read_encodingli
 ####################################################################
 # MacOS dmg build requires special DS_Store file to arrange icons
 ####################################################################
-if (($installer::globals::ismacdmgbuild) && ($installer::globals::product eq "OpenOffice_Dev")) { $installer::globals::devsnapshotbuild = 1; }
+if (($installer::globals::ismacdmgbuild) && ($installer::globals::product =~ /OpenOffice_Dev/)) { $installer::globals::devsnapshotbuild = 1; }
 
 #####################################################################
 # Including additional inc files for variable settings, if defined
commit 4e4dec8630e67f717c0fb968435cd5e1d85d9965
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Feb 25 07:53:56 2013 +0000

    #i121098# use a classfile format compatible with at least JDK 5/6/7
    
    According to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7078419
    JDK 7 and up will never support classfile formats 48 or earlier because
    they lack generic signature attributes. Our current baseline is JDK 5
    anyway which has the classfile format 49
    (see e.g. http://en.wikipedia.org/wiki/Java_class_file or the JVM spec)
    
    Suggested by: Pedro Giffuni <pfg at apache.org>

diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index f824eb2..1f154c7 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -692,10 +692,12 @@ void ClassFile::addMethod(
     appendSignatureAttribute(m_methods, signature);
 }
 
+#define CLASSFILE_FMT 49.0 // a classfile format understood by JDK 5/6/7
+
 void ClassFile::write(FileStream & file) const {
     writeU4(file, 0xCAFEBABE);
-    writeU2(file, 0);
-    writeU2(file, 46);
+    writeU2(file, static_cast<sal_uInt16>((CLASSFILE_FMT-(int)CLASSFILE_FMT)*100000));
+    writeU2(file, static_cast<sal_uInt16>((int)CLASSFILE_FMT));
     writeU2(file, m_constantPoolCount);
     writeStream(file, m_constantPool);
     writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));