merge with m61

14 files changed, 506 insertions, 16 deletions

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 4829347da..df99862b3 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -177,6 +177,15 @@
 #define RID_STR_EXPORTBASIC				( RID_BASICIDE_START + 101 )
 #define RID_STR_PACKAGE_BUNDLE			( RID_BASICIDE_START + 102 )
 
+#define RID_STR_DLGIMP_CLASH_RENAME		( RID_BASICIDE_START + 110 )
+#define RID_STR_DLGIMP_CLASH_REPLACE	( RID_BASICIDE_START + 111 )
+#define	RID_STR_DLGIMP_CLASH_TITLE		( RID_BASICIDE_START + 112 )
+#define	RID_STR_DLGIMP_CLASH_TEXT		( RID_BASICIDE_START + 113 )
+#define	RID_STR_DLGIMP_MISMATCH_ADD		( RID_BASICIDE_START + 114 )
+#define	RID_STR_DLGIMP_MISMATCH_OMIT	( RID_BASICIDE_START + 115 )
+#define	RID_STR_DLGIMP_MISMATCH_TITLE	( RID_BASICIDE_START + 116 )
+#define	RID_STR_DLGIMP_MISMATCH_TEXT	( RID_BASICIDE_START + 117 )
+
 #endif	// _SVX_NOIDERESIDS
 
 #endif	// _BASIDESH_HRC
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 727ac8892..469f770a1 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -416,6 +416,12 @@ shell BasicIDEShell
         StateMethod 	= GetState;
     ]
     
+    SID_IMPORT_DIALOG
+    [
+        ExecMethod		= ExecuteDialog;
+        StateMethod 	= GetState;
+    ]
+    
     SID_DIALOG_TESTMODE
     [
         ExecMethod		= ExecuteDialog;
diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk
index abb072712..d94921bf9 100644
--- a/basctl/sdi/makefile.mk
+++ b/basctl/sdi/makefile.mk
@@ -38,7 +38,7 @@ TARGET=basslots
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
-
+.IF "$(L10N_framework)"==""
 SDI1NAME=$(TARGET)
 SDI1EXPORT=basctl
 
@@ -49,6 +49,6 @@ SVSDI1DEPEND= \
     baside.sdi
 
 # --- Targets -------------------------------------------------------
-
+.ENDIF
 .INCLUDE :  target.mk
 
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index f7d0ed70f..d1d78fb8c 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -542,6 +542,15 @@ BOOL ModulWindow::SaveBasicSource()
     return bDone;
 }
 
+BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ); 
+
+BOOL ModulWindow::ImportDialog()
+{
+    const ScriptDocument& rDocument = GetDocument();
+    String aLibName = GetLibName();
+    BOOL bRet = implImportDialog( this, aCurPath, rDocument, aLibName );
+    return bRet;
+}
 
 BOOL ModulWindow::ToggleBreakPoint( ULONG nLine )
 {
@@ -1032,6 +1041,11 @@ void __EXPORT ModulWindow::ExecuteCommand( SfxRequest& rReq )
             SaveBasicSource();
         }
         break;
+        case SID_IMPORT_DIALOG:
+        {
+            ImportDialog();
+        }
+        break;
         case SID_BASICIDE_MATCHGROUP:
         {
             if ( !GetEditView()->MatchGroup() )
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index e0f1ffb2e..e051eceb0 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -408,6 +408,7 @@ public:
 
     BOOL			LoadBasic();
     BOOL			SaveBasicSource();
+    BOOL			ImportDialog();
 
     void			EditMacro( const String& rMacroName );
 
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 20e4f25ba..26d4e487b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -46,6 +46,7 @@
 #include <ide_pch.hxx>
 
 
+#include <vector>

 #include <basidesh.hrc>
 #include <baside3.hxx>
 #include <localizationmgr.hxx> 
@@ -63,6 +64,7 @@
 #include <helpid.hrc>
 #include <bastype2.hxx>
 #include <svx/svdview.hxx>
+#include <svx/unolingu.hxx>

 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
@@ -73,6 +75,7 @@
 #include <com/sun/star/script/XLibraryContainer2.hpp>
 #endif
 #include <svtools/ehdl.hxx>
+#include <svtools/langtab.hxx>

 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
@@ -638,6 +641,10 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
         case SID_EXPORT_DIALOG:
             SaveDialog();
             break;
+

+        case SID_IMPORT_DIALOG:

+            ImportDialog();

+            break;

     }
 
     rReq.Done();
