summaryrefslogtreecommitdiff
path: root/fpicker/source
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 11:54:14 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 11:54:14 +0000
commit84daf70e3219642a13abdfbf2c030d414ebaac43 (patch)
tree22179f732a18f434d0ad912c8a15ba00dbd98330 /fpicker/source
parenta472657291aacedbbe87a38194a744e25ed1ac1d (diff)
CWS-TOOLING: integrate CWS vcl100
2009-03-26 21:27:56 +0100 pl r270106 : #i10000# fix an include path missing when using configure 2009-03-16 12:18:24 +0100 pl r269518 : #i98963# revert change 2009-03-13 14:56:47 +0100 pl r269483 : #i98980# work around a mysterious crash 2009-03-12 20:02:48 +0100 pl r269440 : resolve some warnings 2009-03-12 19:30:32 +0100 pl r269439 : resolve some warnings 2009-03-12 18:07:47 +0100 pl r269432 : solve some warnings 2009-03-12 09:07:33 +0100 hdu r269358 : #i100134# remove obsolete RCS/CVS keywords from source 2009-03-11 21:18:28 +0100 pl r269355 : #i100134# change sft.h and ttcr.h to c++ headers 2009-03-11 20:19:15 +0100 pl r269353 : #i100134# remove some ugly C style lists 2009-03-11 18:19:35 +0100 hdu r269347 : #i100134# make psprint.fontsubset source C++ and make it compile 2009-03-11 14:44:35 +0100 hdu r269334 : #i99862# fix justification of vocalized hebrew (thanks hennerdrewes) 2009-03-11 13:40:35 +0100 pl r269327 : CWS-TOOLING: rebase CWS vcl100 to trunk@269297 (milestone: DEV300:m43) 2009-03-10 16:49:34 +0100 hdu r269284 : #i1000020# add style-matching heuristics for single-char stylenames 2009-03-10 15:42:53 +0100 hdu r269278 : use fast ASCII-matching for extracting attributes from PSName 2009-03-09 16:29:08 +0100 pl r269200 : #i98980# skip bundles that are not NP plugins 2009-03-09 13:26:14 +0100 hdu r269083 : #i99868# fix text breaking for large nCharExtra 2009-03-09 12:20:01 +0100 hdu r269078 : #i99868# fix text breaking for large nCharExtra 2009-03-06 17:35:27 +0100 pl r269032 : #i98980# mouse events 2009-03-06 17:10:14 +0100 pl r269024 : #i98980# flash animations, initial paint problem 2009-03-05 20:00:21 +0100 pl r268939 : #i98980# more plugin support 2009-03-05 15:35:06 +0100 pl r268914 : #i98980# first twitches of a live plugin 2009-03-05 15:34:10 +0100 pl r268913 : #i98980# access to carbon headers 2009-03-04 15:46:29 +0100 pl r268839 : #i98980# generalize vcl SystemChildWindow from QTMovieView to NSView 2009-03-04 15:40:20 +0100 pl r268838 : #i98980# generalize vcl SystemChildWindow from QTMovieView to NSView 2009-03-04 11:30:49 +0100 hdu r268801 : #i99722# for OSX any anisotropy reported for the display resolution is best ignored 2009-03-02 15:52:21 +0100 pl r268655 : #i99770# fix ambiguous looking if statements (thanks cmc) 2009-03-02 13:28:17 +0100 pl r268649 : #i99770# fix ambiguous looking if statements (thanks cmc) 2009-02-27 15:39:30 +0100 pl r268603 : #i97512# omit degenrate current matrix 2009-02-27 12:37:29 +0100 pl r268579 : #i99716# remove unused code (thanks cmc) 2009-02-27 11:21:18 +0100 pl r268569 : #i99705 remove unused code (thanks cmc) 2009-02-23 10:42:00 +0100 pl r268345 : #i99492# remove a typo (thanks tono) 2009-02-19 12:46:21 +0100 pl r268274 : #i99411# add new mimetype 2009-02-10 12:57:59 +0100 pl r267548 : #i98980# more aqua plugin changes 2009-02-06 16:50:34 +0100 pl r267475 : #i98980# plugin detection 2009-02-06 16:46:48 +0100 pl r267474 : #i98980# make debug compilation work 2009-02-06 12:16:37 +0100 pl r267449 : #98963# add missing wrapper 2009-02-04 20:06:59 +0100 pl r267402 : #i97135# work around a gcc x64 optimizer bug 2009-02-04 13:45:36 +0100 pl r267380 : #159153# do not emit empty glyph vector 2009-02-03 17:47:16 +0100 pl r267338 : #i98533# recent gtk versions do not support GTK_MODULES for accessibility anymore 2009-02-03 10:39:46 +0100 pl r267305 : #i97146# check if the idle formatted view is still valid 2009-01-28 11:23:23 +0100 pl r267045 : #i42227# #i48965# refinement of check markings images 2009-01-27 19:40:01 +0100 pl r267016 : #i42227# #i48965# change menus wrt checkmarks and images
Diffstat (limited to 'fpicker/source')
-rw-r--r--fpicker/source/office/iodlgimp.cxx38
-rw-r--r--fpicker/source/office/iodlgimp.hxx4
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx2
3 files changed, 1 insertions, 43 deletions
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 4f53008eda3d..3a34c1da7be6 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -131,44 +131,6 @@ namespace
}
//*****************************************************************************
-
-String GetRegularExpression_Impl( const String& rFilter )
-{
- String aFilter = rFilter;
- aFilter.EraseLeadingChars().EraseTrailingChars();
- String aRegExp = '^';
-
- for ( const sal_Unicode *pc = aFilter.GetBuffer(); *pc; ++pc )
- {
- if ( '*' == *pc )
- aRegExp += String(RTL_CONSTASCII_USTRINGPARAM(".*"));
- else if ( '?' == *pc )
- aRegExp += '.';
- else
- {
- aRegExp += '\'';
-
- while ( *pc && *pc != '*' && *pc != '?' )
- {
- if ( '\'' == *pc )
- aRegExp += String(RTL_CONSTASCII_USTRINGPARAM("\\\'"));
- else
- aRegExp += *pc;
- pc++;
- }
- aRegExp += '\'';
-
- if ( !*pc )
- break;
- else
- pc--;
- }
- }
- aRegExp += '$';
- return aRegExp;
-}
-
-//*****************************************************************************
// SvtFileDialogFilter_Impl
//*****************************************************************************
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 35fcc7f95df9..5b97455b628a 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,10 +57,6 @@ class SvUShorts;
#define FILEDIALOG_DEF_TIMEOUT 250
//*****************************************************************************
-
-String GetRegularExpression_Impl( const String& rFilter );
-
-//*****************************************************************************
// SvtFileDialogFilter_Impl
//*****************************************************************************
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index dc53e6318030..a84a54499bc3 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -713,7 +713,7 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
RECT rcFilterBox;
GetWindowRect(hFilterBox, &rcFilterBox);
w = rcFilterBox.right - rcFilterBox.left;
- h = rcFilterBox.bottom, - rcFilterBox.top;
+ h = rcFilterBox.bottom - rcFilterBox.top;
ScreenToClient(m_hwndFileOpenDlg, (LPPOINT)&rcFilterBox);
MoveWindow(hFilterBox, rcFilterBox.left + gap + OFFSET, rcFilterBox.top, w - OFFSET, h, true);