CWS-TOOLING: integrate CWS dba31d

2008-12-08 16:22:07 +0100 rt  r265005 : Remove DOS lineends
2008-12-05 13:56:24 +0100 fs  r264906 : #i10000# removed unreachable statement
2008-11-20 11:41:26 +0100 fs  r264037 : merged in the fix for #i95865# (it was wrongly committed to CWS dba32a, should have been here)
2008-11-20 11:34:24 +0100 fs  r264036 : line ends
2008-11-14 08:44:50 +0100 lla  r263665 : #i10000# comparsion between int and uint fixed
2008-11-13 13:31:12 +0100 lla  r263641 : #i10000# build problem fixed
2008-11-13 11:20:01 +0100 lla  r263625 : #i96130# hard code name of extension
2008-11-12 11:13:41 +0100 fs  r263582 : #i96096# when opening a SRB-report fails due to the missing SRB extension, log this as warning only, and proceed with the migration
2008-11-12 11:11:35 +0100 fs  r263581 : #i96096# ContentType handling. Now all contents deliver proper results in XContent::getContentType
2008-11-12 11:10:11 +0100 fs  r263580 : #i96096# new ctors taking UNO_QUERY_THROW
2008-11-11 10:10:13 +0100 lla  r263546 : CWS-TOOLING: rebase CWS dba31d to trunk@263288 (milestone: DEV300:m35)
2008-11-06 15:55:39 +0100 oj  r263393 : #i93452# get field from model fallbackis the name
2008-11-06 15:31:47 +0100 oj  r263392 : #i93465# remeber location of floating windows
2008-11-06 13:36:24 +0100 oj  r263381 : #i93450# check typemap for null
2008-11-06 13:28:49 +0100 oj  r263379 : #i93020# empty column list boxes when new relation should be created
2008-11-06 12:33:53 +0100 oj  r263377 : #i93012# set border to default : flat
2008-11-06 12:26:54 +0100 oj  r263375 : #i74927# do some less calls for odbc
2008-11-06 09:34:01 +0100 oj  r263362 : #i93383# grabFocus in suspend to get allmodified cells
2008-11-03 21:01:39 +0100 oj  r263308 : #i86739# check if slash can be valid for tables
2008-11-03 14:40:21 +0100 oj  r263287 : #i86739# check if slash can be valid for tables
2008-11-03 14:32:17 +0100 oj  r263286 : #i95227# column width 
2008-11-03 14:27:26 +0100 oj  r263285 : link fwe
2008-11-03 14:24:54 +0100 oj  r263284 : #i95235# changed to hold no ref only weak
2008-10-31 11:21:48 +0100 oj  r262859 : #i93459# set images add menu entry
2008-10-31 09:06:37 +0100 oj  r262851 : #i88629# correct fileopen filter for database odb files
2008-10-30 15:01:04 +0100 oj  r262828 : #i95229# set filter at the composer
2008-10-29 15:57:41 +0100 oj  r262817 : #i95235# changed to hold no ref only weak
2008-10-29 15:57:19 +0100 oj  r262816 : #i95235# changed to hold no ref only weak
2008-10-29 15:57:03 +0100 oj  r262815 : #i95235# changed to hold no ref only weak
2008-10-29 15:56:15 +0100 oj  r262814 : #i95235# filtermanger changed to hold no ref only weak
2008-10-29 10:32:39 +0100 oj  r262773 : #i93474# use correct table name
2008-10-28 13:49:33 +0100 lla  r262744 : #i95524# make an Invalidate and refresh on Tables
2008-10-28 10:45:02 +0100 fs  r262707 : line ends
2008-10-28 10:34:42 +0100 fs  r262706 : #i95522# don't expect the component to live in a TopWindow
2008-10-28 08:30:40 +0100 lla  r262696 : #i93176# set preview mode on view
2008-10-28 07:56:57 +0100 oj  r262694 : merge cvs svn
2008-10-27 14:13:51 +0100 oj  r262673 : #i94129# use dummy data
2008-10-27 12:38:45 +0100 fs  r262669 : #i94125# rework ScrollColumns
2008-10-23 15:53:57 +0200 oj  r262624 : #i94568# do not load the embeddedobj just copy the storage
2008-10-23 14:39:14 +0200 oj  r262622 : #i94129# handle chart correctly
2008-10-22 10:51:19 +0200 lla  r262582 : #i94115# problem with left walk chart shape fixed
2008-10-22 07:47:48 +0200 oj  r262576 : #i94455# rename now do not use remove insert
2008-10-22 07:47:27 +0200 oj  r262575 : #i94455# rename now do not use remove insert
2008-10-21 12:46:26 +0200 lla  r262567 : #i93845# extra check if default schema doesn't exists, fix assertion

2 files changed, 33 insertions, 0 deletions

diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index 22e992183706..fb0e955d496c 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -48,6 +48,9 @@
 
 namespace comphelper {
 
+sal_Bool COMPHELPER_DLLPUBLIC IsValidZipEntryFileName(
+    const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
+
 class COMPHELPER_DLLPUBLIC OStorageHelper
 {
 public:
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 177d974f8cb4..667d1bdaa20a 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -400,5 +400,35 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
     return xTempStorage;
 }
 
+
+// ----------------------------------------------------------------------
+sal_Bool IsValidZipEntryFileName(
+    const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed )
+{
+    for ( sal_Int32 i = 0 ; i < nLength ; i++ )
+    {
+        switch ( pChar[i] )
+        {
+            case '\\':
+            case '?':
+            case '<':
+            case '>':
+            case '\"':
+            case '|':
+            case ':':
+                return sal_False;
+            case '/':
+                if ( !bSlashAllowed )
+                    return sal_False;
+                break;
+            default:
+                if ( pChar[i] < 32  || pChar[i] > 127 )
+                    return sal_False;
+// Note: in case this ever supports unicode, watch out for surrogate pairs!
+        }
+    }
+    return sal_True;
+}
+
 }