@@ -859,7 +866,406 @@ BOOL DialogWindow::SaveDialog()
     return bDone;
 }
 
-
+extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft,

+                             const ::com::sun::star::lang::Locale& rLocaleRight );

+
+std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq

+    ( Sequence< lang::Locale > aFirstSeq, Sequence< lang::Locale > aSecondSeq )

+{

+    std::vector< lang::Locale > avRet;

+

+    const lang::Locale* pFirst = aFirstSeq.getConstArray();

+    const lang::Locale* pSecond = aSecondSeq.getConstArray();

+    sal_Int32 nFirstCount = aFirstSeq.getLength();

+    sal_Int32 nSecondCount = aSecondSeq.getLength();

+

+    for( sal_Int32 iFirst = 0 ; iFirst < nFirstCount ; iFirst++ )

+    {

+        const lang::Locale& rFirstLocale = pFirst[ iFirst ];

+

+        bool bAlsoContainedInSecondSeq = false;

+        for( sal_Int32 iSecond = 0 ; iSecond < nSecondCount ; iSecond++ )

+        {

+            const lang::Locale& rSecondLocale = pSecond[ iSecond ];

+

+            bool bMatch = localesAreEqual( rFirstLocale, rSecondLocale );

+            if( bMatch )

+            {

+                bAlsoContainedInSecondSeq = true;

+                break;

+            }

+        }

+

+        if( !bAlsoContainedInSecondSeq )

+            avRet.push_back( rFirstLocale );

+    }

+    

+    return avRet;

+}

+

+

+class NameClashQueryBox : public MessBox

+{

+public:

+    NameClashQueryBox( Window* pParent,

+        const XubString& rTitle, const XubString& rMessage );

+};

+

+NameClashQueryBox::NameClashQueryBox( Window* pParent,

+    const XubString& rTitle, const XubString& rMessage )

+        : MessBox( pParent, 0, rTitle, rMessage )

+{

+    if ( rTitle.Len() )

+        SetText( rTitle );

+

+    maMessText = rMessage;

+

+    AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_RENAME ) ), RET_YES,

+        BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );

+    AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 );

+    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );

+

+    SetImage( GetSettings().GetStyleSettings().GetDialogColor().IsDark() ?

+        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );

+}

+

+

+class LanguageMismatchQueryBox : public MessBox

+{

+public:

+    LanguageMismatchQueryBox( Window* pParent,

+        const XubString& rTitle, const XubString& rMessage );

+};

+

+LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,

+    const XubString& rTitle, const XubString& rMessage )

+        : MessBox( pParent, 0, rTitle, rMessage )

+{

+    if ( rTitle.Len() )

+        SetText( rTitle );

+

+    maMessText = rMessage;

+    AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_ADD ) ), RET_YES,

+        BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON );

+    AddButton( String( IDEResId( RID_STR_DLGIMP_MISMATCH_OMIT ) ), RET_NO, 0 );

+    AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );

+    AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 );

+

+    SetImage( GetSettings().GetStyleSettings().GetDialogColor().IsDark() ?

+        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );

+}

+

+BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName )

+{

+    BOOL bDone = FALSE;

+

+    Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );

+    Reference < XFilePicker > xFP;

+    if( xMSF.is() )

+    {

+        Sequence <Any> aServiceType(1);

+        aServiceType[0] <<= TemplateDescription::FILEOPEN_SIMPLE;

+        xFP = Reference< XFilePicker >( xMSF->createInstanceWithArguments(

+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aServiceType ), UNO_QUERY );

+    }

+

+    Reference< XFilePickerControlAccess > xFPControl(xFP, UNO_QUERY);

+    xFPControl->enableControl(ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, sal_False);

+    Any aValue;

+    aValue <<= (sal_Bool) sal_True;

+    xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);

+

+    String aCurPath( rCurPath );

+    if ( aCurPath.Len() )

+        xFP->setDisplayDirectory ( aCurPath );

+

+    String aDialogStr( IDEResId( RID_STR_STDDIALOGNAME ) );

+    Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);

+    xFltMgr->appendFilter( aDialogStr, String( RTL_CONSTASCII_USTRINGPARAM( "*.xdl" ) ) );

+    xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );

+    xFltMgr->setCurrentFilter( aDialogStr );

+

+    if( xFP->execute() == RET_OK )

