CWS-TOOLING: integrate CWS mba30fixes02

9 files changed, 48 insertions, 94 deletions

diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 748fdd4e2f39..98d601009d22 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xml2utf.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,7 +44,6 @@ class Text2UnicodeConverter
 
 public:
     Text2UnicodeConverter( const ::rtl::OString & sEncoding );
-    Text2UnicodeConverter( rtl_TextEncoding encoding );
     ~Text2UnicodeConverter();
 
     ::com::sun::star::uno::Sequence < sal_Unicode > convert( const ::com::sun::star::uno::Sequence<sal_Int8> & );
@@ -69,7 +68,6 @@ private:
 class Unicode2TextConverter
 {
 public:
-    Unicode2TextConverter( const ::rtl::OString & sEncoding );
     Unicode2TextConverter( rtl_TextEncoding encoding );
     ~Unicode2TextConverter();
 
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 35a4f0919cb3..1ec1128516fd 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: attrlistimpl.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -175,35 +175,4 @@ void AttributeList::clear()
     m_pImpl->vecAttribute.clear();
 }
 
-void AttributeList::removeAttribute( const OUString &sName )
-{
-    vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
-
-    for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
-        if( (*ii).sName == sName ) {
-            m_pImpl->vecAttribute.erase( ii );
-            break;
-        }
-    }
-}
-
-
-void AttributeList::setAttributeList( const Reference<  XAttributeList >  &r )
-{
-    assert( r.is() );
-
-    sal_Int16 nMax = r->getLength();
-    clear();
-    m_pImpl->vecAttribute.reserve( nMax );
-
-    for( int i = 0 ; i < nMax ; i ++ ) {
-       m_pImpl->vecAttribute.push_back(
-           TagAttribute(
-               r->getNameByIndex( static_cast<sal_Int16>(i) ) ,
-               r->getTypeByIndex( static_cast<sal_Int16>(i) ) ,
-               r->getValueByIndex( static_cast<sal_Int16>(i) ) ) );
-    }
-    assert( nMax == getLength() );
-}
-
 }
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index ab811ec429e2..481d9527ffb7 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: attrlistimpl.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,10 +59,6 @@ public:
     void addAttribute( const ::rtl::OUString &sName ,
         const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
     void clear();
-    void removeAttribute( const ::rtl::OUString &sName );
-    void setAttributeList( const ::com::sun::star::uno::Reference<
-            ::com::sun::star::xml::sax::XAttributeList > & );
-
 public:
     // XAttributeList
     virtual sal_Int16 SAL_CALL getLength(void)
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index a021e9d3daa8..d9553113c759 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sax_expat.cxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -160,7 +160,6 @@ public:
 
     // The implementation details
     static Sequence< OUString >     getSupportedServiceNames_Static(void) throw ();
-    static OUString                 getImplementationName_Static() throw ();
 
 public:
     // The SAX-Parser-Interface
@@ -576,11 +575,6 @@ void SaxExpatParser::setLocale( const Locale & locale ) throw (RuntimeException)
     m_pImpl->locale = locale;
 }
 
-OUString    SaxExpatParser::getImplementationName_Static() throw ()
-{
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
-}
-
 // XServiceInfo
 OUString SaxExpatParser::getImplementationName() throw ()
 {
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 4d936d895e90..63332684889d 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xml2utf.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -372,12 +372,6 @@ Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
     }
 }
 
-Text2UnicodeConverter::Text2UnicodeConverter( rtl_TextEncoding encoding )
-{
-    init( encoding );
-}
-
-
 Text2UnicodeConverter::~Text2UnicodeConverter()
 {
     if( m_bInitialized )
@@ -470,19 +464,6 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &
 // Unicode2TextConverter
 //
 //----------------------------------------------
-Unicode2TextConverter::Unicode2TextConverter( const OString &sEncoding )
-{
-    rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );
-    if( RTL_TEXTENCODING_DONTKNOW == encoding ) {
-        m_bCanContinue = sal_False;
-        m_bInitialized = sal_False;
-    }
-    else {
-        init( encoding );
-    }
-
-}
-
 Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding )
 {
     init( encoding );
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 04bf75201497..8cf48649c8e4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fastparser.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.10.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -161,7 +161,6 @@ public:
 
     // The implementation details
     static Sequence< OUString >     getSupportedServiceNames_Static(void);
-    static OUString                 getImplementationName_Static();
 
     // XFastParser
     virtual void SAL_CALL parseStream( const InputSource& aInputSource ) throw (SAXException, IOException, RuntimeException);
@@ -671,11 +670,6 @@ void FastSaxParser::setLocale( const Locale & Locale ) throw (RuntimeException)
     maLocale = Locale;
 }
 
