CWS-TOOLING: integrate CWS fwk160

comphelper/inc/comphelper/documentconstants.hxx

@@ -111,3 +111,41 @@
 #define ODFVER_012_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_012_TEXT_ASCII ) )
 #endif
 
+// filter flags
+// TODO/LATER: The flags should be part of the UNO specification
+#define SFX_FILTER_IMPORT            0x00000001L
+#define SFX_FILTER_EXPORT            0x00000002L
+#define SFX_FILTER_TEMPLATE          0x00000004L
+#define SFX_FILTER_INTERNAL          0x00000008L
+#define SFX_FILTER_TEMPLATEPATH      0x00000010L
+#define SFX_FILTER_OWN               0x00000020L
+#define SFX_FILTER_ALIEN             0x00000040L
+#define SFX_FILTER_USESOPTIONS       0x00000080L
+
+#define SFX_FILTER_DEFAULT           0x00000100L
+#define SFX_FILTER_EXECUTABLE        0x00000200L
+#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
+#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
+#define SFX_FILTER_NOTINFILEDLG      0x00001000L
+#define SFX_FILTER_NOTINCHOOSER      0x00002000L
+#define SFX_FILTER_ASYNC             0x00004000L
+#define SFX_FILTER_CREATOR           0x00008000L
+#define SFX_FILTER_OPENREADONLY      0x00010000L
+#define SFX_FILTER_MUSTINSTALL       0x00020000L
+#define SFX_FILTER_CONSULTSERVICE    0x00040000L
+
+#define SFX_FILTER_STARONEFILTER     0x00080000L
+#define SFX_FILTER_PACKED            0x00100000L
+#define SFX_FILTER_SILENTEXPORT      0x00200000L
+
+#define SFX_FILTER_BROWSERPREFERED   0x00400000L
+
+#define SFX_FILTER_ENCRYPTION        0x01000000L
+#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
+
+#define SFX_FILTER_PREFERED          0x10000000L
+
+#define SFX_FILTER_VERSION_NONE      0
+#define SFX_FILTER_NOTINSTALLED      SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
+
+

comphelper/inc/comphelper/mimeconfighelper.hxx

@@ -32,6 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
@@ -50,6 +51,8 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterFactory;
+
 public:
 
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
@@ -106,6 +109,10 @@ public:
     ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
 
     // typedetection related
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
+
+    sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+
     ::rtl::OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         sal_Bool bIgnoreType );
@@ -117,6 +124,14 @@ public:
 
     ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
 
+    ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
+                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
+                        sal_Int32 nMustFlags,
+                        sal_Int32 nDontFlags );
+
     static sal_Bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 );
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,

unotools/source/ucbhelper/tempfile.cxx

@@ -237,7 +237,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
 /* RW permission for the user only! */
  mode_t old_mode = umask(077);
 #endif
-            FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
+            FileBase::RC err = aFile.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock );
 #ifdef UNX
 umask(old_mode);
 #endif