Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
	cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
	l10ntools/scripts/localize.pl
	l10ntools/source/directory.cxx
	l10ntools/source/srciter.cxx
	padmin/Executable_spadmin.bin.mk
	padmin/Library_spa.mk
	svtools/inc/svtools/filter.hxx
	svtools/inc/svtools/grfmgr.hxx
	svtools/source/filter/filter.cxx
	svtools/source/filter/filter2.cxx
	svtools/source/filter/wmf/emfwr.cxx
	svtools/source/filter/wmf/enhwmf.cxx
	svtools/source/filter/wmf/winmtf.cxx
	svtools/source/filter/wmf/winmtf.hxx
	svtools/source/filter/wmf/winwmf.cxx
	svtools/source/filter/wmf/wmfwr.cxx
	svtools/source/graphic/grfmgr.cxx
	svtools/source/graphic/grfmgr2.cxx
	toolkit/source/controls/controlmodelcontainerbase.cxx
	toolkit/source/controls/unocontrol.cxx
	toolkit/source/helper/formpdfexport.cxx
	toolkit/source/helper/unowrapper.cxx
	vcl/Package_osx.mk
	vcl/aqua/source/app/salinst.cxx
	vcl/aqua/source/app/salsys.cxx
	vcl/aqua/source/dtrans/aqua_service.cxx
	vcl/aqua/source/dtrans/test_aquacb.cxx
	vcl/aqua/source/res/makefile.mk
	vcl/aqua/source/window/salframe.cxx
	vcl/aqua/source/window/salframeview.mm
	vcl/inc/aqua/salgdi.h
	vcl/inc/aqua/salinst.h
	vcl/inc/graphite_adaptors.hxx
	vcl/inc/graphite_cache.hxx
	vcl/inc/graphite_serverfont.hxx
	vcl/inc/impprn.hxx
	vcl/inc/svdata.hxx
	vcl/inc/unx/i18n_status.hxx
	vcl/inc/unx/saldata.hxx
	vcl/inc/unx/salfont.h
	vcl/inc/unx/salinst.h
	vcl/inc/unx/salprn.h
	vcl/inc/unx/salsys.h
	vcl/inc/unx/sm.hxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/graph.hxx
	vcl/inc/vcl/outdev.hxx
	vcl/inc/vcl/polyscan.hxx
	vcl/inc/vcl/svcompat.hxx
	vcl/inc/vcl/svgread.hxx
	vcl/inc/vcl/unobrok.hxx
	vcl/inc/win/salgdi.h
	vcl/inc/win/wincomp.hxx
	vcl/prj/d.lst
	vcl/source/app/dbggui.cxx
	vcl/source/app/idlemgr.cxx
	vcl/source/app/makefile.mk
	vcl/source/app/settings.cxx
	vcl/source/app/sound.cxx
	vcl/source/app/stdtext.cxx
	vcl/source/app/svapp.cxx
	vcl/source/app/svdata.cxx
	vcl/source/app/svmain.cxx
	vcl/source/app/timer.cxx
	vcl/source/app/unohelp.cxx
	vcl/source/components/dtranscomp.cxx
	vcl/source/control/button.cxx
	vcl/source/control/combobox.cxx
	vcl/source/control/ctrl.cxx
	vcl/source/control/edit.cxx
	vcl/source/control/field2.cxx
	vcl/source/control/ilstbox.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmapex.cxx
	vcl/source/gdi/cvtgrf.cxx
	vcl/source/gdi/font.cxx
	vcl/source/gdi/image.cxx
	vcl/source/gdi/imagerepository.cxx
	vcl/source/gdi/impbmp.cxx
	vcl/source/gdi/impgraph.cxx
	vcl/source/gdi/impimagetree.cxx
	vcl/source/gdi/jobset.cxx
	vcl/source/gdi/makefile.mk
	vcl/source/gdi/metaact.cxx
	vcl/source/gdi/outdev.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/outdev5.cxx
	vcl/source/gdi/outdev6.cxx
	vcl/source/gdi/outmap.cxx
	vcl/source/gdi/polyscan.cxx
	vcl/source/gdi/print.cxx
	vcl/source/gdi/print2.cxx
	vcl/source/gdi/region.cxx
	vcl/source/gdi/salgdilayout.cxx
	vcl/source/gdi/sallayout.cxx
	vcl/source/gdi/svcompat.cxx
	vcl/source/gdi/virdev.cxx
	vcl/source/glyphs/gcach_ftyp.cxx
	vcl/source/glyphs/gcach_vdev.cxx
	vcl/source/glyphs/gcach_vdev.hxx
	vcl/source/glyphs/graphite_adaptors.cxx
	vcl/source/glyphs/graphite_cache.cxx
	vcl/source/glyphs/graphite_layout.cxx
	vcl/source/glyphs/graphite_serverfont.cxx
	vcl/source/glyphs/graphite_textsrc.hxx
	vcl/source/glyphs/makefile.mk
	vcl/source/src/makefile.mk
	vcl/source/window/accel.cxx
	vcl/source/window/brdwin.cxx
	vcl/source/window/btndlg.cxx
	vcl/source/window/dialog.cxx
	vcl/source/window/dndevdis.cxx
	vcl/source/window/dockmgr.cxx
	vcl/source/window/dockwin.cxx
	vcl/source/window/floatwin.cxx
	vcl/source/window/introwin.cxx
	vcl/source/window/keycod.cxx
	vcl/source/window/menu.cxx
	vcl/source/window/msgbox.cxx
	vcl/source/window/scrwnd.cxx
	vcl/source/window/split.cxx
	vcl/source/window/splitwin.cxx
	vcl/source/window/status.cxx
	vcl/source/window/syswin.cxx
	vcl/source/window/tabpage.cxx
	vcl/source/window/toolbox.cxx
	vcl/source/window/toolbox2.cxx
	vcl/source/window/window.cxx
	vcl/source/window/window2.cxx
	vcl/source/window/winproc.cxx
	vcl/source/window/wrkwin.cxx
	vcl/unx/generic/app/i18n_cb.cxx
	vcl/unx/generic/app/i18n_ic.cxx
	vcl/unx/generic/app/saldata.cxx
	vcl/unx/generic/app/saldisp.cxx
	vcl/unx/generic/app/salinst.cxx
	vcl/unx/generic/app/wmadaptor.cxx
	vcl/unx/generic/fontmanager/afm_hash.cpp
	vcl/unx/generic/gdi/salbmp.cxx
	vcl/unx/generic/gdi/salgdi3.cxx
	vcl/unx/generic/gdi/xrender_peer.cxx
	vcl/unx/generic/window/salframe.cxx
	vcl/unx/generic/window/salobj.cxx
	vcl/unx/gtk/a11y/makefile.mk
	vcl/unx/gtk/app/gtksys.cxx
	vcl/unx/gtk/app/makefile.mk
	vcl/unx/gtk/window/gtkframe.cxx
	vcl/unx/gtk/window/gtkobject.cxx
	vcl/unx/headless/svpinst.cxx
	vcl/unx/headless/svpinst.hxx
	vcl/unx/headless/svpprn.hxx
	vcl/unx/kde/kdedata.cxx
	vcl/unx/kde/salnativewidgets-kde.cxx
	vcl/unx/kde4/KDESalDisplay.hxx
	vcl/unx/kde4/KDEXLib.cxx
	vcl/unx/kde4/KDEXLib.hxx
	vcl/unx/kde4/VCLKDEApplication.cxx
	vcl/unx/kde4/makefile.mk
	vcl/unx/source/app/makefile.mk
	vcl/unx/source/fontmanager/makefile.mk
	vcl/unx/source/gdi/makefile.mk
	vcl/unx/source/inc/salcursors.h
	vcl/util/linksvp/makefile.mk
	vcl/win/source/app/saldata.cxx
	vcl/win/source/app/salinst.cxx
	vcl/win/source/app/salshl.cxx
	vcl/win/source/gdi/makefile.mk
	vcl/win/source/gdi/salbmp.cxx
	vcl/win/source/gdi/salgdi.cxx
	vcl/win/source/gdi/salgdi2.cxx
	vcl/win/source/gdi/salgdi3.cxx
	vcl/win/source/gdi/salgdi_gdiplus.cxx
	vcl/win/source/gdi/salprn.cxx
	vcl/win/source/gdi/salvd.cxx
	vcl/win/source/gdi/winlayout.cxx
	vcl/win/source/window/salframe.cxx
	vcl/win/source/window/salmenu.cxx
	vcl/win/source/window/salobj.cxx