-OUString FastSaxParser::getImplementationName_Static()
-{
-    return OUString::createFromAscii( IMPLEMENTATION_NAME );
-}
-
 // XServiceInfo
 OUString FastSaxParser::getImplementationName() throw (RuntimeException)
 {
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index 6be269c49aeb..828be6fb8e62 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: contentenumeration.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.104.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -89,7 +89,6 @@ namespace svt
     using ::rtl::OUString;
     using ::ucbhelper::ResultSetInclude;
     using ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS;
-    using ::ucbhelper::Content;
 
     //====================================================================
     //= FileViewContentEnumerator
@@ -203,10 +202,10 @@ namespace svt
             aProps[10] = OUString::createFromAscii( "IsFloppy" );
             aProps[11] = OUString::createFromAscii( "IsCompactDisc" );
 
+            Reference< XCommandEnvironment > xEnvironment;
             try
             {
                 FolderDescriptor aFolder;
-                Reference< XCommandEnvironment > xEnvironment;
                 {
                     ::osl::MutexGuard aGuard( m_aMutex );
                     aFolder = m_aFolder;
@@ -214,7 +213,7 @@ namespace svt
                 }
                 if ( !aFolder.aContent.get().is() )
                 {
-                    aFolder.aContent = Content( aFolder.sURL, xEnvironment );
+                    aFolder.aContent = ::ucbhelper::Content( aFolder.sURL, xEnvironment );
                     {
                         ::osl::MutexGuard aGuard( m_aMutex );
                         m_aFolder.aContent = aFolder.aContent;
@@ -291,9 +290,13 @@ namespace svt
                             if ( bHasTargetURL &&
                                 INetURLObject( aContentURL ).GetProtocol() == INET_PROT_VND_SUN_STAR_HIER )
                             {
-                                Content aCnt( aTargetURL, NULL );
+                                ::ucbhelper::Content aCnt( aTargetURL, xEnvironment );
+                                try
+                                {
                                 aCnt.getPropertyValue( OUString::createFromAscii( "Size" ) ) >>= pData->maSize;
                                 aCnt.getPropertyValue( OUString::createFromAscii( "DateModified" ) ) >>= aDT;
+                                }
+                                catch (...) {}
                             }
 
                             if ( bContainsDate )
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index a704bc9c4dd5..ff223553c6fc 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fileview.cxx,v $
- * $Revision: 1.73 $
+ * $Revision: 1.73.104.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -89,7 +89,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::beans;
 using namespace ::comphelper;
-using namespace ::ucbhelper;
 using ::svt::SortingData_Impl;
 using ::svt::FolderDescriptor;
 using ::vos::TTimeValue;
@@ -463,7 +462,7 @@ void NameTranslationList::Init()
 
     try
     {
-        Content aTestContent( maTransFile.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() );
+        ::ucbhelper::Content aTestContent( maTransFile.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() );
 
         if( aTestContent.isDocument() )
         {// ... also tests the existence of maTransFile by throwing an Exception
@@ -580,8 +579,9 @@ public:
     String                  maCurrentFilter;
     Image                   maFolderImage;
     Link                    maOpenDoneLink;
+    Reference< XCommandEnvironment >    mxCmdEnv;
 
-                            SvtFileView_Impl( SvtFileView* pAntiImpl,
+    SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv,
                                               sal_Int16 nFlags,
                                               sal_Bool bOnlyFolder );
     virtual                ~SvtFileView_Impl();
@@ -774,7 +774,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin,
     Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > (
                xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY );
 
-    mxCmdEnv = new CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
+    mxCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
 
     EnableContextMenuHandling();
 }
@@ -974,7 +974,7 @@ BOOL ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
 
     try
     {
-        Content aContent( aURL, mxCmdEnv );
+        ::ucbhelper::Content aContent( aURL, mxCmdEnv );
 
         OUString aPropName = OUString::createFromAscii( "Title" );
         Any aValue;
@@ -1084,7 +1084,7 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
 
     try
     {
-        Content aCnt( rContent, mxCmdEnv );
+        ::ucbhelper::Content aCnt( rContent, mxCmdEnv );
         aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
     }
     catch( ::com::sun::star::ucb::CommandAbortedException& )
@@ -1119,7 +1119,11 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId,
     if ( bMultiSelection )
         nFlags |= FILEVIEW_MULTISELECTION;
 
-    mpImp = new SvtFileView_Impl( this, nFlags, bOnlyFolder );
+    Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > (
+        ::comphelper::getProcessServiceFactory()->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY );
+    Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
+
+    mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder );
     mpImp->mpView->ForbidEmptyText();
 
     long pTabs[] = { 5, 20, 180, 320, 400, 600 };
@@ -1138,7 +1142,10 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_Int8 nFlags
 
     Control( pParent, rResId )
 {
-    mpImp = new SvtFileView_Impl( this, nFlags,
+    Reference< XInteractionHandler > xInteractionHandler = Reference< XInteractionHandler > (
+        ::comphelper::getProcessServiceFactory()->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), UNO_QUERY );
+    Reference < XCommandEnvironment > xCmdEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
+    mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags,
                                   ( nFlags & FILEVIEW_ONLYFOLDER ) == FILEVIEW_ONLYFOLDER );
 
     if ( ( nFlags & FILEVIEW_SHOW_ALL ) == FILEVIEW_SHOW_ALL )
@@ -1286,7 +1293,7 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const
     sal_Bool bRet = sal_False;
     try
     {
-        Content aCnt( mpImp->maViewURL, Reference< XCommandEnvironment > () );
+        ::ucbhelper::Content aCnt( mpImp->maViewURL, mpImp->mxCmdEnv );
         Reference< XContent > xContent( aCnt.get() );
         Reference< com::sun::star::container::XChild > xChild( xContent, UNO_QUERY );
         if ( xChild.is() )
@@ -1343,7 +1350,7 @@ sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com:
     WaitObject aWaitCursor( this );
 
     mpImp->Clear();
-    Content aContent(_xContent,Reference< XCommandEnvironment >());
+    ::ucbhelper::Content aContent(_xContent, mpImp->mxCmdEnv );
     FileViewResult eResult = mpImp->GetFolderContent_Impl( FolderDescriptor( aContent ), NULL );
     OSL_ENSURE( eResult != eStillRunning, "SvtFileView::Initialize: this was expected to be synchronous!" );
     if ( eResult != eSuccess )
@@ -1745,7 +1752,7 @@ const String* NameTranslator_Impl::GetTransTableFileName() const
 // class SvtFileView_Impl
 // -----------------------------------------------------------------------
 
-SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, sal_Int16 nFlags, sal_Bool bOnlyFolder )
+SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv, sal_Int16 nFlags, sal_Bool bOnlyFolder )
 
     :mpAntiImpl                 ( pAntiImpl )
     ,m_eAsyncActionResult       ( ::svt::ERROR )
@@ -1761,6 +1768,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, sal_Int16 nFlags, sa
     ,mbIsFirstResort            ( sal_True )
     ,aIntlWrapper               ( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() )
     ,maFolderImage              ( SvtResId( IMG_SVT_FOLDER ) )
+    ,mxCmdEnv ( xEnv )
 
 {
     maAllFilter = String::CreateFromAscii( "*.*" );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 0d7b2c10a7af..f6365e354522 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: templwin.cxx,v $
- * $Revision: 1.83 $
+ * $Revision: 1.82.58.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -905,7 +905,12 @@ void SvtFrameWindow_Impl::ShowDocInfo( const String& rURL )
 {
     try
     {
-        m_xDocProps->loadFromMedium( rURL, Sequence<PropertyValue>() );
+        uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(
+            ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
+        uno::Sequence < beans::PropertyValue> aProps(1);
+        aProps[0].Name = ::rtl::OUString::createFromAscii("InteractionHandler");
+        aProps[0].Value <<= xInteractionHandler;
+        m_xDocProps->loadFromMedium( rURL, aProps );
         pEditWin->fill( m_xDocProps, rURL );
     }
     catch ( UnknownPropertyException& ) {}
@@ -976,12 +981,18 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B
                     if ( pTextWin->IsReallyVisible() )
                     {
                         sal_Bool    b = sal_True;
-                        Sequence < PropertyValue > aArgs( 3 );
+                        Sequence < PropertyValue > aArgs( 4 );
                         aArgs[0].Name = ASCII_STR("Preview");
                         aArgs[0].Value.setValue( &b, ::getBooleanCppuType() );
                         aArgs[1].Name = ASCII_STR("ReadOnly");
                         aArgs[1].Value.setValue( &b, ::getBooleanCppuType() );
                         aArgs[2].Name = ASCII_STR("AsTemplate");    // prevents getting an empty URL with getURL()!
+
+                        uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(
+                            ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY );
+                        aArgs[3].Name = ::rtl::OUString::createFromAscii("InteractionHandler");
+                        aArgs[3].Value <<= xInteractionHandler;
+
                         b = sal_False;
                         aArgs[2].Value.setValue( &b, ::getBooleanCppuType() );
                         xDisp->dispatch( aURL, aArgs );