Merge commit 'libreoffice-3.3.0.2'

13 files changed, 59 insertions, 24 deletions

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b3ce0a34e296..cd69b77b9978 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 3e89c81ebed6..5e54e0bfafe7 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 e26258a5954e..a4b99d361222 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -51,15 +51,16 @@ 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";
     };
+#if ENABLE_HELP_FORMATTING
     FixedText FT_HELPFORMAT
     {
         Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
@@ -82,10 +83,11 @@ TabPage OFA_TP_MISC
             < "High Contrast White" ; > ;
         };
     };
+#endif
     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
@@ -109,62 +111,62 @@ 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( 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";
     };
diff --git a/setup_native/source/mac/broffice/osxdndinstall.png b/setup_native/source/mac/broffice/osxdndinstall.png
index 966f9f7bcffc..cab66ea99784 100644
--- a/setup_native/source/mac/broffice/osxdndinstall.png
+++ b/setup_native/source/mac/broffice/osxdndinstall.png
diff --git a/setup_native/source/mac/broffice/osxdndinstall_nologo.png b/setup_native/source/mac/broffice/osxdndinstall_nologo.png
index 966f9f7bcffc..cab66ea99784 100644
--- a/setup_native/source/mac/broffice/osxdndinstall_nologo.png
+++ b/setup_native/source/mac/broffice/osxdndinstall_nologo.png
diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/mac/ooo/osxdndinstall.png
index f50008f1f810..2ce08fe52f6b 100644
--- a/setup_native/source/mac/ooo/osxdndinstall.png
+++ b/setup_native/source/mac/ooo/osxdndinstall.png
diff --git a/setup_native/source/mac/ooo/osxdndinstall_nologo.png b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
index f50008f1f810..2ce08fe52f6b 100644
--- a/setup_native/source/mac/ooo/osxdndinstall_nologo.png
+++ b/setup_native/source/mac/ooo/osxdndinstall_nologo.png
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 5c8e1e86e20b..47d57452cbd2 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 %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 %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 %LANGUAGESTRING")"
 copyright = "1999-2009 by %PRODUCTNAME"
 solariscopyright = "solariscopyrightfile"
 vendor = "%PRODUCTNAME"
diff --git a/setup_native/source/win32/nsis/brobitmap.bmp b/setup_native/source/win32/nsis/brobitmap.bmp
index 680c643bff56..75dc163eb719 100644
--- a/setup_native/source/win32/nsis/brobitmap.bmp
+++ b/setup_native/source/win32/nsis/brobitmap.bmp
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp b/setup_native/source/win32/nsis/ooobitmap.bmp
index 11acb28b1aad..25b5b11bed20 100644
--- a/setup_native/source/win32/nsis/ooobitmap.bmp
+++ b/setup_native/source/win32/nsis/ooobitmap.bmp
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
index 11acb28b1aad..25b5b11bed20 100644
--- a/setup_native/source/win32/nsis/ooosdkbitmap.bmp
+++ b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
diff --git a/setup_native/source/win32/nsis/ooosetup.ico b/setup_native/source/win32/nsis/ooosetup.ico
index bed4687fb0a2..2d43f2b4b2c6 100644
--- a/setup_native/source/win32/nsis/ooosetup.ico
+++ b/setup_native/source/win32/nsis/ooosetup.ico
diff --git a/setup_native/source/win32/nsis/urebitmap.bmp b/setup_native/source/win32/nsis/urebitmap.bmp
index 11acb28b1aad..25b5b11bed20 100755
--- a/setup_native/source/win32/nsis/urebitmap.bmp
+++ b/setup_native/source/win32/nsis/urebitmap.bmp