summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-03-05 13:45:30 +0000
committerKurt Zenker <kz@openoffice.org>2009-03-05 13:45:30 +0000
commitd85aa9ff68bdc2c4d3d960fb0fe28ae2a0433dc6 (patch)
tree4ef2ede2d93eed4a242cf3baa7895a34298c7857
parent53ed5b28539b06d7664a80ff693259e68cd50d08 (diff)
CWS-TOOLING: integrate CWS jl117
2009-02-18 16:23:55 +0100 kso r268240 : #i98983# - auto extension fix. 2009-02-16 15:33:04 +0100 jl r267821 : #i99249# conflict resolution error, unopkg hangs 2009-02-13 15:19:16 +0100 jl r267723 : #i99068# regression: extension description from manifest.xml was not displayed
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/win32/source/guistdio/guistdio.inc2
-rw-r--r--fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx24
3 files changed, 19 insertions, 9 deletions
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 8ed0d59f27..2f6a0091e2 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -909,7 +909,7 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
}
if (sDescription.getLength())
return sDescription;
- else if(m_oldDescription.getLength() == 0)
+ else if(m_oldDescription.getLength())
return m_oldDescription;
else
return OUString();
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index c8170e6948..6ee59c891b 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -361,7 +361,7 @@ int _tmain( int, _TCHAR ** )
hErrorThread
};
- #ifdef GUISTDIO_KEEPRUNNING
+ #ifdef UNOPKG
dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, TRUE, INFINITE );
#else
bool bDetach = false;
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 37732bfcf4..5e59853028 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -668,6 +668,22 @@ void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)
{
::rtl::OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
TFileDialog iDialog = impl_getBaseDialogInterface();
+
+ TFileDialogCustomize iCustom = impl_getCustomizeInterface();
+ if ( ! iCustom.is())
+ return;
+
+ // if we have the autoextension check box set, remove (or change ???) the extension of the filename
+ // so that the autoextension mechanism can do its job
+ BOOL bValue = FALSE;
+ HRESULT hResult = iCustom->GetCheckButtonState( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, &bValue);
+ if ( bValue )
+ {
+ sal_Int32 nSepPos = sFilename.lastIndexOf( '.' );
+ if ( -1 != nSepPos )
+ sFilename = sFilename.copy(0, nSepPos);
+ }
+
iDialog->SetFileName ( reinterpret_cast<LPCTSTR>(sFilename.getStr()));
m_sFilename = sFilename;
}
@@ -682,17 +698,11 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
::rtl::OUString sCurrentFilter = m_lFilters.getCurrentFilter();
sal_Int32 nCurrentFilter = m_lFilters.getFilterPos(sCurrentFilter);
TFileDialog iDialog = impl_getBaseDialogInterface();
- TFileDialogCustomize iCustomize;
+ TFileDialogCustomize iCustomize = impl_getCustomizeInterface();
aLock.clear();
// <- SYNCHRONIZED
-#ifdef __MINGW32__
- iDialog->QueryInterface(IID_IFileDialog, (void **)(&iCustomize));
-#else
- iDialog.query(&iCustomize);
-#endif
-
COMDLG_FILTERSPEC *pFilt = &lFilters[0];
iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/);
iDialog->SetFileTypeIndex(nCurrentFilter + 1);