+    {

+        Sequence< ::rtl::OUString > aPaths = xFP->getFiles();

+        aCurPath = aPaths[0];

+

+        ::rtl::OUString aBasePath;

+        ::rtl::OUString aOUCurPath( aCurPath );

+        sal_Int32 iSlash = aOUCurPath.lastIndexOf( '/' );

+        if( iSlash != -1 )

+            aBasePath = aOUCurPath.copy( 0, iSlash + 1 );

+

+        try

+        {

+            // create dialog model

+            Reference< container::XNameContainer > xDialogModel( xMSF->createInstance

+                ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY_THROW );

+

+            Reference< XSimpleFileAccess > xSFI( xMSF->createInstance

+                ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY_THROW );

+         

+            Reference< XInputStream > xInput;

+            if( xSFI->exists( aCurPath ) )

+                xInput = xSFI->openFileRead( aCurPath ); 

+

+            Reference< XComponentContext > xContext;

+            Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );

+            OSL_ASSERT( xProps.is() );

+            OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );

+            ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );

+

+            String aXmlDlgName;

+            Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );

+            if( xDialogModelPropSet.is() )

+            {

+                try

+                {

+                    Any aXmlDialogNameAny = xDialogModelPropSet->getPropertyValue( DLGED_PROP_NAME );

+                    ::rtl::OUString aOUXmlDialogName;

+                    aXmlDialogNameAny >>= aOUXmlDialogName;

+                    aXmlDlgName = aOUXmlDialogName;

+                }

+                catch( beans::UnknownPropertyException& )

+                {}

+            }

+            bool bValidName = (aXmlDlgName.Len() != 0);

+            OSL_ASSERT( bValidName );

+            if( !bValidName )

+                return bDone;

+

+            bool bDialogAlreadyExists = rDocument.hasDialog( aLibName, aXmlDlgName );

+

+            String aNewDlgName = aXmlDlgName;

+            enum NameClashMode

+            {

+                NO_CLASH,

+                CLASH_OVERWRITE_DIALOG,

+                CLASH_RENAME_DIALOG,

+            };

+            NameClashMode eNameClashMode = NO_CLASH;

+            if( bDialogAlreadyExists )

+            {

+                String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) );

+                String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) );

+                aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName ); 

+

+                NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );

+                USHORT nRet = aQueryBox.Execute();

+                if( RET_YES == nRet )

+                {

+                    // RET_YES == Rename, see NameClashQueryBox::NameClashQueryBox

+                    eNameClashMode = CLASH_RENAME_DIALOG;

+

+                    aNewDlgName = rDocument.createObjectName( E_DIALOGS, aLibName );

+                }

+                else if( RET_NO == nRet )

+                {

+                    // RET_NO == Replace, see NameClashQueryBox::NameClashQueryBox

+                    eNameClashMode = CLASH_OVERWRITE_DIALOG;

+                }

+                else if( RET_CANCEL == nRet )

+                {

+                    return bDone;

+                }

+            }

+     

+            BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();

+            if( pIDEShell == NULL )

+            {

+                OSL_ASSERT( pIDEShell != NULL );

+                return bDone;

+            }

+

+            // Resource?

+            ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();

+            Reference< task::XInteractionHandler > xDummyHandler;

+            bool bReadOnly = true;

+            Reference< XStringResourceWithLocation > xImportStringResource =

+                StringResourceWithLocation::create( xContext, aBasePath, bReadOnly, 

+                aLocale, aXmlDlgName, ::rtl::OUString(), xDummyHandler );

+

+            Sequence< lang::Locale > aImportLocaleSeq = xImportStringResource->getLocales();

+            sal_Int32 nImportLocaleCount = aImportLocaleSeq.getLength();

+

+            Reference< container::XNameContainer > xDialogLib( rDocument.getLibrary( E_DIALOGS, aLibName, TRUE ) );

+            Reference< resource::XStringResourceManager > xLibStringResourceManager = LocalizationMgr::getStringResourceFromDialogLibrary( xDialogLib );

+            sal_Int32 nLibLocaleCount = 0;

+            Sequence< lang::Locale > aLibLocaleSeq;

+            if( xLibStringResourceManager.is() )

+            {

+                aLibLocaleSeq = xLibStringResourceManager->getLocales();

+                nLibLocaleCount = aLibLocaleSeq.getLength();

+            }

+

+            // Check language matches

+            std::vector< lang::Locale > aOnlyInImportLanguages =

