7 files changed, 9 insertions, 25 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 325ff76c076e..8ae614a24787 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -57,8 +57,6 @@
 #include <basobj.hxx>
 #include <brkdlg.hxx>
 
-#include <svx/srchdlg.hxx>
-
 #include <vcl/sound.hxx>
 
 #include <unotools/textsearch.hxx>
@@ -83,8 +81,6 @@ using namespace ::com::sun::star::uno;
 
 #if defined(OW) || defined(MTF)
 #define FILTERMASK_ALL "*"
-#elif defined(PM2)
-#define FILTERMASK_ALL ""
 #else
 #define FILTERMASK_ALL "*.*"
 #endif
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index fdb69631d6fe..b5b48b96994d 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -89,8 +89,6 @@ using namespace ::com::sun::star::ui::dialogs;
 
 #if defined(UNX)
 #define FILTERMASK_ALL "*"
-#elif defined(PM2)
-#define FILTERMASK_ALL ""
 #else
 #define FILTERMASK_ALL "*.*"
 #endif
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 596e1e973b2f..8814f3538161 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -998,15 +998,15 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& rDocument, String aLibName,
     {
         ContainerListenerImpl* pListener = static_cast< ContainerListenerImpl* >( m_xLibListener.get() );
 
-        if ( pListener )
-            pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
-
         m_aCurDocument = rDocument;
-
-        pListener->addContainerListener( m_aCurDocument, aLibName );
-
         m_aCurLibName = aLibName;
 
+        if ( pListener )
+        {
+            pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
+            pListener->addContainerListener( m_aCurDocument, aLibName );
+        }
+
         if ( bUpdateWindows )
             UpdateWindows();
 
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 8e59d4d7e2e0..455f6306ea01 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -213,4 +213,4 @@ IMPL_LINK( BasicIDEData, GlobalBasicBreakHdl, StarBASIC *, pBasic )
     return nRet;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index f7c4ce770a95..2ba82fca818a 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -53,8 +53,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SAL_DLLPUBLIC_EXPORT
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* pRegistryKey )
 {
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 6018eea4f1bd..fd06e7b71216 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -991,7 +991,7 @@ namespace basctl
             if ( aFileURL.getLength() )
             {
                 ::osl::DirectoryItem aFileItem;
-                ::osl::FileStatus aFileStatus( FileStatusMask_FileURL );
+                ::osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
                 OSL_VERIFY( ::osl::DirectoryItem::get( aFileURL, aFileItem ) == ::osl::FileBase::E_None );
                 OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == ::osl::FileBase::E_None );
                 ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index be5fdc556c59..110bdb89f2c6 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1268,15 +1268,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         lcl_PrintHeader( pPrinter, rTitle );
 
         Bitmap aDlg;
-#ifdef OS2
-        Bitmap* pDlg = new Bitmap;
-        SvMemoryStream* pStrm = new SvMemoryStream;
-        *pStrm << *pDlg;
-        delete pDlg;
-        pStrm->Seek(0);
-        *pStrm >> aDlg;
-        delete pStrm;
-#endif
         Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
         double nPaperSzWidth = aPaperSz.Width();
         double nPaperSzHeight = aPaperSz.Height();