3 files changed, 104 insertions, 8 deletions

diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index c2db897c0e74..43f60c5b4b19 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -54,7 +54,9 @@ public:
         E_DOPRETTYPRINTING,
         E_WARNALIENFORMAT,
         E_LOADDOCPRINTER,
-        E_ODFDEFAULTVERSION
+        E_ODFDEFAULTVERSION,
+        E_USESHA1INODF12,
+        E_USEBLOWFISHINODF12
     };
 
     // keep enum values sorted that a less or greater compare maps to older and newer versions!
@@ -120,6 +122,12 @@ public:
     void                    SetODFDefaultVersion( ODFDefaultVersion eVersion );
     ODFDefaultVersion       GetODFDefaultVersion() const;
 
+    void                    SetUseSHA1InODF12( sal_Bool bUse );
+    sal_Bool                IsUseSHA1InODF12() const;
+
+    void                    SetUseBlowfishInODF12( sal_Bool bUse );
+    sal_Bool                IsUseBlowfishInODF12() const;
+
     sal_Bool                IsReadOnly( EOption eOption ) const;
 };
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 754c65d63ccf..83aea5d7cc9f 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -79,7 +79,11 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bSaveUnpacked,
                                         bDoPrettyPrinting,
                                         bWarnAlienFormat,