+                implGetLanguagesOnlyContainedInFirstSeq( aImportLocaleSeq, aLibLocaleSeq );

+            int nOnlyInImportLanguageCount = aOnlyInImportLanguages.size();

+

+            // For now: Keep languages from lib

+            bool bLibLocalized = (nLibLocaleCount > 0);

+            bool bImportLocalized = (nImportLocaleCount > 0);

+

+            bool bAddDialogLanguagesToLib = false;

+            if( nOnlyInImportLanguageCount > 0 )

+            {

+                String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_MISMATCH_TITLE ) );

+                String aQueryBoxText( IDEResId( RID_STR_DLGIMP_MISMATCH_TEXT ) );

+                LanguageMismatchQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );

+                USHORT nRet = aQueryBox.Execute();

+                if( RET_YES == nRet )

+                {

+                    // RET_YES == Add, see LanguageMismatchQueryBox::LanguageMismatchQueryBox

+                    bAddDialogLanguagesToLib = true;

+                }

+                // RET_NO == Omit, see LanguageMismatchQueryBox::LanguageMismatchQueryBox

+                // -> nothing to do here

+                //else if( RET_NO == nRet )

+                //{

+                //}

+                else if( RET_CANCEL == nRet )

+                {

+                    return bDone;

+                }

+            }

+

+            if( bImportLocalized )

+            {

+                bool bCopyResourcesForDialog = true;

+                if( bAddDialogLanguagesToLib )

+                {

+                    LocalizationMgr* pCurMgr = pIDEShell->GetCurLocalizationMgr();

+

+                    lang::Locale aFirstLocale;

+                    aFirstLocale = aOnlyInImportLanguages[0];

+                    if( nOnlyInImportLanguageCount > 1 )

+                    {

+                        // Check if import default belongs to only import languages and use it then

+                        lang::Locale aImportDefaultLocale = xImportStringResource->getDefaultLocale();

+                        lang::Locale aTmpLocale;

+                        for( int i = 0 ; i < nOnlyInImportLanguageCount ; ++i )

+                        {

+                            aTmpLocale = aOnlyInImportLanguages[i];

+                            if( localesAreEqual( aImportDefaultLocale, aTmpLocale ) )

+                            {

+                                aFirstLocale = aImportDefaultLocale;

+                                break;

+                            }

+                        }

+                    }

+

+                    Sequence< lang::Locale > aFirstLocaleSeq( 1 );

+                    aFirstLocaleSeq[0] = aFirstLocale;

+                    pCurMgr->handleAddLocales( aFirstLocaleSeq );

+

+                    if( nOnlyInImportLanguageCount > 1 )

+                    {

+                        Sequence< lang::Locale > aRemainingLocaleSeq( nOnlyInImportLanguageCount - 1 );

+                        lang::Locale aTmpLocale;

+                        int iSeq = 0;

+                        for( int i = 0 ; i < nOnlyInImportLanguageCount ; ++i )

+                        {

+                            aTmpLocale = aOnlyInImportLanguages[i];

+                            if( !localesAreEqual( aFirstLocale, aTmpLocale ) )

+                                aRemainingLocaleSeq[iSeq++] = aTmpLocale;

+                        }

+                        pCurMgr->handleAddLocales( aRemainingLocaleSeq );

+                    }

+                }

+                else if( !bLibLocalized )

+                {

+                    Reference< resource::XStringResourceManager > xImportStringResourceManager( xImportStringResource, UNO_QUERY );

+                    LocalizationMgr::resetResourceForDialog( xDialogModel, xImportStringResourceManager );

+                    bCopyResourcesForDialog = false;

+                }

+

+                if( bCopyResourcesForDialog )

+                {

+                    Reference< resource::XStringResourceResolver > xImportStringResourceResolver( xImportStringResource, UNO_QUERY );

+                    LocalizationMgr::copyResourceForDroppedDialog( xDialogModel, aXmlDlgName,

+                        xLibStringResourceManager, xImportStringResourceResolver );

+                }

+            }

+            else if( bLibLocalized )

+            {

+                LocalizationMgr::setResourceIDsForDialog( xDialogModel, xLibStringResourceManager );

+            }

+

+

+            LocalizationMgr::setStringResourceAtDialog( rDocument, aLibName, aNewDlgName, xDialogModel );

+

+            if( eNameClashMode == CLASH_OVERWRITE_DIALOG )

