summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/customize/acccfg.cxx4
-rw-r--r--cui/source/options/doclinkdialog.cxx2
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.cxx6
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx6
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sfx2/source/appl/fileobj.cxx4
-rw-r--r--svx/source/form/databaselocationinput.cxx2
12 files changed, 19 insertions, 19 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f4f46625a585..94bd8e3772e0 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1034,14 +1034,14 @@ void SfxAcceleratorConfigPage::ResetConfig()
IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
{
// ask for filename, where we should load the new config data from
- StartFileDialog( WB_STDMODAL | WB_3DLOOK, aLoadAccelConfigStr );
+ StartFileDialog( 0, aLoadAccelConfigStr );
return 0;
}
//-----------------------------------------------
IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG )
{
- StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aSaveAccelConfigStr );
+ StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr );
return 0;
}
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index b6500b31a936..edebdab3f5ea 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -166,7 +166,7 @@ namespace svx
//------------------------------------------------------------------
IMPL_LINK( ODocumentLinkDialog, OnBrowseFile, void*, EMPTYARG )
{
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL);
+ ::sfx2::FileDialogHelper aFileDlg(0);
static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
if ( pFilter )
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 1aa86cdf3ad4..cd1a90856724 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -549,7 +549,7 @@ IMPL_LINK( OAdabasNewDbDlg, LoseFocusHdl, Edit *, pEdit )
//------------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ )
{
- ::sfx2::FileDialogHelper aLoad(WB_3DLOOK | WB_STDMODAL);
+ ::sfx2::FileDialogHelper aLoad(0);
if(!m_Backup_File.Len())
aLoad.SetDisplayDirectory(SvtPathOptions().GetWorkPath());
else
@@ -573,8 +573,8 @@ IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ )
//------------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
{
- WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS);
- ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) ); // new FileDialog( this, nBits );
+ WinBits nBits(WB_SAVEAS);
+ ::sfx2::FileDialogHelper aFileDlg( static_cast<sal_uInt32>(nBits) );
String aPath;
if(pButton == &m_PB_SYSDEVSPACE)
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 99f9e8daa36d..81a2dd0d7d08 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1172,7 +1172,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
case ID_BROWSER_SAVEASDOC:
{
- WinBits nBits(WB_STDMODAL|WB_SAVEAS);
+ WinBits nBits(WB_SAVEAS);
::rtl::OUString sUrl;
if ( m_xModel.is() )
sUrl = m_xModel->getURL();
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index d5c5058e4165..3f1bbd52d3a7 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -229,7 +229,7 @@ DBG_NAME(OConnectionHelper)
case ::dbaccess::DST_CALC:
{
SvtModuleOptions aModule;
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL
+ ::sfx2::FileDialogHelper aFileDlg(0
,aModule.GetFactoryEmptyDocumentURL(SvtModuleOptions::E_CALC)
,SFX_FILTER_IMPORT);
askForFileName(aFileDlg);
@@ -239,7 +239,7 @@ DBG_NAME(OConnectionHelper)
{
const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL);
+ ::sfx2::FileDialogHelper aFileDlg(0);
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
@@ -249,7 +249,7 @@ DBG_NAME(OConnectionHelper)
{
const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL);
+ ::sfx2::FileDialogHelper aFileDlg(0);
aFileDlg.AddFilter(sFilterName2,sAccdb);
aFileDlg.SetCurrentFilter(sFilterName2);
askForFileName(aFileDlg);
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 4270793c1010..71dbcb357faa 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -888,7 +888,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
sal_Bool ODbTypeWizDialogSetup::callSaveAsDialog()
{
sal_Bool bRet = sal_False;
- WinBits nBits(WB_STDMODAL|WB_SAVEAS);
+ WinBits nBits(WB_SAVEAS);
::sfx2::FileDialogHelper aFileDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, static_cast<sal_uInt32>(nBits), this);
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 136eefc2833c..0a48e8f7d873 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -198,7 +198,7 @@ namespace dbp
//---------------------------------------------------------------------
IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ )
{
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK);
+ ::sfx2::FileDialogHelper aFileDlg(0);
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5ca5ac4856f2..1953287f4fe9 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2836,7 +2836,7 @@ namespace pcr
//------------------------------------------------------------------------
bool FormComponentPropertyHandler::impl_browseForTargetURL_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
- ::sfx2::FileDialogHelper aFileDlg( WB_3DLOOK );
+ ::sfx2::FileDialogHelper aFileDlg(0);
::rtl::OUString sURL;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sURL );
@@ -2889,7 +2889,7 @@ namespace pcr
//------------------------------------------------------------------------
bool FormComponentPropertyHandler::impl_browseForDatabaseDocument_throw( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
- ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK,
+ ::sfx2::FileDialogHelper aFileDlg(0,
::String::CreateFromAscii("sdatabase"));
::rtl::OUString sDataSource;
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index fd468003395d..6916730a8e99 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -470,7 +470,7 @@ void SdTPAction::OpenFileDialog()
}
else
{
- sfx2::FileDialogHelper aFileDialog(WB_3DLOOK | WB_STDMODAL);
+ sfx2::FileDialogHelper aFileDialog(0);
if (bDocument && !aFile.Len())
aFile = SvtPathOptions().GetWorkPath();
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 7575773015f0..59fb1a0672dc 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -116,7 +116,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
if (!pArgs)
{
- sfx2::FileDialogHelper aFileDialog( SFXWB_INSERT | WB_STDMODAL );
+ sfx2::FileDialogHelper aFileDialog( SFXWB_INSERT );
Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY );
Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY );
String aOwnCont;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index d5d63484b89d..e3b12c5a16d4 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -472,7 +472,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
Application::SetDefDialogParent( pParent );
::sfx2::FileDialogHelper* pFileDlg =
- pLink->GetFileDialog( (SFXWB_INSERT | WB_3DLOOK), String() );
+ pLink->GetFileDialog( SFXWB_INSERT, String() );
pFileDlg->StartExecuteModal( LINK( this, SvFileObject, DialogClosedHdl ) );
}
break;
@@ -489,7 +489,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
sFactory = pShell->GetFactory().GetFactoryName();
::sfx2::FileDialogHelper* pFileDlg =
- pLink->GetFileDialog( (SFXWB_INSERT | WB_3DLOOK), sFactory );
+ pLink->GetFileDialog( SFXWB_INSERT, sFactory );
pFileDlg->StartExecuteModal( LINK( this, SvFileObject, DialogClosedHdl ) );
}
break;
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 536c0d8bebc3..aa377bbd6bd6 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -247,7 +247,7 @@ namespace svx
{
::sfx2::FileDialogHelper aFileDlg(
TemplateDescription::FILESAVE_AUTOEXTENSION,
- WB_STDMODAL | WB_SAVEAS,
+ WB_SAVEAS,
m_rLocationInput.GetSystemWindow()
);
aFileDlg.SetDisplayDirectory( impl_getCurrentURL() );