-                                        bLoadDocPrinter;
+                                        bLoadDocPrinter,
+                                        bUseSHA1InODF12,
+                                        bUseBlowfishInODF12;
+
+    SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
 
     sal_Bool                            bROAutoSaveTime,
                                         bROUseUserData,
@@ -95,9 +99,9 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bROWarnAlienFormat,
                                         bRODoPrettyPrinting,
                                         bROLoadDocPrinter,
-                                        bROODFDefaultVersion;
-
-    SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
+                                        bROODFDefaultVersion,
+                                        bROUseSHA1InODF12,
+                                        bROUseBlowfishInODF12;
 
 public:
                             SvtSaveOptions_Impl();
@@ -120,6 +124,9 @@ public:
     sal_Bool                IsPrettyPrintingEnabled( ) const    { return bDoPrettyPrinting; }
     sal_Bool                IsWarnAlienFormat() const           { return bWarnAlienFormat; }
     sal_Bool                IsLoadDocPrinter() const            { return bLoadDocPrinter; }
+    sal_Bool                IsUseSHA1InODF12() const            { return bUseSHA1InODF12; }
+    sal_Bool                IsUseBlowfishInODF12() const        { return bUseBlowfishInODF12; }
+
     SvtSaveOptions::ODFDefaultVersion
                             GetODFDefaultVersion() const        { return eODFDefaultVersion; }
 
@@ -137,6 +144,8 @@ public:
     void                    EnablePrettyPrinting( sal_Bool _bDoPP );
     void                    SetWarnAlienFormat( sal_Bool _bDoPP );
     void                    SetLoadDocPrinter( sal_Bool bNew );
+    void                    SetUseSHA1InODF12( sal_Bool bUse );
+    void                    SetUseBlowfishInODF12( sal_Bool bUse );
     void                    SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eNew );
 
     sal_Bool                IsReadOnly( SvtSaveOptions::EOption eOption ) const;
@@ -279,6 +288,24 @@ void SvtSaveOptions_Impl::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersio
     }
 }
 
+void SvtSaveOptions_Impl::SetUseSHA1InODF12( sal_Bool bUse )
+{
+    if ( !bROUseSHA1InODF12 && bUseSHA1InODF12 != bUse )
+    {
+        bUseSHA1InODF12 = bUse;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetUseBlowfishInODF12( sal_Bool bUse )
+{
+    if ( !bROUseBlowfishInODF12 && bUseBlowfishInODF12 != bUse )
+    {
+        bUseBlowfishInODF12 = bUse;
+        SetModified();
+    }
+}
+
 sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
     sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
@@ -329,6 +356,12 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
         case SvtSaveOptions::E_ODFDEFAULTVERSION :
             bReadOnly = bROLoadDocPrinter;
             break;
+        case SvtSaveOptions::E_USESHA1INODF12:
+            bReadOnly = bROUseSHA1InODF12;
+            break;
+        case SvtSaveOptions::E_USEBLOWFISHINODF12:
+            bReadOnly = bROUseBlowfishInODF12;
+            break;
     }
     return bReadOnly;
 }
@@ -349,6 +382,8 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
 #define INTERNET            13
 #define SAVEWORKINGSET      14
 #define ODFDEFAULTVERSION   15