+            {

+                if ( BasicIDE::RemoveDialog( rDocument, aLibName, aNewDlgName ) )

+                {

+                    IDEBaseWindow* pDlgWin = pIDEShell->FindDlgWin( rDocument, aLibName, aNewDlgName, FALSE, TRUE );

+                    if( pDlgWin != NULL )

+                        pIDEShell->RemoveWindow( pDlgWin, TRUE );

+                    BasicIDE::MarkDocumentModified( rDocument );

+                }

+                else

+                {

+                    // TODO: Assertion?

+                    return bDone;

+                }

+            }

+

+            if( eNameClashMode == CLASH_RENAME_DIALOG )

+            {

+                bool bRenamed = false;

+                if( xDialogModelPropSet.is() )

+                {

+                    try

+                    {

+                        Any aXmlDialogNameAny;

+                        aXmlDialogNameAny <<= ::rtl::OUString( aNewDlgName );

+                        xDialogModelPropSet->setPropertyValue( DLGED_PROP_NAME, aXmlDialogNameAny );

+                        bRenamed = true;

+                    }

+                    catch( beans::UnknownPropertyException& )

+                    {}

+                }

+

+

+                if( bRenamed )

+                {

+                    LocalizationMgr::renameStringResourceIDs( rDocument, aLibName, aNewDlgName, xDialogModel );

+                }

+                else

+                {

+                    // TODO: Assertion?

+                    return bDone;

+                }

+            }

+

+            Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );

+            bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );

+            if( bSuccess )

+            {

+                DialogWindow* pNewDlgWin = pIDEShell->CreateDlgWin( rDocument, aLibName, aNewDlgName );

+                pIDEShell->SetCurWindow( pNewDlgWin, TRUE );

+            }

+

+            bDone = TRUE;

+        }

+        catch( Exception& )

+        {} 

+    }

+

+    return bDone;

+}

+

+BOOL DialogWindow::ImportDialog()

+{

+    DBG_CHKTHIS( DialogWindow, 0 );

+

+    const ScriptDocument& rDocument = GetDocument();

+    String aLibName = GetLibName();

+    BOOL bRet = implImportDialog( this, aCurPath, rDocument, aLibName );

+    return bRet;

+}

+

 DlgEdModel* DialogWindow::GetModel() const
 {
     return pEditor ? pEditor->GetModel() : NULL;	
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 2133561c4..e29d67ee3 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -41,6 +41,7 @@
 #define _SOLAR__PRIVATE 1
 
 #include <basidesh.hxx>
+#include <baside2.hxx>
 #include <baside3.hxx>
 #include <basobj.hxx>
 #include <localizationmgr.hxx> 
@@ -170,9 +171,10 @@ SdrView* BasicIDEShell::GetCurDlgView() const
 // Nur wenn Dialogfenster oben:
 void __EXPORT BasicIDEShell::ExecuteDialog( SfxRequest& rReq )
 {
-    if ( !pCurWin || !pCurWin->IsA( TYPE( DialogWindow ) ) )
-        return;
-
-    pCurWin->ExecuteCommand( rReq );
+    if ( pCurWin && ( pCurWin->IsA( TYPE( DialogWindow) ) ||
+        (rReq.GetSlot() == SID_IMPORT_DIALOG &&pCurWin->IsA( TYPE( ModulWindow) ) ) ) )
+    {
+        pCurWin->ExecuteCommand( rReq );
+    }
 }
 
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 097d4df23..4eb1e5320 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -640,6 +640,48 @@ String RID_STR_TRANSLATION_DEFAULT
     Text [ en-US ] = "[Default Language]" ;
 };
 
