[Libreoffice-commits] .: 14 commits - cui/source setup_native/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Dec 20 04:20:11 PST 2010
cui/source/options/optgdlg.cxx | 26 ++++++++++
cui/source/options/optgdlg.hrc | 19 +++++--
cui/source/options/optgdlg.src | 34 +++++++-------
setup_native/source/mac/broffice/osxdndinstall.png |binary
setup_native/source/mac/broffice/osxdndinstall_nologo.png |binary
setup_native/source/mac/ooo/osxdndinstall.png |binary
setup_native/source/mac/ooo/osxdndinstall_nologo.png |binary
setup_native/source/packinfo/packinfo_brand.txt | 4 -
setup_native/source/win32/nsis/brobitmap.bmp |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
setup_native/source/win32/nsis/ooosetup.ico |binary
setup_native/source/win32/nsis/urebitmap.bmp |binary
13 files changed, 59 insertions(+), 24 deletions(-)
New commits:
commit 99ea2c07b814880930c7e04c4e0a846865b715e6
Merge: 92af49f... b67926b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 01:15:58 2010 +0100
Merge commit 'libreoffice-3.3.0.2'
commit b67926ba6bd659390b18351cf0795198ea7cdfd0
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 20:35:15 2010 +0100
Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit 5de9a4a1aef05c2510b4d9e966fb56743f6abb98
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 22:22:04 2010 +0100
fix langpack dependencies after move to helppack
draw, impress langapckages does not lonegr exist; they included
just help
help package is optional, so there should not be hard dependency
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 5c8e1e8..47d5745 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -128,8 +128,8 @@ Start
module = "gid_Module_Langpack_Brand"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING"
-requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
-solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGE
STRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")"
+requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer"
+solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAG
ESTRING")"
copyright = "1999-2009 by %PRODUCTNAME"
solariscopyright = "solariscopyrightfile"
vendor = "%PRODUCTNAME"
commit 62ec5368d43ae47500921b43571ebede8ac0422e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 12:38:54 2010 +0100
put helppack packinfo in a separate file
diff --git a/setup_native/source/packinfo/packinfo_office_help.txt b/setup_native/source/packinfo/packinfo_office_help.txt
new file mode 100755
index 0000000..93ff70c
--- /dev/null
+++ b/setup_native/source/packinfo/packinfo_office_help.txt
@@ -0,0 +1,36 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+Start
+module = "gid_Module_Helppack_Help"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
+provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
+copyright = "1999-2009 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
+End
+
+
+# END OF Language depended package definitions
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 8a79431..69d9e1e 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -65,22 +65,6 @@ pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
End
Start
-module = "gid_Module_Langpack_Help"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
-packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help"
-provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help"
-requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING"
-copyright = "1999-2009 by OpenOffice.org"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING"
-destpath = "/opt"
-packageversion = "%OOOPACKAGEVERSION"
-pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01"
-End
-
-Start
module = "gid_Module_Langpack_Writer"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING"
commit 70b0313d28bda1b3c594809eba15c7369a2484ec
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Dec 14 16:33:28 2010 +0000
Use BrOffice branding on Windows keyed to locale/country-code not exename
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index 30ee215..226c3ca 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -278,10 +278,9 @@ Function SetupBranding
File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
- ; use broffice specific branding if executable name begins BrOffice
- StrCpy $0 $EXEFILE 8
-; messageBox MB_OK "ExeName: $0 - chopped $EXEFILE"
- StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+ ; use broffice specific branding if we are in Brazil
+; messageBox MB_OK "Language: $LANGUAGE"
+ StrCmp $LANGUAGE "1046" BrOfficeSplash DefaultSplash
DefaultSplash:
; messageBox MB_OK "LibreOffice"
SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
commit 9a14ab77f2437812c48f7c221f18a4f3d2ed8271
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Dec 6 23:15:19 2010 -0500
Put the ODMA dialog check box on its own row.
* Put the ODMA dialog check box on its own row, and push everything
downward to make some room.
* Remove the Help Formatting controls to make more room. Without this
the enable experimental check box would go outside the visible area
on Mac.
This fixes fdo#32133.
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 293cfc3..dbbabf2 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -221,6 +221,11 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
{
FreeResource();
+#if not ENABLE_HELP_FORMATTING
+ aHelpFormatFT.Hide();
+ aHelpFormatLB.Hide();
+#endif
+
if (!lcl_HasSystemFilePicker())
{
aFileDlgFL.Hide();
@@ -238,6 +243,27 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aODMADlgCB.Hide();
#endif
+ if (!aODMADlgCB.IsVisible())
+ {
+ // rearrange the following controls
+ Point aNewPos = aPrintDlgFL.GetPosPixel();
+ long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
+
+ Window* pWins[] =
+ {
+ &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
+ &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB
+ };
+ Window** pCurrent = pWins;
+ const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
+ for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
+ {
+ aNewPos = (*pCurrent)->GetPosPixel();
+ aNewPos.Y() -= nDelta;
+ (*pCurrent)->SetPosPixel( aNewPos );
+ }
+ }
+
if ( !aFileDlgCB.IsVisible() )
{
// rearrange the following controls
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 425e608..4247de3 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -30,6 +30,8 @@
// defines for positions and sizes ---------------------------------------
+#define ENABLE_HELP_FORMATTING 0
+
#define WHOLE_WIDTH 248
#define EDIT_WIDTH 30
#define UNIT_WIDTH 40
@@ -46,19 +48,24 @@
#define ROWSPACE RSC_SP_CTRL_DESC_Y
#define ROW0 3
#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#if ENABLE_HELP_FORMATTING
#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#else
+#define ROW2 (ROW1)
+#endif
#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW7 (ROW6 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW8 (ROW7 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW9 (ROW8 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW10 (ROW9 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW9 (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW10 (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW12 (ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW13 (ROW12+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
+#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 5b14e93..e2c3478 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -60,6 +60,7 @@ TabPage OFA_TP_MISC
Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
+#if ENABLE_HELP_FORMATTING
FixedText FT_HELPFORMAT
{
Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
@@ -82,6 +83,7 @@ TabPage OFA_TP_MISC
< "High Contrast White" ; > ;
};
};
+#endif
CheckBox CB_HELPAGENT
{
Pos = MAP_APPFONT( COL1, ROW3 );
@@ -109,62 +111,62 @@ TabPage OFA_TP_MISC
CheckBox CB_FILEDLG
{
Pos = MAP_APPFONT( COL1, ROW5 );
- Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
CheckBox CB_ODMADLG
{
- Pos = MAP_APPFONT( COL3, ROW5 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL4, RSC_CD_CHECKBOX_HEIGHT );
+ Pos = MAP_APPFONT( COL1, ROW6 );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Show ODMA DMS dialogs first";
Text [ en-GB ] = "Show ODMA DMS dialogues first";
};
FixedLine FL_PRINTDLG
{
- Pos = MAP_APPFONT( COL0, ROW6 );
+ Pos = MAP_APPFONT( COL0, ROW7 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Print dialogs";
};
CheckBox CB_PRINTDLG
{
- Pos = MAP_APPFONT( COL1, ROW7 );
+ Pos = MAP_APPFONT( COL1, ROW8 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
};
FixedLine FL_DOCSTATUS
{
- Pos = MAP_APPFONT( COL0, ROW8 );
+ Pos = MAP_APPFONT( COL0, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Document status";
};
CheckBox CB_DOCSTATUS
{
- Pos = MAP_APPFONT( COL1, ROW9 );
+ Pos = MAP_APPFONT( COL1, ROW10 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Printing sets \"document modified\" status";
};
CheckBox CB_SAVE_ALWAYS
{
- Pos = MAP_APPFONT( COL1, ROW10 );
+ Pos = MAP_APPFONT( COL1, ROW11 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Allow to save document even when the document is not modified";
};
FixedLine FL_TWOFIGURE
{
- Pos = MAP_APPFONT( COL0, ROW11 );
+ Pos = MAP_APPFONT( COL0, ROW12 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Year (two digits)" ;
};
FixedText FT_INTERPRET
{
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
+ Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Interpret as years between";
};
NumericField NF_YEARVALUE
{
Border = TRUE ;
- Pos = MAP_APPFONT( COL4, ROW12 );
+ Pos = MAP_APPFONT( COL4, ROW13 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Minimum = 1583 ;
Maximum = 9857 ;
@@ -173,13 +175,13 @@ TabPage OFA_TP_MISC
};
FixedText FT_TOYEAR
{
- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
+ Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
CheckBox CB_EXPERIMENTAL
{
- Pos = MAP_APPFONT( COL0, ROW13 );
+ Pos = MAP_APPFONT( COL1, ROW15 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Enable experimental (unstable) features";
};
commit 76debb82e9bf4c520febb86f5390052e4b8a545e
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Dec 6 22:29:38 2010 -0500
Make the ODMA check box clickable again. (fdo#32132)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index f26c3e4..5b14e93 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -109,7 +109,7 @@ TabPage OFA_TP_MISC
CheckBox CB_FILEDLG
{
Pos = MAP_APPFONT( COL1, ROW5 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
CheckBox CB_ODMADLG
commit a8fc429c6f0a19d7bf8e7aee2a9614498dd89c95
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Dec 6 22:21:21 2010 -0500
Make 'Reset help agent' button clickable again. (fdo#32132)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 7d0a80c..f26c3e4 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -85,7 +85,7 @@ TabPage OFA_TP_MISC
CheckBox CB_HELPAGENT
{
Pos = MAP_APPFONT( COL1, ROW3 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Help Agent";
};
PushButton PB_HELPAGENT_RESET
commit 117ea10a00ab0dad44c6968ddd5c04e2325d083d
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Dec 1 17:05:57 2010 -0500
Fixed the sizes of Tips and Extended tips check boxes.
The Tips check box control was too wide and it was overlapping with
the Extended tips check box, which prevented it from being clickable.
(fdo#32028)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 7cbb741..7d0a80c 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -51,13 +51,13 @@ TabPage OFA_TP_MISC
CheckBox CB_TOOLTIP
{
Pos = MAP_APPFONT( COL1, ROW1 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Tips";
};
CheckBox CB_EXTHELP
{
Pos = MAP_APPFONT( COL3, ROW1 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
+ Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
FixedText FT_HELPFORMAT
commit 5a392ae6dca41d9bd32eb874d32aee16c649649b
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Dec 1 15:55:51 2010 +0100
Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1)
commit 7f88095c37714f83261adb1992368bcf182813de
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Nov 30 13:56:15 2010 +0000
first pass at BrOffice artwork branding
diff --git a/setup_native/source/win32/nsis/downloadtemplate.nsi b/setup_native/source/win32/nsis/downloadtemplate.nsi
index 9784212..30ee215 100644
--- a/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -5,12 +5,13 @@
SetCompressor lzma
; SetCompressor zlib
+; Helpful for debugging, disable for products
+; RequestExecutionLevel user
; MUI 1.67 compatible ------
!include "MUI.nsh"
Function .onInit
-
Call GetParameters
Pop $1
;MessageBox MB_OK "$1"
@@ -206,6 +207,8 @@ FunctionEnd
!define MUI_WELCOMEPAGE_TITLE_3LINES
!define MUI_ABORTWARNING
!define MUI_ICON "SETUPICOPLACEHOLDER"
+!define MUI_CUSTOMFUNCTION_GUIINIT SetupBranding
+!define MUI_CUSTOMFUNCTION_UNGUIINIT SetupBranding
; Welcome page
!insertmacro MUI_PAGE_WELCOME
@@ -269,6 +272,29 @@ FunctionEnd
; Language files
ALLLANGUAGESPLACEHOLDER
+Function SetupBranding
+ File "/oname=$PLUGINSDIR\modern-header.bmp" BANNERBMPPLACEHOLDER
+ File "/oname=$PLUGINSDIR\modern-header-br.bmp" BANNERBMPPLACEHOLDER_BR
+ File "/oname=$PLUGINSDIR\modern-wizard.bmp" WELCOMEBMPPLACEHOLDER
+ File "/oname=$PLUGINSDIR\modern-wizard-br.bmp" WELCOMEBMPPLACEHOLDER_BR
+
+ ; use broffice specific branding if executable name begins BrOffice
+ StrCpy $0 $EXEFILE 8
+; messageBox MB_OK "ExeName: $0 - chopped $EXEFILE"
+ StrCmp $0 "BrOffice" BrOfficeSplash DefaultSplash
+ DefaultSplash:
+; messageBox MB_OK "LibreOffice"
+ SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
+ !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
+ GoTo atEnd
+ BrOfficeSplash:
+; messageBox MB_OK "BrOffice"
+ SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header-br.bmp"
+ !insertmacro INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard-br.bmp"
+ GoTo atEnd
+ atEnd:
+FunctionEnd
+
; Reserve files
;!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
@@ -278,7 +304,6 @@ Name "PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER"
OutFile "OUTPUTDIRPLACEHOLDER\DOWNLOADNAMEPLACEHOLDER"
; InstallDir "$DESKTOP\PRODUCTNAMEPLACEHOLDER PRODUCTVERSIONPLACEHOLDER Installation Files"
; ShowInstDetails show
-
Section "MainSection" SEC01
ALLFILESPLACEHOLDER
SectionEnd
commit 5c39508219d79f84289f6e79ac72a618274da0ef
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Tue Nov 30 13:40:18 2010 +0100
Adds OxygenOffice extras as configurable optional
Introduces:
--enable-extra-gallery - for additional galleries
--enable-extra-template - for additional templates
--enable-extra-sample - for additional samples
--enable-extra-font - for additional fonts
configure options.
diff --git a/setup_native/source/packinfo/packinfo_accessories.txt b/setup_native/source/packinfo/packinfo_accessories.txt
new file mode 100644
index 0000000..6b6e780
--- /dev/null
+++ b/setup_native/source/packinfo/packinfo_accessories.txt
@@ -0,0 +1,73 @@
+# Format:
+
+# Start
+# scpModule
+# shellscript file (optional)
+# solarispackagename
+# solarisrequires (optional)
+# solarisprovides (optional)
+# packagename
+# linuxreplaces (optional)
+# requires (optional)
+# provides (optional)
+# copyright
+# vendor
+# description
+# destpath
+# End
+
+# Package definitions for OxygenOffice Professional
+# 1/3 Gallery
+
+Start
+module = "gid_Module_Optional_Accessories_Gallery"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 2/3 Fonts
+
+Start
+module = "gid_Module_Optional_Accessories_Fonts"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+# 3/3 Templates - Common
+
+Start
+module = "gid_Module_Optional_Accessories_Tem_Common"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common"
+solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01"
+copyright = "1999-2008 by %PRODUCTNAME"
+solariscopyright = "solariscopyrightfile"
+vendor = "%PRODUCTNAME"
+description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
+
+
+# END OF Package definitions for OxygenOffice Professional
+
commit 6fad93e9b6c856c24befa88f17a30def9f304022
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Nov 30 00:21:04 2010 +0100
Updated artwork for rc
diff --git a/setup_native/source/mac/broffice/osxdndinstall.png b/setup_native/source/mac/broffice/osxdndinstall.png
index 966f9f7..cab66ea 100644
Binary files a/setup_native/source/mac/broffice/osxdndinstall.png and b/setup_native/source/mac/broffice/osxdndinstall.png differ
diff --git a/setup_native/source/mac/broffice/osxdndinstall_nologo.png b/setup_native/source/mac/broffice/osxdndinstall_nologo.png
index 966f9f7..cab66ea 100644
Binary files a/setup_native/source/mac/broffice/osxdndinstall_nologo.png and b/setup_native/source/mac/broffice/osxdndinstall_nologo.png differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
index f50008f..2ce08fe 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall.png and b/setup_native/source/mac/ooo/osxdndinstall.png differ
diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
index f50008f..2ce08fe 100644
Binary files a/setup_native/source/mac/ooo/osxdndinstall_nologo.png and b/setup_native/source/mac/ooo/osxdndinstall_nologo.png differ
diff --git a/setup_native/source/win32/nsis/brobitmap.bmp b/setup_native/source/win32/nsis/brobitmap.bmp
index 680c643..75dc163 100644
Binary files a/setup_native/source/win32/nsis/brobitmap.bmp and b/setup_native/source/win32/nsis/brobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp
index 11acb28..25b5b11 100644
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index 11acb28..25b5b11 100644
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
index bed4687..2d43f2b 100644
Binary files a/setup_native/source/win32/nsis/ooosetup.ico and b/setup_native/source/win32/nsis/ooosetup.ico differ
diff --git a/setup_native/source/win32/nsis/urebitmap.bmp b/setup_native/source/win32/nsis/urebitmap.bmp
index 11acb28..25b5b11 100755
Binary files a/setup_native/source/win32/nsis/urebitmap.bmp and b/setup_native/source/win32/nsis/urebitmap.bmp differ
commit bcdaee3492ff5449ca567abf001d4df4be012a2d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Nov 27 16:28:14 2010 +0000
Resolves: rhbz#657628# divide by zero
(cherry picked from commit cde18c8978d2c680dbee88159246024960cdc705)
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 159c8af..98c6546 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -743,21 +743,23 @@ void SaneDlg::AcquirePreview()
maReslBox.SetValue( (ULONG)fResl );
if( mbDragEnable )
+ {
maPreviewRect = Rectangle( maTopLeft,
Size( maBottomRight.X() - maTopLeft.X(),
maBottomRight.Y() - maTopLeft.Y() )
);
+ }
else
{
Size aBMSize( maPreviewBitmap.GetSizePixel() );
- if( aBMSize.Width() > aBMSize.Height() )
+ if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() )
{
int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width();
maPreviewRect = Rectangle( Point( maTopLeft.X(), ( maTopLeft.Y() + maBottomRight.Y() )/2 - nVHeight/2 ),
Size( maBottomRight.X() - maTopLeft.X(),
nVHeight ) );
}
- else
+ else if (aBMSize.Height())
{
int nVWidth = (maBottomRight.Y() - maTopLeft.Y()) * aBMSize.Width() / aBMSize.Height();
maPreviewRect = Rectangle( Point( ( maTopLeft.X() + maBottomRight.X() )/2 - nVWidth/2, maTopLeft.Y() ),
More information about the Libreoffice-commits
mailing list