+#define USESHA1INODF12      16
+#define USEBLOWFISHINODF12  17
 
 Sequence< OUString > GetPropertyNames()
 {
@@ -369,7 +404,9 @@ Sequence< OUString > GetPropertyNames()
         "URL/FileSystem",
         "URL/Internet",
         "WorkingSet",
-        "ODF/DefaultVersion"
+        "ODF/DefaultVersion",
+        "ODF/UseSHA1InODF12",
+        "ODF/UseBlowfishInODF12"
     };
 
     const int nCount = sizeof( aPropNames ) / sizeof( const char* );
@@ -399,6 +436,9 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     , bDoPrettyPrinting( sal_False )
     , bWarnAlienFormat( sal_True )
     , bLoadDocPrinter( sal_True )
+    , bUseSHA1InODF12( sal_False )
+    , bUseBlowfishInODF12( sal_False )
+    , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST )
     , bROAutoSaveTime( CFG_READONLY_DEFAULT )
     , bROUseUserData( CFG_READONLY_DEFAULT )
     , bROBackup( CFG_READONLY_DEFAULT )
@@ -414,7 +454,8 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     , bRODoPrettyPrinting( CFG_READONLY_DEFAULT )
     , bROLoadDocPrinter( CFG_READONLY_DEFAULT )
     , bROODFDefaultVersion( CFG_READONLY_DEFAULT )
-    , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST )
+    , bROUseSHA1InODF12( CFG_READONLY_DEFAULT )
+    , bROUseBlowfishInODF12( CFG_READONLY_DEFAULT )
 {
     Sequence< OUString > aNames = GetPropertyNames();
     Sequence< Any > aValues = GetProperties( aNames );
@@ -527,6 +568,16 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
                                     bROLoadDocPrinter = pROStates[nProp];
                                     break;
 
+                                case USESHA1INODF12:
+                                    bUseSHA1InODF12 = bTemp;
+                                    bROUseSHA1InODF12 = pROStates[nProp];
+                                    break;
+
+                                case USEBLOWFISHINODF12:
+                                    bUseBlowfishInODF12 = bTemp;
+                                    bROUseBlowfishInODF12 = pROStates[nProp];
+                                    break;
+
                                 default :
                                     DBG_ERRORFILE( "invalid index to load a path" );
                             }
@@ -704,6 +755,23 @@ void SvtSaveOptions_Impl::Commit()
                     ++nRealCount;
                 }
                 break;
+            case USESHA1INODF12:
+                if (!bROUseSHA1InODF12)
+                {
+                    pValues[nRealCount] <<= bUseSHA1InODF12;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
+                break;
+            case USEBLOWFISHINODF12:
+                if (!bROUseBlowfishInODF12)
+                {
+                    pValues[nRealCount] <<= bUseBlowfishInODF12;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
+                break;
+
             default:
                 DBG_ERRORFILE( "invalid index to save a path" );
         }
@@ -995,6 +1063,26 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const
     return pImp->pSaveOpt->GetODFDefaultVersion();
 }
 
+void SvtSaveOptions::SetUseSHA1InODF12( sal_Bool bUse )
+{
+    pImp->pSaveOpt->SetUseSHA1InODF12( bUse );
+}
+
+sal_Bool SvtSaveOptions::IsUseSHA1InODF12() const
+{
+    return pImp->pSaveOpt->IsUseSHA1InODF12();
+}
+
+void SvtSaveOptions::SetUseBlowfishInODF12( sal_Bool bUse )
+{
+    pImp->pSaveOpt->SetUseBlowfishInODF12( bUse );
+}
+
+sal_Bool SvtSaveOptions::IsUseBlowfishInODF12() const
+{
+    return pImp->pSaveOpt->IsUseBlowfishInODF12();
+}
+
 sal_Bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
     return pImp->pSaveOpt->IsReadOnly(eOption);
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index abeb9cbb6f80..00f4ffce1e6b 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -345,7 +345,7 @@ static const sal_Unicode aWingDings2Tab[224] =
         0xe5c1,    0xe5c2,    0xe5c3,    0xe5c4,
         0xe5c5,    0xe5c6,    0xe5c7,    0xe5c8,
     // F0f0
-        0xe5c9,    0x2022,    0xe5cb,    0xe5cc,
+        0xe5c9,    0,    0xe5cb,    0xe5cc,
         0xe5cd,    0xe5ce,    0xe5cf,    0xe5d0,
         0x203b,    0x2042,         0,         0,
              0,         0,         0,         0