+
+String RID_STR_DLGIMP_CLASH_RENAME
+{
+    Text [ en-US ] = "Rename" ;
+};
+
+String RID_STR_DLGIMP_CLASH_REPLACE
+{
+    Text [ en-US ] = "Replace" ;
+};
+
+String RID_STR_DLGIMP_CLASH_TITLE
+{
+    Text [ en-US ] = "Dialog Import - Name already used" ;
+};
+
+String RID_STR_DLGIMP_CLASH_TEXT
+{
+    Text [ en-US ] = "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n " ;
+};
+
+String RID_STR_DLGIMP_MISMATCH_ADD
+{
+    Text [ en-US ] = "Add" ;
+};
+
+String RID_STR_DLGIMP_MISMATCH_OMIT
+{
+    Text [ en-US ] = "Omit" ;
+};
+
+String RID_STR_DLGIMP_MISMATCH_TITLE
+{
+    Text [ en-US ] = "Dialog Import - Language Mismatch" ;
+};
+
+String RID_STR_DLGIMP_MISMATCH_TEXT
+{
+    Text [ en-US ] = "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n " ;
+};
+
+
 #define MN_EDIT       20
 #define MN_VIEW 21
 #define MN_EXTRA 22
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 8d61c1143..443c05e2d 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -81,20 +81,20 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     FixedText RID_FT_PASS
     {
         Pos = MAP_APPFONT ( 6 , 102 ) ;
-        Size = MAP_APPFONT ( 35 , 10 ) ;
+        Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Pass Count:" ;
     };
     FixedText RID_FT_BRKPOINTS
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 40 , 10 ) ;
+        Size = MAP_APPFONT ( 110, 10 ) ;
         Text [ en-US ] = "Breakpoints" ;
     };
     NumericField RID_FLD_PASS
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 41 , 100 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Pos = MAP_APPFONT ( 81 , 100 ) ;
+        Size = MAP_APPFONT ( 35 , 12 ) ;
         TabStop = TRUE ;
     };
     Text [ en-US ] = "Manage Breakpoints" ;
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 25e339500..b5ec463e2 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -37,6 +37,10 @@
 
 #include <bastypes.hxx>
 #include <svtools/undo.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/button.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx>
 
 #ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_
 #include <com/sun/star/script/XLibraryContainer.hpp>
@@ -94,6 +98,7 @@ public:
     void				DisableBrowser();
     void				UpdateBrowser();
     BOOL				SaveDialog();
+    BOOL				ImportDialog();
 
     virtual String		GetTitle();
     virtual BasicEntryDescriptor CreateEntryDescriptor();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 7e0aa4481..8e379c2c0 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -86,6 +86,7 @@ class BasicIDEShell :public SfxViewShell
 {
 friend class JavaDebuggingListenerImpl;
 friend class LocalizationMgr;
+friend BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
 friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
     ObjectCatalog* 		pObjectCatalog;
@@ -147,7 +148,6 @@ protected:
     DialogWindow*       CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
 
     ModulWindow*		FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
-    DialogWindow*       FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
     ModulWindow* 		ShowActiveModuleWindow( StarBASIC* pBasic );
 
     virtual void 		SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
@@ -221,6 +221,7 @@ public:
     ModulWindowLayout*	GetLayoutWindow() const { return pModulLayout; }
 
     IDEBaseWindow*		FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE );
+    DialogWindow*       FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
     IDEBaseWindow*		FindApplicationWindow();
     BOOL				NextPage( BOOL bPrev = FALSE );
     
diff --git a/basctl/uiconfig/basicide/toolbar/dialogbar.xml b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
index afc409fa4..91b9a925f 100644
--- a/basctl/uiconfig/basicide/toolbar/dialogbar.xml
+++ b/basctl/uiconfig/basicide/toolbar/dialogbar.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:LibSelector" />
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChooseControls" />
- <toolbar:toolbaritem xlink:href=".uno:ExportDialog" />
+  <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
+  <toolbar:toolbaritem xlink:href=".uno:ExportDialog" />
 </toolbar:toolbar>
\ No newline at end of file
diff --git a/basctl/uiconfig/basicide/toolbar/macrobar.xml b/basctl/uiconfig/basicide/toolbar/macrobar.xml
index 8f08ba1ce..6e22bff09 100644
--- a/basctl/uiconfig/basicide/toolbar/macrobar.xml
+++ b/basctl/uiconfig/basicide/toolbar/macrobar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd">
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:LibSelector" toolbar:helpid="helpid:30787"  />
@@ -17,4 +17,6 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:LoadBasic" toolbar:helpid="helpid:5951"  />
  <toolbar:toolbaritem xlink:href=".uno:SaveBasicAs" toolbar:helpid="helpid:5953"  />
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ImportDialog" />
+</toolbar:toolbar>
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index 80b3efd43..0f2a919ff 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -54,6 +54,7 @@ SHL1TARGET= basctl$(DLLPOSTFIX)
 SHL1IMPLIB= basctl
 SHL1BASE  = 0x1d800000
 SHL1STDLIBS= \
+            $(SVXCORELIB) \
             $(SVXLIB) \
             $(SFX2LIB) \
             $(BASICLIB) \