[ooo-build-commit] .: 3 commits - distro-configs/CommonLinux.conf.in distro-configs/CommonWin32.conf.in patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Thu May 6 07:06:03 PDT 2010
distro-configs/CommonLinux.conf.in | 2
distro-configs/CommonWin32.conf.in | 2
patches/dev300/about-build-ver-readability.diff | 26 +--
patches/dev300/about-dialog-cleanup.diff | 169 ++++++++++++++++++++++++
patches/dev300/apply | 7
patches/dev300/sw-64bit-Size-mismatch.diff | 15 ++
6 files changed, 206 insertions(+), 15 deletions(-)
New commits:
commit cb2458497702aa4c3e1bc975d3d193c66a9e4320
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu May 6 14:54:08 2010 +0200
ooo-build version in the about dialog
* distro-configs/CommonLinux.conf.in:
* distro-configs/CommonWin32.conf.in: use "ooo-build x.y.z" instead of
"Build x.y.x" in the about dialog; it is more clear; also the string
is just below the upstream's "OOOXmy (Build:z), so we should not use
two "Build" strings so close
diff --git a/distro-configs/CommonLinux.conf.in b/distro-configs/CommonLinux.conf.in
index 2ae23aa..4f9925d 100644
--- a/distro-configs/CommonLinux.conf.in
+++ b/distro-configs/CommonLinux.conf.in
@@ -1,6 +1,6 @@
--disable-epm
--with-openldap
---with-build-version=\"Build @OOO_BUILDVERSION@\"
+--with-build-version=\"ooo-build @OOO_BUILDVERSION@\"
--without-fonts
--with-system-jpeg
--with-system-libxml
diff --git a/distro-configs/CommonWin32.conf.in b/distro-configs/CommonWin32.conf.in
index d0c8e34..eeaf269 100644
--- a/distro-configs/CommonWin32.conf.in
+++ b/distro-configs/CommonWin32.conf.in
@@ -1,3 +1,3 @@
--with-ant-home=$BUILDDIR/apache-ant-1.7.0
---with-build-version=\"Build `date +%Y-%m-%d`\"
+--with-build-version=\"ooo-build `date +%Y-%m-%d`\"
--with-vba-package-format=builtin
commit b59bb80d07a02e03de0e666cc00d76de9db056c0
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu May 6 14:37:37 2010 +0200
about dialog improvements
about-dialog-cleanup.diff, i#111425, pmladek
* patches/dev300/about-dialog-cleanup.diff: put back the ooo-build version;
allow to cut&paste the versions; remove the strange border around the
copyright text
* patches/dev300/apply: apply the above patch
* patches/dev300/about-build-ver-readability.diff: fix to apply after
about-dialog-cleanup.diff
diff --git a/patches/dev300/about-build-ver-readability.diff b/patches/dev300/about-build-ver-readability.diff
index ed65111..6257cb3 100644
--- a/patches/dev300/about-build-ver-readability.diff
+++ b/patches/dev300/about-build-ver-readability.diff
@@ -1,14 +1,14 @@
---- sfx2/source/dialog/about.cxx
-+++ sfx2/source/dialog/about.cxx
-@@ -222,11 +222,6 @@
- aCopyrightText.SetControlForeground( aTextColor );
- aBuildData.SetBackground( aWall );
+--- sfx2/source/dialog/about.cxx.old 2010-05-05 20:28:50.000000000 +0200
++++ sfx2/source/dialog/about.cxx 2010-05-05 20:30:50.000000000 +0200
+@@ -223,11 +223,6 @@ AboutDialog::AboutDialog( Window* pParen
+ aCopyrightText.SetControlForeground( aTextColor );
+ aBuildData.SetBackground( aWall );
-- Font aSmallFont = rSettings.GetInfoFont();
-- Size aSmaller = aNewFont.GetSize();
-- aSmaller.Width() = (long) (aSmaller.Width() * 0.75);
-- aSmaller.Height() = (long) (aSmaller.Height() * 0.75);
-- aNewFont.SetSize( aSmaller );
- aBuildData.SetFont( aNewFont );
- aBuildData.SetBackground( aWall );
- #ifdef BUILD_VER_STRING
+- Font aSmallFont = rSettings.GetInfoFont();
+- Size aSmaller = aNewFont.GetSize();
+- aSmaller.Width() = (long) (aSmaller.Width() * 0.75);
+- aSmaller.Height() = (long) (aSmaller.Height() * 0.75);
+- aNewFont.SetSize( aSmaller );
+ aBuildData.SetFont( aNewFont );
+ aBuildData.SetBackground( aWall );
+ // FIXME: What is the purpose of the build data?
diff --git a/patches/dev300/about-dialog-cleanup.diff b/patches/dev300/about-dialog-cleanup.diff
new file mode 100644
index 0000000..43167ac
--- /dev/null
+++ b/patches/dev300/about-dialog-cleanup.diff
@@ -0,0 +1,169 @@
+--- svx/source/intro/ooo.src.old 2010-04-22 10:27:38.000000000 +0200
++++ svx/source/intro/ooo.src 2010-05-05 20:28:50.000000000 +0200
+@@ -75,22 +75,28 @@ ModalDialog RID_DEFAULTABOUT
+ Pos = MAP_APPFONT ( 174 , 6 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ };
+- FixedText ABOUT_FTXT_VERSION
++ MultiLineEdit ABOUT_FTXT_VERSION
+ {
++ Border = FALSE ;
+ Pos = MAP_APPFONT ( 54 , 6 ) ;
+ Size = MAP_APPFONT ( 118 , 16 ) ;
+- WordBreak = TRUE ;
+- Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
++ IgnoreTab = TRUE ;
++ ReadOnly = TRUE ;
++ AutoVScroll = TRUE ;
+ };
+ MultiLineEdit ABOUT_FTXT_COPYRIGHT
+ {
+- Border = TRUE ;
++ Border = FALSE ;
+ Pos = MAP_APPFONT ( 54 , 25 ) ;
+ Size = MAP_APPFONT ( 168 , 51 ) ;
+ IgnoreTab = TRUE ;
+ ReadOnly = TRUE ;
+ AutoVScroll = TRUE ;
+ };
++ String ABOUT_STR_VERSION
++ {
++ Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION";
++ };
+ String ABOUT_STR_COPYRIGHT
+ {
+ Text[ en-US ] = "Copyright © 2000, 2010 Oracle and/or its affiliates. All rights reserved.\nThis product was created by " OOO_VENDOR ", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
+--- sfx2/inc/sfx2/sfx.hrc.old 2010-04-22 10:27:38.000000000 +0200
++++ sfx2/inc/sfx2/sfx.hrc 2010-05-05 20:28:50.000000000 +0200
+@@ -216,7 +216,8 @@
+ #define ABOUT_STR_DEVELOPER_ARY 1
+ #define ABOUT_STR_FRENCH_COPYRIGHT 2
+ #define ABOUT_STR_ACCEL 3
+-#define ABOUT_STR_COPYRIGHT 4
++#define ABOUT_STR_VERSION 4
++#define ABOUT_STR_COPYRIGHT 5
+
+ #define RID_APPTITLE (RID_SFX_START+4)
+ #define RID_BUILDVERSION (RID_SFX_START+5)
+--- sfx2/inc/about.hxx.old 2010-04-22 10:27:38.000000000 +0200
++++ sfx2/inc/about.hxx 2010-05-05 20:28:50.000000000 +0200
+@@ -47,7 +47,7 @@ private:
+ OKButton aOKButton;
+ Image aAppLogo;
+
+- FixedInfo aVersionText;
++ MultiLineEdit aVersionText;
+ MultiLineEdit aCopyrightText;
+ FixedInfo aBuildData;
+
+@@ -55,6 +55,7 @@ private:
+ String aDevVersionStr;
+ String aAccelStr;
+ String aVersionData;
++ String aVersionTextStr;
+ String aCopyrightTextStr;
+
+ AccelList aAccelList;
+--- sfx2/source/dialog/about.cxx.old 2010-04-22 10:27:38.000000000 +0200
++++ sfx2/source/dialog/about.cxx 2010-05-05 20:28:50.000000000 +0200
+@@ -67,22 +67,6 @@
+ #define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" )
+
+ // class AboutDialog -----------------------------------------------------
+-static void layoutText( FixedInfo &rText, long &nY, long nTextWidth, Size a6Size )
+-{
+- Point aTextPos = rText.GetPosPixel();
+- aTextPos.X() = a6Size.Width() * 2;
+- aTextPos.Y() = nY;
+- rText.SetPosPixel( aTextPos );
+-
+- Size aTxtSiz = rText.GetSizePixel();
+- aTxtSiz.Width() = nTextWidth;
+- Size aCalcSize = rText.CalcMinimumSize( nTextWidth );
+- aTxtSiz.Height() = aCalcSize.Height();
+- rText.SetSizePixel( aTxtSiz );
+-
+- nY += aTxtSiz.Height();
+-}
+-
+ static bool impl_loadBitmap(
+ const rtl::OUString &rPath, const rtl::OUString &rBmpFileName,
+ Image &rLogo )
+@@ -116,10 +100,12 @@ AboutDialog::AboutDialog( Window* pParen
+ aOKButton ( this, ResId( ABOUT_BTN_OK, *rId.GetResMgr() ) ),
+ aVersionText ( this, ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ),
+ aCopyrightText ( this, ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ),
++ // FIXME: What is the purpose of the aBuildData when it is not connected to any widget?
+ aBuildData ( this ),
+ aDeveloperAry ( ResId( ABOUT_STR_DEVELOPER_ARY, *rId.GetResMgr() ) ),
+ aDevVersionStr ( rVerStr ),
+ aAccelStr ( ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ),
++ aVersionTextStr( ResId( ABOUT_STR_VERSION, *rId.GetResMgr() ) ),
+ aCopyrightTextStr( ResId( ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) ),
+ aTimer (),
+ nOff ( 0 ),
+@@ -185,10 +171,15 @@ AboutDialog::AboutDialog( Window* pParen
+ SetFont( aFont );
+
+ // if necessary more info
+- String sVersion = aVersionText.GetText();
++ String sVersion = aVersionTextStr;
+ sVersion.SearchAndReplaceAscii( "$(VER)", Application::GetDisplayName() );
+ sVersion += '\n';
+ sVersion += rVerStr;
++#ifdef BUILD_VER_STRING
++ String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) );
++ sVersion += '\n';
++ sVersion += aBuildString;
++#endif
+ aVersionText.SetText( sVersion );
+
+ // Initialisierung fuer Aufruf Entwickler
+@@ -239,28 +230,37 @@ AboutDialog::AboutDialog( Window* pParen
+ aNewFont.SetSize( aSmaller );
+ aBuildData.SetFont( aNewFont );
+ aBuildData.SetBackground( aWall );
+-#ifdef BUILD_VER_STRING
+- String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) );
+-#else
+- String aBuildString;
+-#endif
+- aBuildData.SetText( aBuildString );
++ // FIXME: What is the purpose of the build data?
++ // they are not showed even when set, so???
++ String aBuildDataString;
++ aBuildData.SetText( aBuildDataString );
+ aBuildData.Show();
+
++ aCopyrightText.SetText( aCopyrightTextStr );
++
+ // determine size and position of the dialog & elements
+ Size aAppLogoSiz = aAppLogo.GetSizePixel();
+ Size aOutSiz = GetOutputSizePixel();
+ aOutSiz.Width() = aAppLogoSiz.Width();
+
++ // analyze size of the aVersionText widget
++ // character size
+ Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
++ // preferred Version widget size
++ Size aVTSize = aVersionText.CalcMinimumSize();
+ long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
+- long nDlgMargin = a6Size.Width() * 4 ;
+- long nCtrlMargin = a6Size.Height() * 2;
++ long nDlgMargin = a6Size.Width() * 3 ;
++ long nCtrlMargin = aVTSize.Height() + ( a6Size.Height() * 2 );
+ long nTextWidth = aOutSiz.Width() - nDlgMargin;
+
+- aCopyrightText.SetText( aCopyrightTextStr );
++ // finally set the aVersionText widget position and size
++ Size aVTCopySize = aVTSize;
++ Point aVTCopyPnt;
++ aVTCopySize.Width() = nTextWidth;
++ aVTCopyPnt.X() = ( aOutSiz.Width() - aVTCopySize.Width() ) / 2;
++ aVTCopyPnt.Y() = nY;
++ aVersionText.SetPosSizePixel( aVTCopyPnt, aVTCopySize );
+
+- layoutText( aVersionText, nY, nTextWidth, a6Size );
+ nY += nCtrlMargin;
+
+ // OK-Button-Position (at the bottom and centered)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a610f92..bdb796c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -537,6 +537,10 @@ i93000.diff, i#93000, atimar
# buried in cws-vbasupportdev300
#fix-uiconfiguration-insert.diff, i#105154, noelpwer
+[ Branding ]
+# put back the ooo-build version; allow to cut&paste the versions; remove the strange border around the license
+about-dialog-cleanup.diff, i#111425, pmladek
+
[ RadioButtons ]
forms-radio-button-group-names.diff, n#310052, i#30823, jonp
# depends on forms-radio-button-group-names.diff,
commit 96a8ee121ad968b92353111b21b4b323de45842c
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed May 5 11:33:48 2010 +0200
graphical bullets invisible after saving documents on 64bit Linux (i#101131)
* patches/dev300/sw-64bit-Size-mismatch.diff:
* patches/dev300/apply: add Caolan's cast fix (i#101131)
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d21bd80..a610f92 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2414,6 +2414,9 @@ oooXXXX.partial-revert-ooo95118.diff
# it helps to get automatic depencies when packaging extensions in RPMs
ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
+# graphical bullets invisible after saving documents on 64bit Linux
+sw-64bit-Size-mismatch.diff, i#101131, caolan
+
[ CairoFonts ]
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
ooo59127.vcl.honourcairofont.diff
diff --git a/patches/dev300/sw-64bit-Size-mismatch.diff b/patches/dev300/sw-64bit-Size-mismatch.diff
new file mode 100644
index 0000000..375dc21
--- /dev/null
+++ b/patches/dev300/sw-64bit-Size-mismatch.diff
@@ -0,0 +1,15 @@
+diff -r 03068afc23c6 sw/source/core/unocore/unosett.cxx
+--- sw/source/core/unocore/unosett.cxx Sun Apr 25 15:43:24 2010 +0100
++++ sw/source/core/unocore/unosett.cxx Tue Apr 27 16:55:25 2010 +0100
+@@ -1659,9 +1659,8 @@
+ aPropertyValues.Insert(pData, aPropertyValues.Count());
+ }
+ Size aSize = rFmt.GetGraphicSize();
+- aSize.Width() = TWIP_TO_MM100( aSize.Width() );
+- aSize.Height() = TWIP_TO_MM100( aSize.Height() );
+- pData = new PropValData((void*)&aSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
++ awt::Size aAwtSize(TWIP_TO_MM100(aSize.Width()), TWIP_TO_MM100(aSize.Height()));
++ pData = new PropValData((void*)&aAwtSize, SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
+ aPropertyValues.Insert(pData, aPropertyValues.Count());
+
+ const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
More information about the ooo-build-commit
mailing list