diff options
125 files changed, 678 insertions, 701 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index c405aa385..a018fb8a9 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -32,7 +32,7 @@ #define _DBA_DBACCESS_HELPID_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> // HID_DBACCESS_START +#include <svl/solar.hrc> // HID_DBACCESS_START #endif #define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index e9e8edf46..28e749191 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -458,19 +458,19 @@ #include "comphelper/classids.hxx" -#include "svtools/cjkoptions.hxx" -#include "svtools/filenotation.hxx" -#include "svtools/historyoptions.hxx" +#include "svl/cjkoptions.hxx" +#include "svl/filenotation.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/imgdef.hxx" -#include "svtools/internaloptions.hxx" +#include "unotools/internaloptions.hxx" #include "svtools/menuoptions.hxx" #include "svtools/miscopt.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtftoken.h" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "svtools/toolboxcontroller.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dbexch.hrc" diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 8d3a5ff0a..c3cfe0166 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -48,7 +48,7 @@ #include <comphelper/propertycontainer.hxx> #include <connectivity/dbmetadata.hxx> #include <cppuhelper/implbase1.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <memory> diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index f9cc1523b..c52076ffa 100644 --- a/dbaccess/prj/build.lst +++ b/dbaccess/prj/build.lst @@ -1,4 +1,4 @@ -ba dbaccess : l10n BOOST:boost connectivity svx stoc uui QADEVOOO:qadevOOo xmlscript NULL +ba dbaccess : l10n BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript NULL ba dbaccess usr1 - all ba_mkout NULL ba dbaccess\inc nmake - all ba_inc NULL ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 314322d18..a31a69710 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -81,7 +81,7 @@ #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/typeprovider.hxx> #include <rtl/logfile.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <unotools/configmgr.hxx> diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index d62ee8d8b..03eda09bd 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -58,7 +58,7 @@ #include <comphelper/types.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/logfile.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <unotools/configmgr.hxx> diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 2e30ceaa7..6b17ad97e 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -86,7 +86,7 @@ #include <com/sun/star/i18n/XLocaleData.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 5f4b05773..40435c378 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <svl/filenotation.hxx> +#include <unotools/pathoptions.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/fsys.hxx> @@ -150,8 +150,8 @@ namespace dbaccess public: DatabaseDocumentLoader( const comphelper::ComponentContext& _aContext); - inline void append(const ODatabaseModelImpl& _rModelImpl ) - { + inline void append(const ODatabaseModelImpl& _rModelImpl ) + { m_aDatabaseDocuments.push_back(&_rModelImpl); } inline void remove(const ODatabaseModelImpl& _rModelImpl) { m_aDatabaseDocuments.remove(&_rModelImpl); } @@ -204,7 +204,7 @@ namespace dbaccess ::std::list< const ODatabaseModelImpl* > aCopy(m_aDatabaseDocuments); ::std::for_each(aCopy.begin(),aCopy.end(),TerminateFunctor()); } - + // ............................................................................. void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException) { diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 251d73e68..aed910221 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #include <comphelper/storagehelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <framework/titlehelper.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/errcode.hxx> @@ -436,7 +436,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const ::comphelper::ComponentCo uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) ); xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(_rResource.getOrDefault("URL",::rtl::OUString()))); xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamName")), uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")))); - + const sal_Int32 nCount = aFilterArgs.getLength(); aFilterArgs.realloc(nCount + 1); aFilterArgs[nCount] <<= xInfoSet; @@ -1149,7 +1149,7 @@ void ODatabaseDocument::impl_closeControllerFrames_nolck_throw( sal_Bool _bDeliv { Controllers aCopy = m_aControllers; - Controllers::iterator aEnd = aCopy.end(); + Controllers::iterator aEnd = aCopy.end(); for ( Controllers::iterator aIter = aCopy.begin(); aIter != aEnd ; ++aIter ) { if ( !aIter->is() ) @@ -1785,13 +1785,13 @@ Reference< XTitle > ODatabaseDocument::impl_getTitleHelper_throw() m_pImpl->m_aContext.createComponent( "com.sun.star.frame.Desktop" ), UNO_QUERY_THROW ); uno::Reference< frame::XModel > xThis (getThis(), uno::UNO_QUERY_THROW); - + ::framework::TitleHelper* pHelper = new ::framework::TitleHelper(m_pImpl->m_aContext.getLegacyServiceFactory()); m_xTitleHelper.set(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis ); pHelper->connectWithUntitledNumbers (xDesktop); } - + return m_xTitleHelper; } @@ -1818,7 +1818,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel uno::Reference< frame::XModel > xThis(static_cast< frame::XModel* >(this), uno::UNO_QUERY_THROW); ::comphelper::NumberedCollection* pHelper = new ::comphelper::NumberedCollection(); xNumberedControllers.set(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); - + pHelper->setOwner (xThis); //pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : ")); @@ -1826,7 +1826,7 @@ uno::Reference< frame::XUntitledNumbers > ODatabaseDocument::impl_getUntitledHel } else xNumberedControllers = aFind->second; - + return xNumberedControllers; } @@ -1863,7 +1863,7 @@ void SAL_CALL ODatabaseDocument::addTitleChangeListener( const uno::Reference< f uno::Reference< frame::XTitleChangeBroadcaster > xBroadcaster( impl_getTitleHelper_throw(), uno::UNO_QUERY_THROW ); xBroadcaster->addTitleChangeListener( xListener ); } - + //============================================================================= // css.frame.XTitleChangeBroadcaster void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference< frame::XTitleChangeListener >& xListener ) @@ -1885,7 +1885,7 @@ void SAL_CALL ODatabaseDocument::removeTitleChangeListener( const uno::Reference DocumentGuard aGuard( *this ); return impl_getUntitledHelper_throw(xComponent)->leaseNumber (xComponent); } - + //============================================================================= // css.frame.XUntitledNumbers void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber ) @@ -1895,7 +1895,7 @@ void SAL_CALL ODatabaseDocument::releaseNumber( ::sal_Int32 nNumber ) DocumentGuard aGuard( *this ); impl_getUntitledHelper_throw()->releaseNumber (nNumber); } - + //============================================================================= // css.frame.XUntitledNumbers void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference< uno::XInterface >& xComponent ) diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 4b42eaae2..2196932f0 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -32,7 +32,7 @@ #define _DBA_CORE_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 8e049f8b9..63030f75f 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -42,7 +42,7 @@ //--------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //......................................................................... diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index 0a54c86c5..5990d390a 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -37,7 +37,7 @@ #include <tools/resmgr.hxx> #endif #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 4152e50ed..9dba4d1ef 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ #include <vcl/waitobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> @@ -136,7 +136,7 @@ namespace adabasui ODatabaseCreator(const Reference<XCreateCatalog>& _rxCreateCatalog ,Window* _pErrorWindow ,const Reference< XMultiServiceFactory >& _xORB - ,const Sequence< PropertyValue>& _rValues) + ,const Sequence< PropertyValue>& _rValues) : m_aValues(_rValues) , m_xCreateCatalog(_rxCreateCatalog) , m_xORB(_xORB) @@ -144,7 +144,7 @@ namespace adabasui {} void setTerminateHandler(const Link& _aTerminateHandler) { m_aTerminateHandler = _aTerminateHandler; } - + protected: /// Working method which should be overridden. @@ -330,7 +330,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, sal_Bool bError = fillEnvironmentVariable(s_sWork,m_sDbWork); if ( bError || !m_sDbWork.Len() ) bError = fillEnvironmentVariable(s_sRoot,m_sDbWork); - + bError = fillEnvironmentVariable(s_sConfig,m_sDbConfig); if ( bError || !m_sDbConfig.Len() ) bError = fillEnvironmentVariable(s_sRoot,m_sDbConfig); @@ -514,7 +514,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) else bOk = TRUE; - + if (!bOk) { ErrorBox(this, WB_OK, aErrorMessage).Execute(); @@ -561,7 +561,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) m_aCreatorWait = ::std::auto_ptr<WaitObject>(new WaitObject(this)); m_aCreatorThread = ::std::auto_ptr<ODatabaseCreator>(new ODatabaseCreator(m_xCreateCatalog,this,m_xORB,aCreateArgs)); m_aCreatorThread->setTerminateHandler(LINK(this,OAdabasNewDbDlg,TerminateHdl)); - m_aCreatorThread->create(); + m_aCreatorThread->create(); return TRUE; } @@ -636,7 +636,7 @@ 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 ); - + String aPath; if(pButton == &m_PB_SYSDEVSPACE) aPath = m_SYSDEV_File; @@ -794,7 +794,7 @@ sal_Bool OAdabasNewDbDlg::fillEnvironmentVariable(const ::rtl::OUString& _sVaria _rsValue = sTemp; rtl_uString_release(pDbVar); pDbVar = NULL; - + // ensure dir exists osl::FileBase::RC rc = osl::Directory::createPath(_rsValue); if(rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST) diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc index 74e77cb4d..411d530aa 100644 --- a/dbaccess/source/ext/adabas/adabasui_resource.hrc +++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc @@ -32,7 +32,7 @@ #define _ADABASUI_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_DB_EXTENSIONS_START diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 7bc71199c..ba5a0d351 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -31,7 +31,7 @@ #ifndef DBACCESS_DBMM_GLOBAL_HRC #define DBACCESS_DBMM_GLOBAL_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //===================================================================== //= bases diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index a7432cb71..28a714cb5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -56,7 +56,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index 213a2af29..b134ab697 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ #include <tools/urlobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> @@ -603,7 +603,7 @@ void OCfgImport::createDataSource(const ::rtl::OUString& _sName) Reference<XOfficeDatabaseDocument> xOfficeDoc(m_xModel,UNO_QUERY); if ( xOfficeDoc.is() ) m_xCurrentDS.set(xOfficeDoc->getDataSource(),UNO_QUERY); - + INetURLObject aURL(rsWorkPath,INetURLObject::WAS_ENCODED); aURL.insertName(_sName,false,INetURLObject::LAST_SEGMENT,true,INetURLObject::ENCODE_ALL); @@ -1237,22 +1237,22 @@ void SAL_CALL OCfgImport::endProperty() } // ----------------------------------------------------------------------------- -void SAL_CALL OCfgImport::addProperty( +void SAL_CALL OCfgImport::addProperty( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, const Type& /*aType*/ ) - throw( + throw( MalformedDataException, WrappedTargetException ) { } // ----------------------------------------------------------------------------- -void SAL_CALL OCfgImport::addPropertyWithValue( +void SAL_CALL OCfgImport::addPropertyWithValue( const rtl::OUString& /*aName*/, sal_Int16 /*aAttributes*/, - const Any& /*aValue*/ ) - throw( + const Any& /*aValue*/ ) + throw( MalformedDataException, WrappedTargetException ) { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 4d3aa9c19..30105438f 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ #include <cppuhelper/implbase2.hxx> #include <osl/file.hxx> #include <sfx2/docfile.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> @@ -439,7 +439,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: sal_Bool bSuccess = sal_True; - // If there's no interaction handler in the media descriptor, put one. + // If there's no interaction handler in the media descriptor, put one. // By definition, loading via loadComponentFromURL (and thus via the content loader here) // is allowed to raise UI. To not burden every place inside the document with creating // a default handler, we simply ensure there is one. @@ -490,7 +490,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: if ( bCreateNew && xModel.is() ) { if ( bNewAndInteractive ) - { + { bSuccess = impl_executeNewDatabaseWizard( xModel, bStartTableWizard ); } else diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 68cd26f44..16d745ce7 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,15 +30,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" - + #ifndef DBA_XMLEXPORT_HXX #include "xmlExport.hxx" #endif -#ifndef DBA_XMLAUTOSTYLE_HXX +#ifndef DBA_XMLAUTOSTYLE_HXX #include "xmlAutoStyle.hxx" #endif #ifndef _FLT_REGHELPER_HXX_ -#include "flt_reghelper.hxx" +#include "flt_reghelper.hxx" #endif #ifndef _XMLOFF_PROGRESSBARHELPER_HXX #include <xmloff/ProgressBarHelper.hxx> @@ -103,8 +103,8 @@ #ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include <com/sun/star/awt/FontDescriptor.hpp> #endif -#include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <svl/filenotation.hxx> +#include <unotools/pathoptions.hxx> #include <tools/diagnose_ex.h> #include <connectivity/DriversConfig.hxx> @@ -134,17 +134,17 @@ namespace dbaxml }; } // ----------------------------------------------------------------------------- -extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( ) +extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExport > aAutoRegistration; } //-------------------------------------------------------------------------- -extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( ) +extern "C" void SAL_CALL createRegistryInfo_OSettingsExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBExportHelper > aAutoRegistration; } //-------------------------------------------------------------------------- -extern "C" void SAL_CALL createRegistryInfo_OFullExport( ) +extern "C" void SAL_CALL createRegistryInfo_OFullExport( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFullExportHelper > aAutoRegistration; } @@ -174,7 +174,7 @@ namespace dbaxml return aSupported; } - + //--------------------------------------------------------------------- Reference< XInterface > SAL_CALL ODBFullExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) { @@ -192,7 +192,7 @@ namespace dbaxml aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); return aSupported; } - + //--------------------------------------------------------------------- ::rtl::OUString lcl_implGetPropertyXMLType(const Type& _rType) { @@ -263,7 +263,7 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 _GetNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_DB), GetXMLToken(XML_N_DB_OASIS), XML_NAMESPACE_DB ); - + if( (nExportFlag & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 ) _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); @@ -320,7 +320,7 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 } // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO1_STATIC( ODBExport, "com.sun.star.comp.sdb.DBExportFilter", "com.sun.star.document.ExportFilter") -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void ODBExport::exportDataSource() { try @@ -452,7 +452,7 @@ void ODBExport::exportDataSource() // special handlings if ( pProperties->Name == PROPERTY_BOOLEANCOMPARISONMODE ) { - sal_Int32 nValue = 0; + sal_Int32 nValue = 0; aValue >>= nValue; if ( sValue.equalsAscii("0") ) sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer")); @@ -542,7 +542,7 @@ void ODBExport::exportDataSource() // ----------------------------------------------------------------------------- void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettings) { - const ::xmloff::token::XMLTokenEnum pSettings[] = { + const ::xmloff::token::XMLTokenEnum pSettings[] = { XML_IS_TABLE_NAME_LENGTH_LIMITED ,XML_ENABLE_SQL92_CHECK ,XML_APPEND_TABLE_ALIAS_NAME @@ -578,7 +578,7 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin // ----------------------------------------------------------------------------- void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings) { - const ::xmloff::token::XMLTokenEnum pSettings[] = { + const ::xmloff::token::XMLTokenEnum pSettings[] = { XML_SHOW_DELETED ,XML_SYSTEM_DRIVER_SETTINGS ,XML_BASE_DN @@ -716,9 +716,9 @@ void ODBExport::exportConnectionData() SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, sal_True, sal_True); } } - + } - + exportLogin(); } // ----------------------------------------------------------------------------- @@ -739,7 +739,7 @@ void ODBExport::exportDataSourceSettings() aSimpleType = ::comphelper::getSequenceElementType( aIter->Value.getValueType() ); else aSimpleType = aIter->Type; - + AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,bIsSequence ? XML_TRUE : XML_FALSE ); AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, aIter->Name ); @@ -751,7 +751,7 @@ void ODBExport::exportDataSourceSettings() if ( aSeq.getLength() ) sTypeName = lcl_implGetPropertyXMLType(aSeq[0].getValueType()); } - + AddAttribute( XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, sTypeName ); SvXMLElementExport aDataSourceSetting( *this, XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, sal_True, sal_True ); @@ -812,7 +812,7 @@ void ODBExport::exportCharSet() if ( m_sCharSet.getLength() ) { AddAttribute(XML_NAMESPACE_DB, XML_ENCODING,m_sCharSet); - + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_FONT_CHARSET, sal_True, sal_True); } } @@ -822,7 +822,7 @@ void ODBExport::exportDelimiter() if ( m_aDelimiter.get() && m_aDelimiter->bUsed ) { AddAttribute(XML_NAMESPACE_DB, XML_FIELD,m_aDelimiter->sField); - AddAttribute(XML_NAMESPACE_DB, XML_STRING,m_aDelimiter->sText); + AddAttribute(XML_NAMESPACE_DB, XML_STRING,m_aDelimiter->sText); AddAttribute(XML_NAMESPACE_DB, XML_DECIMAL,m_aDelimiter->sDecimal); AddAttribute(XML_NAMESPACE_DB, XML_THOUSAND,m_aDelimiter->sThousand); SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DELIMITER, sal_True, sal_True); @@ -834,7 +834,7 @@ void ODBExport::exportAutoIncrement() if ( m_aAutoIncrement.get() ) { AddAttribute(XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second); - AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first); + AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first); SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_AUTO_INCREMENT, sal_True, sal_True); } } @@ -905,7 +905,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection else if ( xProp.is() ) _aMemFunc(this,xProp.get()); } - } + } } // ----------------------------------------------------------------------------- void ODBExport::exportComponent(XPropertySet* _xProp) @@ -933,7 +933,7 @@ void ODBExport::exportQuery(XPropertySet* _xProp) if ( getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYFILTER)) ) AddAttribute(XML_NAMESPACE_DB, XML_APPLY_FILTER,XML_TRUE); - if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER) + if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER) && getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYORDER)) ) AddAttribute(XML_NAMESPACE_DB, XML_APPLY_ORDER,XML_TRUE); @@ -960,7 +960,7 @@ void ODBExport::exportTable(XPropertySet* _xProp) if ( getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYFILTER)) ) AddAttribute(XML_NAMESPACE_DB, XML_APPLY_FILTER,XML_TRUE); - if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER) + if ( _xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER) && getBOOL(_xProp->getPropertyValue(PROPERTY_APPLYORDER)) ) AddAttribute(XML_NAMESPACE_DB, XML_APPLY_ORDER,XML_TRUE); @@ -970,7 +970,7 @@ void ODBExport::exportTable(XPropertySet* _xProp) Reference<XColumnsSupplier> xCol(_xProp,UNO_QUERY); exportColumns(xCol); exportFilter(_xProp,PROPERTY_FILTER,XML_FILTER_STATEMENT); - exportFilter(_xProp,PROPERTY_ORDER,XML_ORDER_STATEMENT); + exportFilter(_xProp,PROPERTY_ORDER,XML_ORDER_STATEMENT); } // ----------------------------------------------------------------------------- void ODBExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt) @@ -1049,7 +1049,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) exportStyleName(aFind->second.get(),*pAtt); AddAttributeList(xAtt); SvXMLElementExport aColumn(*this,XML_NAMESPACE_DB, XML_COLUMN, sal_True, sal_True); - + } return; } @@ -1068,7 +1068,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) exportStyleName(xProp.get(),*pAtt); sal_Bool bHidden = getBOOL(xProp->getPropertyValue(PROPERTY_HIDDEN)); - + ::rtl::OUString sValue; xProp->getPropertyValue(PROPERTY_HELPTEXT) >>= sValue; Any aColumnDefault; @@ -1079,7 +1079,7 @@ void ODBExport::exportColumns(const Reference<XColumnsSupplier>& _xColSup) AddAttribute(XML_NAMESPACE_DB, XML_NAME,*pIter); if ( bHidden ) AddAttribute(XML_NAMESPACE_DB, XML_VISIBLE,XML_FALSE); - + if ( sValue.getLength() ) AddAttribute(XML_NAMESPACE_DB, XML_HELP_MESSAGE,sValue); @@ -1144,7 +1144,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getQueryDefinitions(); if ( xCollection.is() && xCollection->hasElements() ) { - ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; + ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportQuery) ); else @@ -1163,7 +1163,7 @@ void ODBExport::exportTables(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getTables(); if ( xCollection.is() && xCollection->hasElements() ) { - ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; + ::std::auto_ptr< ::comphelper::mem_fun1_t<ODBExport,XPropertySet* > > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t<ODBExport,XPropertySet* >(&ODBExport::exportTable) ); else @@ -1225,7 +1225,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) } m_aCurrentPropertyStates.clear(); } - else + else { // here I know I have a column TExportPropMapperPair pExportHelper[] = { TExportPropMapperPair(m_xColumnExportHelper,TEnumMapperPair(&m_aAutoStyleNames,XML_STYLE_FAMILY_TABLE_COLUMN )) @@ -1260,7 +1260,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) } ++aItr; } // while ( aItr != aEnd ) - + } // if ( !aPropStates.empty() ) if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second ) ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates )); @@ -1359,7 +1359,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps) } } } - + } // ----------------------------------------------------------------------------- void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps) @@ -1432,7 +1432,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper( { if ( !m_xCellStylesPropertySetMapper.is() ) { - m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylesPropertySetMapper(); + m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylesPropertySetMapper(); } return m_xCellStylesPropertySetMapper; } @@ -1441,7 +1441,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMappe { if ( !m_xColumnStylesPropertySetMapper.is() ) { - m_xColumnStylesPropertySetMapper = OXMLHelper::GetColumnStylesPropertySetMapper(); + m_xColumnStylesPropertySetMapper = OXMLHelper::GetColumnStylesPropertySetMapper(); } return m_xColumnStylesPropertySetMapper; } diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index ab348bcc2..35b4b84e8 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,8 +58,8 @@ #include <tools/diagnose_ex.h> #endif #include <comphelper/sequence.hxx> -#include <svtools/filenotation.hxx> -#include <svtools/pathoptions.hxx> +#include <svl/filenotation.hxx> +#include <unotools/pathoptions.hxx> #include "dsntypes.hxx" namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 6eed831a1..c56d70a9e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,10 @@ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #endif #ifndef DBA_XMLFILTER_HXX -#include "xmlfilter.hxx" +#include "xmlfilter.hxx" #endif #ifndef _FLT_REGHELPER_HXX_ -#include "flt_reghelper.hxx" +#include "flt_reghelper.hxx" #endif #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> @@ -124,7 +124,7 @@ #include <vos/mutex.hxx> #endif #include <svtools/sfxecode.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> #endif @@ -140,7 +140,7 @@ using namespace ::com::sun::star; -extern "C" void SAL_CALL createRegistryInfo_ODBFilter( ) +extern "C" void SAL_CALL createRegistryInfo_ODBFilter( ) { static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration; } @@ -153,7 +153,7 @@ namespace dbaxml { public: typedef enum { E_JAVA, E_CALC } StartType; - FastLoader(uno::Reference< lang::XMultiServiceFactory > const & _xFactory,StartType _eType) + FastLoader(uno::Reference< lang::XMultiServiceFactory > const & _xFactory,StartType _eType) :m_xFactory(_xFactory) ,m_eWhat(_eType) {} @@ -203,7 +203,7 @@ namespace dbaxml sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY_THROW)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); - + if ( xFrameLoad.is() ) { uno::Sequence < beans::PropertyValue > aArgs( 3); @@ -380,7 +380,7 @@ sal_Int32 ReadThroughComponent( { uno::Reference< io::XStream > xDocStream; sal_Bool bEncrypted = sal_False; - + try { // open stream (and set parser input) @@ -389,7 +389,7 @@ sal_Int32 ReadThroughComponent( { // stream name not found! Then try the compatibility name. // if no stream can be opened, return immediatly with OK signal - + // do we even have an alternative name? if ( NULL == pCompatibilityStreamName ) return 0; @@ -439,7 +439,7 @@ sal_Int32 ReadThroughComponent( // ------------- DBG_NAME(ODBFilter) -ODBFilter::ODBFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF ) +ODBFilter::ODBFilter( const uno::Reference< XMultiServiceFactory >& _rxMSF ) :SvXMLImport(_rxMSF) ,m_bNewFormat(false) { @@ -466,7 +466,7 @@ ODBFilter::~ODBFilter() throw() // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO1_STATIC( ODBFilter, "com.sun.star.comp.sdb.DBFilter", "com.sun.star.document.ImportFilter") // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor ) +sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { uno::Reference< ::com::sun::star::awt::XWindow > xWindow; @@ -489,7 +489,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto if ( pFocusWindow ) pFocusWindow->LeaveWait(); } - + return bRet; } @@ -507,7 +507,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) OSL_ENSURE( sFileName.getLength(), "ODBFilter::implImport: no URL given!" ); sal_Bool bRet = ( sFileName.getLength() != 0 ); - if ( bRet ) + if ( bRet ) { uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY); @@ -556,7 +556,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) bRet = nRet == 0; - if ( bRet ) + if ( bRet ) { uno::Reference< XModifiable > xModi(GetModel(),UNO_QUERY); if ( xModi.is() ) @@ -670,12 +670,12 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap) pIter->Value >>= aValue; _rMap.insert(TPropertyNameMap::value_type(pIter->Name,aValue)); } - + } // ----------------------------------------------------------------------------- const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const { - if ( !m_pDocElemTokenMap.get() ) + if ( !m_pDocElemTokenMap.get() ) { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { @@ -697,7 +697,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const // ----------------------------------------------------------------------------- const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const { - if ( !m_pDatabaseElemTokenMap.get() ) + if ( !m_pDatabaseElemTokenMap.get() ) { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { @@ -721,21 +721,21 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, - { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, - { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, - { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, - { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, - { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, - { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, - { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, - { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, - { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, - { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, - { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, - { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, - { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, - { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, + { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, + { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, + { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, + { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, + { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, + { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, + { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, + { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, + { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, + { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, + { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, + { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, + { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, + { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, + { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT}, { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN}, { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER}, @@ -758,7 +758,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS}, { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH}, { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET}, - { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, + { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, XML_TOKEN_MAP_END }; m_pDataSourceElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -816,7 +816,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE}, { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME}, { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, - { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, + { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, XML_TOKEN_MAP_END }; m_pDataSourceInfoElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -879,7 +879,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME}, { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER}, { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER}, - { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, + { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, XML_TOKEN_MAP_END }; m_pQueryElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -943,7 +943,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMappe { if ( !m_xColumnStylesPropertySetMapper.is() ) { - m_xColumnStylesPropertySetMapper = OXMLHelper::GetColumnStylesPropertySetMapper(); + m_xColumnStylesPropertySetMapper = OXMLHelper::GetColumnStylesPropertySetMapper(); } return m_xColumnStylesPropertySetMapper; } @@ -952,7 +952,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper( { if ( !m_xCellStylesPropertySetMapper.is() ) { - m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylesPropertySetMapper(); + m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylesPropertySetMapper(); } return m_xCellStylesPropertySetMapper; } diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 1fafdcd3b..8cc2f3e63 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc @@ -32,7 +32,7 @@ #define DBACCESS_SDBT_RESOURCE_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 2af08e0d0..42eeedc7b 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ #include <tools/diagnose_ex.h> #endif #ifndef SVTOOLS_URIHELPER_HXX -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #endif #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> @@ -135,10 +135,10 @@ #include <vcl/menu.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef INCLUDED_SVTOOLS_INTERNALOPTIONS_HXX -#include <svtools/internaloptions.hxx> +#include <unotools/internaloptions.hxx> #endif #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> @@ -178,7 +178,7 @@ #include <sfx2/mailmodelapi.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> @@ -219,10 +219,10 @@ #include <sfx2/QuerySaveDocument.hxx> #endif #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _COMPHELPER_SEQUENCE_HXX_ #include <comphelper/sequence.hxx> @@ -1621,7 +1621,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:OpenUrl", SID_OPENURL, CommandGroup::APPLICATION ); // this one should not appear under Tools->Customize->Keyboard - implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection", + implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection", SID_APP_NEW_REPORT_PRE_SEL,CommandGroup::INTERNAL ); implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 05b25c7ad..edd68410d 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,7 +204,7 @@ #include <sfx2/filedlghelper.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> @@ -835,7 +835,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc if ( xSrcNameAccess.is() && xDstNameAccess.is() && xSrcNameAccess->hasElements() && xAppend.is() ) { Reference<XPropertySet> xDstProp(xFac->createDataDescriptor()); - + Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index ff9bd2516..7e08e4016 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -545,7 +545,7 @@ void OApplicationController::previewChanged( sal_Int32 _nMode ) // // String sTitle = String(ModuleRes(STR_APP_TITLE)); // sName = sName + sTitle; -//#ifndef PRODUCT +//#ifdef DBG_UTIL // ::rtl::OUString aDefault; // sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" [")); // sName += utl::Bootstrap::getBuildIdData( aDefault ); diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 01fa100b4..c4e56e0a8 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ #endif #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _SV_TOOLBOX_HXX +#endif +#ifndef _SV_TOOLBOX_HXX #include <vcl/toolbox.hxx> #endif #ifndef _UTL_CONFIGMGR_HXX_ @@ -70,7 +70,7 @@ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" @@ -105,8 +105,8 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX +#include <unotools/pathoptions.hxx> #endif #include "IApplicationController.hxx" @@ -145,8 +145,8 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev m_pPanel->setChildWindow(pSwap); m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW); - m_pPanel->Show(); - + m_pPanel->Show(); + m_pDetailView = new OApplicationDetailView(*this,_ePreviewMode); m_pDetailView->Show(); @@ -200,7 +200,7 @@ void OAppBorderWindow::Resize() nX = ::std::max(m_pPanel->GetWidthPixel() ,nX); m_pPanel->SetPosSizePixel(Point(0,0),Size(nX,nOutputHeight)); } - + if ( m_pDetailView ) m_pDetailView->SetPosSizePixel(Point(nX + aFLSize.Width(),0),Size(nOutputWidth - nX - aFLSize.Width(),nOutputHeight)); } @@ -239,7 +239,7 @@ void OAppBorderWindow::ImplInitSettings() if( true ) SetBackground( rStyleSettings.GetDialogColor() ); - + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ @@ -288,7 +288,7 @@ OApplicationView::OApplicationView( Window* pParent m_pWin = new OAppBorderWindow(this,_ePreviewMode); m_pWin->SetUniqueId(UID_APP_VIEW_BORDER_WIN); - m_pWin->Show(); + m_pWin->Show(); ImplInitSettings(); } @@ -330,7 +330,7 @@ void OApplicationView::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -377,7 +377,7 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt ) } break; } - + return ODataView::PreNotify(rNEvt); } // ----------------------------------------------------------------------------- @@ -410,21 +410,21 @@ sal_Bool OApplicationView::isPasteAllowed() void OApplicationView::copy() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->copy(); } // ----------------------------------------------------------------------------- void OApplicationView::cut() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->cut(); } // ----------------------------------------------------------------------------- void OApplicationView::paste() { IClipboardTest* pTest = getActiveChild(); - if ( pTest ) + if ( pTest ) pTest->paste(); } // ----------------------------------------------------------------------------- @@ -597,7 +597,7 @@ void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, try { Reference<XNameAccess> xNameAccess; - if ( _bTable ) + if ( _bTable ) { Reference<XTablesSupplier> xSup(_xConnection,UNO_QUERY); if ( xSup.is() ) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 0be8b7a17..9eb25d7d8 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,13 +105,13 @@ #include <tools/urlobj.hxx> #endif #ifndef SVTOOLS_URIHELPER_HXX -#include <svtools/urihelper.hxx> +#include <svl/urihelper.hxx> #endif #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_ #include "datasourceconnector.hxx" #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_ #include <com/sun/star/frame/FrameSearchFlag.hpp> @@ -455,7 +455,7 @@ void OGenericUnoController::disposing(const EventObject& Source) throw( RuntimeE //------------------------------------------------------------------------ void OGenericUnoController::modified(const EventObject& aEvent) throw( RuntimeException ) { - ::osl::MutexGuard aGuard( getMutex() ); + ::osl::MutexGuard aGuard( getMutex() ); if ( !isDataSourceReadOnly() ) { Reference<XModifiable> xModi(aEvent.Source,UNO_QUERY); @@ -483,7 +483,7 @@ Reference< XWindow > SAL_CALL OGenericUnoController::getComponentWindow() throw void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) throw( RuntimeException ) { vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard( getMutex() ); + ::osl::MutexGuard aGuard( getMutex() ); stopFrameListening( m_aCurrentFrame.getFrame() ); Reference< XFrame > xFrame = m_aCurrentFrame.attachFrame( _rxFrame ); @@ -732,7 +732,7 @@ void OGenericUnoController::InvalidateAll_Impl() { // --------------------------------- // invalidate all aupported features - + for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin(); aIter != m_aSupportedFeatures.end(); ++aIter @@ -925,7 +925,7 @@ void OGenericUnoController::disposing() Dispatch aStatusListener = m_arrStatusListener; Dispatch::iterator aEnd = aStatusListener.end(); for (Dispatch::iterator aIter = aStatusListener.begin(); aIter != aEnd; ++aIter) - { + { aIter->xListener->disposing(aDisposeEvent); } m_arrStatusListener.clear(); @@ -1378,7 +1378,7 @@ void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL } URL aURL; aURL.Complete = suURL; - + openHelpAgent( aURL ); } @@ -1441,10 +1441,10 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw() { Reference< XUntitledNumbers > xUntitledProvider(getPrivateModel(), UNO_QUERY ); Reference< XController > xThis(static_cast< XController* >(this), UNO_QUERY_THROW); - + ::framework::TitleHelper* pHelper = new ::framework::TitleHelper(m_xServiceFactory); m_xTitleHelper.set( static_cast< ::cppu::OWeakObject* >(pHelper), UNO_QUERY_THROW); - + pHelper->setOwner (xThis ); pHelper->connectWithUntitledNumbers (xUntitledProvider); } @@ -1473,7 +1473,7 @@ void SAL_CALL OGenericUnoController::setTitle(const ::rtl::OUString& sTitle) m_bExternalTitle = sal_True; impl_getTitleHelper_throw()->setTitle (sTitle); } - + //============================================================================= // XTitleChangeBroadcaster void SAL_CALL OGenericUnoController::addTitleChangeListener(const Reference< XTitleChangeListener >& xListener) @@ -1591,14 +1591,14 @@ bool OGenericUnoController::interceptUserInput( const NotifyEvent& _rEvent ) sal_Bool OGenericUnoController::isCommandChecked(sal_uInt16 _nCommandId) const { FeatureState aState = GetState( _nCommandId ); - + return aState.bChecked && (sal_Bool)*aState.bChecked; } // ----------------------------------------------------------------------------- sal_Bool OGenericUnoController::isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const { OSL_ENSURE( _rCompleteCommandURL.getLength(), "OGenericUnoController::isCommandEnabled: Empty command url!" ); - + sal_Bool bIsEnabled = sal_False; SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( _rCompleteCommandURL ); if ( aIter != m_aSupportedFeatures.end() ) diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 832f90f98..1262bf366 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -121,7 +121,7 @@ #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_ALGITEM_HXX //autogen @@ -137,19 +137,19 @@ #endif #ifndef _NUMUNO_HXX -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #endif #ifndef _SFXITEMPOOL_HXX //autogen wg. SfxItemInfo -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXRNGITEM_HXX -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #endif #ifndef _SV_WAITOBJ_HXX @@ -160,7 +160,7 @@ #endif #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include <cppuhelper/queryinterface.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index f7046122b..3b0dfdf1a 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,9 +114,9 @@ #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sot/storage.hxx> -#include <svtools/filenotation.hxx> -#include <svtools/intitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/filenotation.hxx> +#include <svl/intitem.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/svlbitm.hxx> #include <svtools/svtreebx.hxx> #include <svx/algitem.hxx> @@ -1410,7 +1410,7 @@ void SbaTableQueryBrowser::attachFrame(const Reference< ::com::sun::star::frame: m_xCurrentFrameParent = xCurrentFrame->findFrame(::rtl::OUString::createFromAscii("_parent"),FrameSearchFlag::PARENT); if ( m_xCurrentFrameParent.is() ) m_xCurrentFrameParent->addFrameActionListener((::com::sun::star::frame::XFrameActionListener*)this); - + // obtain our toolbox try { @@ -1744,7 +1744,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const aReturn.bEnabled = m_aCurrentFrame.isActive(); break; } // if ( getBrowserView()->getVclControl()->GetSelectRowCount() ) - else + else aReturn.bEnabled = pControl->canCopyCellText(pControl->GetCurRow(), pControl->GetCurColumnId()); break; } diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 05f541ca8..c1c640b7e 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -37,7 +37,7 @@ #include "FieldControls.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index cdad2f612..aac34cc36 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -53,12 +53,12 @@ #include <svx/numfmtsh.hxx> #include <svx/svxids.hrc> #include <svx/algitem.hxx> -#include <svtools/itempool.hxx> -#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svtools/zforlist.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/rngitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/numuno.hxx> +#include <svl/itempool.hxx> +#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> +#include <svl/zforlist.hxx> +#include <svl/rngitem.hxx> +#include <svl/intitem.hxx> +#include <svl/numuno.hxx> #include <svtools/transfer.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/NumberFormat.hpp> diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index 3b1feb4e0..07f6e7679 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -36,8 +36,8 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 627f10e57..136f51ffd 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ #include <vcl/help.hxx> #endif #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX -#include <svtools/historyoptions.hxx> +#include <unotools/historyoptions.hxx> #endif #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> @@ -81,7 +81,7 @@ #include <tools/urlobj.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif //........................................................................ @@ -190,7 +190,7 @@ namespace dbaui Sequence<Reference< XGraphic> > xIconList( xImageManager->getImages( 0, aCommandList ) ); if ( !xIconList.hasElements() ) break; - + aIcon = Graphic( xIconList[0] ).GetBitmapEx(); } while ( false ); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index bca065c12..499dcacfe 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include "undosqledit.hxx" #include "QueryDesignView.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> ////////////////////////////////////////////////////////////////////////// // OSqlEdit @@ -67,8 +67,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : ImplSetFont(); // listen for change of Font and Color Settings - StartListening(m_SourceViewConfig); - StartListening(m_ColorConfig); + m_SourceViewConfig.AddListener( this ); + m_ColorConfig.AddListener(this); //#i97044# EnableFocusSelectionHide( FALSE ); @@ -79,9 +79,9 @@ OSqlEdit::~OSqlEdit() { DBG_DTOR(OSqlEdit,NULL); if (m_timerUndoActionCreation.IsActive()) - m_timerUndoActionCreation.Stop(); - EndListening(m_SourceViewConfig); - EndListening(m_ColorConfig); + m_timerUndoActionCreation.Stop(); + m_SourceViewConfig.RemoveListener(this); + m_ColorConfig.RemoveListener(this); } //------------------------------------------------------------------------------ void OSqlEdit::KeyInput( const KeyEvent& rKEvt ) @@ -163,7 +163,7 @@ IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/) m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_SBA_QRY_EXECUTE); m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_CUT); m_pView->getContainerWindow()->getDesignView()->getController().InvalidateFeature(SID_COPY); - + m_lnkTextModifyHdl.Call(NULL); return 0; } @@ -180,13 +180,13 @@ void OSqlEdit::SetText(const String& rNewText) MultiLineEditSyntaxHighlight::SetText(rNewText); m_strOrigText =rNewText; -} +} // ----------------------------------------------------------------------------- void OSqlEdit::stopTimer() { m_bStopTimer = sal_True; if (m_timerInvalidate.IsActive()) - m_timerInvalidate.Stop(); + m_timerInvalidate.Stop(); } // ----------------------------------------------------------------------------- void OSqlEdit::startTimer() @@ -196,11 +196,11 @@ void OSqlEdit::startTimer() m_timerInvalidate.Start(); } -void OSqlEdit::Notify( SfxBroadcaster& rBC, const SfxHint& /*rHint*/ ) +void OSqlEdit::ConfigurationChanged( utl::ConfigurationBroadcaster* pOption, sal_uInt32 ) { - if (&rBC == &m_SourceViewConfig) - ImplSetFont(); - else if (&rBC == &m_ColorConfig) + if ( pOption == &m_SourceViewConfig ) + ImplSetFont(); + else if ( pOption == &m_ColorConfig ) MultiLineEditSyntaxHighlight::UpdateData(); } diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index a7e19d70c..dd5820fb4 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #include <svtools/miscopt.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> @@ -192,7 +192,7 @@ namespace dbaui break; } } - + // check if paste special is allowed, when not don't add DROPDOWN pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | TIB_DROPDOWN); } @@ -201,7 +201,7 @@ namespace dbaui void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) { @@ -242,7 +242,7 @@ namespace dbaui Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); - + short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; if ( bHighContrast ) nImageType |= ImageType::COLOR_HIGHCONTRAST; @@ -257,7 +257,7 @@ namespace dbaui USHORT nItemId = pMenu->GetItemId(nPos); aSeq[0] = pMenu->GetItemCommand(nItemId); Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(nImageType,aSeq); - + Image aImage(aImages[0]); pMenu->SetItemImage(nItemId,aImage); TCommandState::iterator aFind = m_aStates.find( aSeq[0] ); @@ -283,7 +283,7 @@ namespace dbaui { // execute the menu vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent())); ::std::auto_ptr<PopupMenu> pMenu = getMenu(); @@ -302,7 +302,7 @@ namespace dbaui Reference<XDispatch> xDispatch = m_aListenerMap.find(m_aCommandURL)->second; if ( xDispatch.is() ) - { + { URL aUrl; Sequence < PropertyValue > aArgs; aUrl.Complete = m_aCommandURL; @@ -310,7 +310,7 @@ namespace dbaui if ( getURLTransformer().is() ) getURLTransformer()->parseStrict(aUrl); xDispatch->dispatch(aUrl,aArgs); - + } } return Reference< ::com::sun::star::awt::XWindow >(); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index d1a713523..af88f4c5e 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,9 +106,9 @@ #include <com/sun/star/awt/XWindow.hpp> #endif #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #endif -#ifndef _OSL_THREAD_H_ +#ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ @@ -135,7 +135,7 @@ DBG_NAME(OCollectionView) OCollectionView::OCollectionView( Window * pParent ,const Reference< XContent>& _xContent ,const ::rtl::OUString& _sDefaultName - ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) + ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW)) , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) ) , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) ) @@ -152,7 +152,7 @@ OCollectionView::OCollectionView( Window * pParent , m_xORB(_xORB) , m_bCreateForm(sal_True) { - DBG_CTOR(OCollectionView,NULL); + DBG_CTOR(OCollectionView,NULL); FreeResource(); OSL_ENSURE(m_xContent.is(),"No valid content!"); @@ -178,7 +178,7 @@ OCollectionView::OCollectionView( Window * pParent // ----------------------------------------------------------------------------- OCollectionView::~OCollectionView( ) { - DBG_DTOR(OCollectionView,NULL); + DBG_DTOR(OCollectionView,NULL); } // ----------------------------------------------------------------------------- Reference< XContent> OCollectionView::getSelectedFolder() const @@ -205,7 +205,7 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) { xNameAccess.set(xChild->getParent(),UNO_QUERY); if ( xNameAccess.is() ) - { + { m_xContent.set(xNameAccess,UNO_QUERY); xChild.set(m_xContent,UNO_QUERY); } @@ -239,8 +239,8 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) ::com::sun::star::ucb::IOErrorCode eError = IOErrorCode_NOT_EXISTING_PATH; ::rtl::OUString sTemp; InteractiveAugmentedIOException aException(sTemp,Reference<XInterface>(),eClass,eError,aValues); - - + + Reference<XInitialization> xIni(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))),UNO_QUERY); if ( xIni.is() ) { @@ -255,10 +255,10 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) OInteractionApprove* pApprove = new OInteractionApprove; pRequest->addContinuation(pApprove); - Reference< XInteractionHandler > xHandler(xIni,UNO_QUERY); + Reference< XInteractionHandler > xHandler(xIni,UNO_QUERY); xHandler->handle(xRequest); } - return 0; + return 0; } } } @@ -375,7 +375,7 @@ void OCollectionView::initCurrentPath() sPath = sCID.copy(s_sFormsCID.getLength()); else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() ) sPath = sCID.copy(s_sReportsCID.getLength()); - + m_aFTCurrentPath.SetText(sPath); Reference<XChild> xChild(m_xContent,UNO_QUERY); bEnable = xChild.is() && Reference<XNameAccess>(xChild->getParent(),UNO_QUERY).is(); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index cdc8566f6..d7d3b5b15 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,26 +44,26 @@ #ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" #endif -#ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#ifndef _SFXITEMSET_HXX +#include <svl/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _SFX_FCONTNR_HXX #include <sfx2/fcontnr.hxx> #endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX +#include <unotools/pathoptions.hxx> #endif -#ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#ifndef _SFXSTRITEM_HXX +#include <svl/stritem.hxx> #endif -#ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#ifndef _SFXENUMITEM_HXX +#include <svl/eitem.hxx> #endif -#ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#ifndef _SFXINTITEM_HXX +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -74,13 +74,13 @@ #ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" #endif -#ifndef _OSL_PROCESS_H_ +#ifndef _OSL_PROCESS_H_ #include <osl/process.h> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> #endif -#ifndef _FILEDLGHELPER_HXX +#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> #endif #ifndef _DBAUI_DBADMIN_HXX_ @@ -89,7 +89,7 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#ifndef _VCL_STDTEXT_HXX +#ifndef _VCL_STDTEXT_HXX #include <vcl/stdtext.hxx> #endif #ifndef _DBAUI_SQLMESSAGE_HXX_ @@ -102,12 +102,12 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> #endif #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ @@ -126,10 +126,10 @@ #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX +#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> #endif -#ifndef _UNOTOOLS_UCBHELPER_HXX +#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> #endif #ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX @@ -141,7 +141,7 @@ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> #endif -#ifndef _URLOBJ_HXX +#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H @@ -155,7 +155,7 @@ #endif #ifdef _ADO_DATALINK_BROWSE_ -#if defined( WNT ) +#if defined( WNT ) #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> @@ -213,7 +213,7 @@ DBG_NAME(OConnectionHelper) OConnectionHelper::~OConnectionHelper() { - + DBG_DTOR(OConnectionHelper,NULL); } @@ -244,7 +244,7 @@ DBG_NAME(OConnectionHelper) m_aConnectionURL.ClearModifyFlag(); } - OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); + OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } // ----------------------------------------------------------------------- @@ -331,7 +331,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 | WB_OPEN); + ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN); aFileDlg.AddFilter(sFilterName,sExt); aFileDlg.SetCurrentFilter(sFilterName); askForFileName(aFileDlg); @@ -341,7 +341,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 | WB_OPEN); + ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN); aFileDlg.AddFilter(sFilterName2,sAccdb); aFileDlg.SetCurrentFilter(sFilterName2); askForFileName(aFileDlg); @@ -367,7 +367,7 @@ DBG_NAME(OConnectionHelper) rtl_uString_release(pDbVar); pDbVar = NULL; } - + sEnvVarName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) { @@ -389,7 +389,7 @@ DBG_NAME(OConnectionHelper) rtl_uString_release(pDbVar); pDbVar = NULL; } - + sal_Bool bOldFashion = sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength(); if(!bOldFashion) // we have a normal adabas installation @@ -400,7 +400,7 @@ DBG_NAME(OConnectionHelper) if(sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength() && sRootDir.getLength()) { - + aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); if(!aInstalledDBs.size() && bOldFashion) @@ -471,12 +471,12 @@ DBG_NAME(OConnectionHelper) Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory(); OSL_ENSURE( xFactory.is(), "can't get service factory" ); - + Reference<XInterface> xInstance = xFactory->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")) ); OSL_ENSURE( xInstance.is(), "failed to create instance" ); Reference<XMozillaBootstrap> xMozillaBootstrap = Reference<XMozillaBootstrap>(xInstance,UNO_QUERY); OSL_ENSURE( xMozillaBootstrap.is(), "failed to create instance" ); - + if (xMozillaBootstrap.is()) { // collect all Mozilla Profiles @@ -484,7 +484,7 @@ DBG_NAME(OConnectionHelper) xMozillaBootstrap->getProfileList( profileType, list ); const ::rtl::OUString * pArray = list.getConstArray(); - + sal_Int32 count = list.getLength(); StringBag aProfiles; @@ -552,7 +552,7 @@ DBG_NAME(OConnectionHelper) if ( sFileURLEncoded.Len() ) { OFileNotation aFileNotation(sFileURLEncoded); - // set this decoded URL as text + // set this decoded URL as text sURL += String(aFileNotation.get(OFileNotation::N_SYSTEM)); } } @@ -801,7 +801,7 @@ DBG_NAME(OConnectionHelper) bExists = bIsFile? aCheckExistence.isDocument(): aCheckExistence.isFolder(); eExists = bExists? PATH_EXIST: PATH_NOT_EXIST; } - catch(const Exception&) + catch(const Exception&) { eExists = ( pHandler && pHandler->isDoesNotExist() ) ? PATH_NOT_EXIST: (bIsFile ? PATH_NOT_EXIST : PATH_NOT_KNOWN); } @@ -975,7 +975,7 @@ DBG_NAME(OConnectionHelper) setURLNoPrefix(sURL); m_aConnectionURL.SaveValueNoPrefix(); return sal_True; - } + } //------------------------------------------------------------------------- void OConnectionHelper::askForFileName(::sfx2::FileDialogHelper& _aFileOpen) { diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 0fd8ebc13..93ef5a588 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,23 +43,23 @@ #ifndef DBACCESS_DSMETA_HXX #include "dsmeta.hxx" #endif -#ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#ifndef _SFXITEMSET_HXX +#include <svl/itemset.hxx> #endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX +#include <unotools/pathoptions.hxx> #endif -#ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#ifndef _SFXSTRITEM_HXX +#include <svl/stritem.hxx> #endif -#ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#ifndef _SFXENUMITEM_HXX +#include <svl/eitem.hxx> #endif -#ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#ifndef _SFXINTITEM_HXX +#include <svl/intitem.hxx> #endif #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -70,13 +70,13 @@ #ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" #endif -#ifndef _OSL_PROCESS_H_ +#ifndef _OSL_PROCESS_H_ #include <osl/process.h> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> #endif -#ifndef _FILEDLGHELPER_HXX +#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> #endif #ifndef _DBAUI_DBADMIN_HXX_ @@ -85,7 +85,7 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#ifndef _VCL_STDTEXT_HXX +#ifndef _VCL_STDTEXT_HXX #include <vcl/stdtext.hxx> #endif #ifndef _DBAUI_SQLMESSAGE_HXX_ @@ -98,12 +98,12 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" #endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ +#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> #endif #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ @@ -134,10 +134,10 @@ #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX +#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> #endif -#ifndef _UNOTOOLS_UCBHELPER_HXX +#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> #endif #ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX @@ -149,7 +149,7 @@ #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> #endif -#ifndef _URLOBJ_HXX +#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif #ifndef _SFX_DOCFILT_HACK_HXX @@ -161,7 +161,7 @@ #endif #ifdef _ADO_DATALINK_BROWSE_ -#if defined( WNT ) +#if defined( WNT ) #include <tools/prewin.h> #include <windows.h> #include <tools/postwin.h> @@ -197,7 +197,7 @@ namespace dbaui //======================================================================== //= OConnectionTabPage //======================================================================== - DBG_NAME(OConnectionTabPage) + DBG_NAME(OConnectionTabPage) OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs) ,m_bUserGrabFocus(sal_True) @@ -212,7 +212,7 @@ namespace dbaui ,m_aTestJavaDriver(this, ModuleRes(PB_TESTDRIVERCLASS)) ,m_aTestConnection(this, ModuleRes(PB_TESTCONNECTION)) { - DBG_CTOR(OConnectionTabPage,NULL); + DBG_CTOR(OConnectionTabPage,NULL); m_aConnectionURL.SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified)); m_aJavaDriver.SetModifyHdl(getControlModifiedLink()); m_aJavaDriver.SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified)); @@ -228,7 +228,7 @@ namespace dbaui // ----------------------------------------------------------------------- OConnectionTabPage::~OConnectionTabPage() { - DBG_DTOR(OConnectionTabPage,NULL); + DBG_DTOR(OConnectionTabPage,NULL); } // ----------------------------------------------------------------------- @@ -377,7 +377,7 @@ namespace dbaui void OConnectionTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL1)); - + _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL2)); _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aJavaDriverLabel)); _rControlList.push_back(new ODisableWrapper<PushButton>(&m_aTestJavaDriver)); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index f38e794ed..6f2d9f4bf 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,19 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -98,7 +98,7 @@ #include "dsselect.hxx" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" @@ -229,7 +229,7 @@ namespace dbaui else m_aFT_HelpText.Hide(); - + if ( USHRT_MAX != _nHeaderResId ) SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderResId); @@ -256,7 +256,7 @@ namespace dbaui m_aFT_Connection.Hide(); m_aConnectionURL.SetModifyHdl(LINK(this, OConnectionTabPageSetup, OnEditModified)); - + SetRoadmapStateValue(sal_False); } @@ -270,7 +270,7 @@ namespace dbaui void OConnectionTabPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) { m_eType = m_pAdminDialog->getDatasourceType(_rSet); - // special handling for oracle, this can only happen + // special handling for oracle, this can only happen // if the user enters the same url as used for Oracle and we are on the JDBC path //! TODO //if ( ::dbaccess::DST_ORACLE_JDBC == m_eType ) @@ -288,7 +288,7 @@ namespace dbaui // ppTextControls[i]->SetText(sDisplayName); // } //} - + callModifiedHdl(); } // ----------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 2eb23db4c..5a2d6ba1d 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,17 +45,17 @@ #ifndef _DBAUI_DBADMINSETUP_HRC_ #include "dbadminsetup.hrc" #endif -#ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#ifndef _SFXITEMSET_HXX +#include <svl/itemset.hxx> #endif -#ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#ifndef _SFXSTRITEM_HXX +#include <svl/stritem.hxx> #endif -#ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#ifndef _SFXENUMITEM_HXX +#include <svl/eitem.hxx> #endif -#ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#ifndef _SFXINTITEM_HXX +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -74,7 +74,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ @@ -100,7 +100,7 @@ #include <com/sun/star/sdbc/XDriverAccess.hpp> #include "dbustrings.hrc" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #include <unotools/localfilehelper.hxx> @@ -109,7 +109,7 @@ #include "finteraction.hxx" #include <connectivity/CommonTools.hxx> #include "dbaccess_helpid.hrc" -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/roadmapwizard.hxx> #include "TextConnectionHelper.hxx" @@ -155,12 +155,12 @@ DBG_NAME(OTextConnectionPageSetup) OTextConnectionPageSetup::~OTextConnectionPageSetup() { DELETEZ(m_pTextConnectionHelper); - + DBG_DTOR(OTextConnectionPageSetup,NULL); - } + } IMPL_LINK(OTextConnectionPageSetup, ImplGetExtensionHdl, OTextConnectionHelper*, /*_pTextConnectionHelper*/) - { + { SetRoadmapStateValue((m_pTextConnectionHelper->GetExtension().Len() > 0) && OConnectionTabPageSetup::checkTestConnection()); callModifiedHdl(); return sal_True; @@ -205,7 +205,7 @@ DBG_NAME(OTextConnectionPageSetup) return bChangedSomething; } - + sal_Bool OTextConnectionPageSetup::prepareLeave(){ return m_pTextConnectionHelper->prepareLeave(); } @@ -296,12 +296,12 @@ DBG_NAME(OTextConnectionPageSetup) SFX_ITEMSET_GET(_rSet, pBaseDN, SfxStringItem, DSID_CONN_LDAP_BASEDN, sal_True); SFX_ITEMSET_GET(_rSet, pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True); - if ( bValid ) + if ( bValid ) { m_aETBaseDN.SetText(pBaseDN->GetValue()); m_aNFPortNumber.SetValue(pPortNumber->GetValue()); } - OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); + OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); callModifiedHdl(); } @@ -350,7 +350,7 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- OMySQLIntroPageSetup::~OMySQLIntroPageSetup() { - + DBG_DTOR(OMySQLIntroPageSetup,NULL); } @@ -497,7 +497,7 @@ DBG_NAME(OMySQLIntroPageSetup) String sHelpText = String(ModuleRes(_nHelpTextResId)); m_aFTHelpText.SetText(sHelpText); //TODO this code snippet is redundant - SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderTextResId); + SetHeaderText(FT_AUTOWIZARDHEADER, _nHeaderTextResId); m_aETDatabasename.SetModifyHdl(getControlModifiedLink()); m_aETHostname.SetModifyHdl(getControlModifiedLink()); @@ -505,7 +505,7 @@ DBG_NAME(OMySQLIntroPageSetup) m_aETDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified)); m_aPBTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCConnectionPageSetup,OnTestJavaClickHdl)); - + SFX_ITEMSET_GET(_rCoreAttrs, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True); SFX_ITEMSET_GET(_rCoreAttrs, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True); ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; @@ -522,12 +522,12 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { - return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, - PAGE_DBWIZARD_MYSQL_JDBC, + return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, + PAGE_DBWIZARD_MYSQL_JDBC, _rAttrSet, DSID_MYSQL_PORTNUMBER , STR_MYSQL_DEFAULT, - STR_MYSQLJDBC_HELPTEXT, + STR_MYSQLJDBC_HELPTEXT, STR_MYSQLJDBC_HEADERTEXT, STR_MYSQL_DRIVERCLASSTEXT) ); } @@ -535,12 +535,12 @@ DBG_NAME(OMySQLIntroPageSetup) // ----------------------------------------------------------------------- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { - return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, - PAGE_DBWIZARD_ORACLE, - _rAttrSet, + return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, + PAGE_DBWIZARD_ORACLE, + _rAttrSet, DSID_ORACLE_PORTNUMBER, - STR_ORACLE_DEFAULT, - STR_ORACLE_HELPTEXT, + STR_ORACLE_DEFAULT, + STR_ORACLE_HELPTEXT, STR_ORACLE_HEADERTEXT, STR_ORACLE_DRIVERCLASSTEXT) ); } @@ -639,7 +639,7 @@ DBG_NAME(OMySQLIntroPageSetup) aMsg.Execute(); return 0L; } - + // ----------------------------------------------------------------------- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) { @@ -793,7 +793,7 @@ DBG_NAME(OSpreadSheetConnectionPageSetup) // ----------------------------------------------------------------------- OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() { - + DBG_DTOR(OSpreadSheetConnectionPageSetup,NULL); } @@ -853,7 +853,7 @@ DBG_NAME(OAuthentificationPageSetup) // ----------------------------------------------------------------------- OAuthentificationPageSetup::~OAuthentificationPageSetup() { - + DBG_DTOR(OAuthentificationPageSetup,NULL); } @@ -919,7 +919,7 @@ DBG_NAME(OFinalDBPageSetup) , m_aFTAdditionalSettings (this, ModuleRes(FT_ADDITIONALSETTINGS)) , m_aCBOpenAfterwards (this, ModuleRes(CB_OPENAFTERWARDS)) , m_aCBStartTableWizard (this, ModuleRes(CB_STARTTABLEWIZARD)) - , m_aFTFinalText (this, ModuleRes(FT_FINALTEXT)) + , m_aFTFinalText (this, ModuleRes(FT_FINALTEXT)) { DBG_CTOR(OFinalDBPageSetup,NULL); @@ -933,7 +933,7 @@ DBG_NAME(OFinalDBPageSetup) sal_Int32 nUnrelatedHeight = LogicToPixel( Size( 0, UNRELATED_CONTROLS ), MAP_APPFONT ).Height(); sal_Int32 nRelatedHeight = LogicToPixel( Size( 0, RELATED_CONTROLS ), MAP_APPFONT ).Height(); - ::std::pair<Window*,sal_Int32> pWindows[] = { + ::std::pair<Window*,sal_Int32> pWindows[] = { ::std::pair<Window*,sal_Int32>(&m_aFTFinalHelpText,nRelatedHeight) ,::std::pair<Window*,sal_Int32>(&m_aRBRegisterDataSource,nRelatedHeight) ,::std::pair<Window*,sal_Int32>(&m_aRBDontregisterDataSource,nUnrelatedHeight) @@ -963,17 +963,17 @@ DBG_NAME(OFinalDBPageSetup) // ----------------------------------------------------------------------- OFinalDBPageSetup::~OFinalDBPageSetup() { - + DBG_DTOR(OFinalDBPageSetup,NULL); } sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered() - { + { return m_aRBRegisterDataSource.IsChecked() && m_aRBRegisterDataSource.IsEnabled(); } sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened() - { + { return m_aCBOpenAfterwards.IsChecked() && m_aCBOpenAfterwards.IsEnabled(); } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 061950b28..001600cc5 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -35,19 +35,19 @@ #include "dsmeta.hxx" #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _SFXITEMPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _COMPHELPER_PROPERTY_HXX_ #include <comphelper/property.hxx> diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index a8517c86c..d01d02234 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -59,12 +59,12 @@ #include "dsntypes.hxx" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class Window; //......................................................................... diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 5a275ac54..031b2265e 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -33,7 +33,7 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <vector> class SfxTabPage; diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index 645793979..de4fecbcf 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -44,7 +44,7 @@ /** === end UNO includes === **/ #include <connectivity/dbconversion.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <svx/globlmn.hrc> #include <svx/svxids.hrc> #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index e933b0617..55322812b 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,17 +50,17 @@ #include "AutoControls.hrc" #endif -#ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#ifndef _SFXITEMSET_HXX +#include <svl/itemset.hxx> #endif -#ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#ifndef _SFXSTRITEM_HXX +#include <svl/stritem.hxx> #endif -#ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#ifndef _SFXENUMITEM_HXX +#include <svl/eitem.hxx> #endif -#ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#ifndef _SFXINTITEM_HXX +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" @@ -81,7 +81,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef _DBAUI_ADASTAT_HXX_ @@ -109,7 +109,7 @@ #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _UNOTOOLS_LOCALFILEHELPER_HXX @@ -141,7 +141,7 @@ #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX @@ -194,7 +194,7 @@ DBG_NAME(OTextConnectionHelper) nCnt = m_aTextSeparatorList.GetTokenCount( '\t' ); for( i=0 ; i<nCnt ; i+=2 ) m_aTextSeparator.InsertEntry( m_aTextSeparatorList.GetToken( i, '\t' ) ); - m_aTextSeparator.InsertEntry(m_aTextNone); + m_aTextSeparator.InsertEntry(m_aTextNone); // set the modify handlers m_aFieldSeparator.SetUpdateDataHdl(getControlModifiedLink()); @@ -306,7 +306,7 @@ DBG_NAME(OTextConnectionHelper) // ----------------------------------------------------------------------- OTextConnectionHelper::~OTextConnectionHelper() { - + DBG_DTOR(OTextConnectionHelper,NULL); } @@ -357,7 +357,7 @@ DBG_NAME(OTextConnectionHelper) _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aCharSetLabel)); _rControlList.push_back(new ODisableWrapper<ListBox>(&m_aCharSet)); } - + // ----------------------------------------------------------------------- void OTextConnectionHelper::implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid) { @@ -491,9 +491,9 @@ DBG_NAME(OTextConnectionHelper) { rSet.Put( SfxStringItem( DSID_TEXTFILEEXTENSION, sExtension ) ); bChangedSomething = sal_True; - } + } } - + if ( ( m_nAvailableSections & TC_HEADER ) != 0 ) { if( (m_aRowHeader.GetState() != m_aRowHeader.GetSavedValue()) ) diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 642b431bc..daa0888b4 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -45,9 +45,9 @@ #include <comphelper/componentcontext.hxx> #include <connectivity/dbmetadata.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 00feec0fa..d60467774 100755..100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -32,9 +32,9 @@ #include "dsitems.hxx" #include "moduledbu.hxx" -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index d48e962bc..2213af162 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -41,13 +41,13 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 825e5f66b..5de868a5d 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -47,9 +47,9 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 7ae0acce9..2024d742b 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -45,13 +45,13 @@ #include "dsitems.hxx" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 1e591d7c2..64f49e10f 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,13 +60,13 @@ #include <tools/urlobj.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index faa752820..2ba3bdfad 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -45,13 +45,13 @@ #endif #include "dsnItem.hxx" #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 22cb00e2d..1c7f2a587 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,16 +40,16 @@ #include "dsnItem.hxx" #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> @@ -156,7 +156,7 @@ #ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_ #include <com/sun/star/frame/XDesktop.hpp> #endif -#ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_ +#ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_ #include <com/sun/star/sdbc/XDriverAccess.hpp> #endif #ifndef _COM_SUN_STAR_DOCUMENT_MACROEXECMODE_HPP_ @@ -169,7 +169,7 @@ /** === end UNO includes === **/ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -313,7 +313,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent m_pCollection->fillPageIds(sURLPrefix,aPath); aPath.push_back(PAGE_DBSETUPWIZARD_AUTHENTIFICATION); aPath.push_back(PAGE_DBSETUPWIZARD_FINAL); - + declareAuthDepPath(sURLPrefix,i,aPath); } @@ -587,7 +587,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() { if (m_pMySQLIntroPage != NULL) { - switch( m_pMySQLIntroPage->getMySQLMode() ) + switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: return ::dbaccess::DST_MYSQL_JDBC; @@ -609,7 +609,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver() ::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet); if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() ) { - switch( m_pMySQLIntroPage->getMySQLMode() ) + switch( m_pMySQLIntroPage->getMySQLMode() ) { case OMySQLIntroPageSetup::VIA_JDBC: sRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysql:jdbc:")); @@ -859,7 +859,7 @@ namespace Reference < XInteractionRequest > xRequest( pRequest ); OInteractionAbort* pAbort = new OInteractionAbort; pRequest->addContinuation( pAbort ); - + return _rxHandler->handleInteractionRequest( xRequest ); } } @@ -1190,7 +1190,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { throw TerminationVetoException(); } - + // ............................................................................. void SAL_CALL AsyncLoader::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException) { diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 24183ab37..76f1b31ea 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -46,16 +46,16 @@ #include "dbadmin.hrc" #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> @@ -64,7 +64,7 @@ #include <vcl/mnemonic.hxx> #endif #ifndef _SVTOOLS_CJKOPTIONS_HXX -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #endif #include <jvmaccess/virtualmachine.hxx> #ifndef DBAUI_ADABASPAGE_HRC diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index b1d7f41bb..e882d293e 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -66,16 +66,16 @@ #include "dbu_dlg.hrc" #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #define _ZFORLIST_DECLARE_TABLE #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #include <svx/svxids.hrc> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 #ifndef _SFXINTITEM_HXX //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #endif //CHINA001 #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index 80ed787ea..ebfd36090 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -32,7 +32,7 @@ #ifndef _DBAUI_DSNITEM_HXX_ #define _DBAUI_DSNITEM_HXX_ -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //......................................................................... namespace dbaccess diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 5d2ec3627..f6a1eb043 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -84,16 +84,16 @@ #include "dsitems.hxx" #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXITEMSET_HXX -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 48bbf77fb..f37efae73 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -44,7 +44,7 @@ #include <vcl/stdtext.hxx> #include "localresaccess.hxx" #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/waitobj.hxx> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 906f8a334..b68ca3a64 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -72,7 +72,7 @@ #include "localresaccess.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #define EF_VISITED 0x0001 diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 02883dfce..032d8009c 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -62,10 +62,10 @@ #include "stringlistitem.hxx" #endif #ifndef _SFXENUMITEM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #endif #ifndef _SFXSTRITEM_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #endif #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 715b3ecdc..44a8caba0 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -31,7 +31,7 @@ #define DBAUI_GENERALUNDO_HXX #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 0b3da2498..f91dd9a42 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -56,7 +56,7 @@ #include <svtools/transfer.hxx> #include <osl/mutex.hxx> #include <vos/thread.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <cppuhelper/implbase9.hxx> #include <svtools/cliplistener.hxx> diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index de4492e9f..86e4a489a 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -32,7 +32,7 @@ #define _DBU_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_DBACCESS_START diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index c79b24ba1..8e247d6a6 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,13 +34,13 @@ #ifndef _SV_DIALOG_HXX #include <vcl/dialog.hxx> #endif -#ifndef _SV_FIXED_HXX +#ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> #endif -#ifndef _SV_LSTBOX_HXX +#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> #endif -#ifndef _SV_BUTTON_HXX +#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ @@ -55,14 +55,14 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif -#ifndef _SV_TOOLBOX_HXX +#ifndef _SV_TOOLBOX_HXX #include <vcl/toolbox.hxx> #endif -#ifndef _SVTREEBOX_HXX +#ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> #endif #ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #endif #ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 57e104740..84af1d2cb 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -32,7 +32,7 @@ #define _DBAUI_PROPERTYSETITEM_HXX_ #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index e77d8106d..d75ecfac8 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -54,7 +54,7 @@ #include <connectivity/sqliterator.hxx> #include <connectivity/sqlnode.hxx> #include <connectivity/sqlparse.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class VCLXWindow; namespace dbaui diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index b062c1357..4438d15d1 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,14 +31,14 @@ #define DBAUI_SQLEDIT_HXX #include <svtools/editsyntaxhighlighter.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/sourceviewconfig.hxx> +#include <unotools/sourceviewconfig.hxx> namespace dbaui { class OQueryTextView; - class OSqlEdit : public MultiLineEditSyntaxHighlight, SfxListener + class OSqlEdit : public MultiLineEditSyntaxHighlight, utl::ConfigurationListener { private: Timer m_timerInvalidate; @@ -48,13 +48,13 @@ namespace dbaui OQueryTextView* m_pView; BOOL m_bAccelAction; // Wird bei Cut, Copy, Paste gesetzt BOOL m_bStopTimer; - svt::SourceViewConfig m_SourceViewConfig; + utl::SourceViewConfig m_SourceViewConfig; svtools::ColorConfig m_ColorConfig; DECL_LINK(OnUndoActionTimer, void*); DECL_LINK(OnInvalidateTimer, void*); - private: + private: void ImplSetFont(); protected: @@ -82,7 +82,7 @@ namespace dbaui void stopTimer(); void startTimer(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index b17fb3b27..eac15b847 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -32,7 +32,7 @@ #define _DBAUI_STRINGLISTITEM_HXX_ #ifndef _SFXPOOLITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 8f559e2a4..bd83952e2 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -50,7 +50,7 @@ #include "dbu_misc.hrc" #include <connectivity/dbconversion.hxx> #include <sfx2/sfxhtml.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/extract.hxx> #include "TypeInfo.hxx" @@ -65,8 +65,8 @@ #include "WCopyTable.hxx" #include "WExtendPages.hxx" #include "WCPage.hxx" -#include <svtools/syslocale.hxx> -#include <svtools/zforlist.hxx> +#include <unotools/syslocale.hxx> +#include <svl/zforlist.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/FValue.hxx> #include <com/sun/star/sdbc/SQLWarning.hpp> diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 1bf5f4d9d..cd5ee5ca5 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -63,7 +63,7 @@ #include "QEnumTypes.hxx" #include "WCPage.hxx" #include <tools/inetmime.hxx> -#include <svtools/inettype.hxx> +#include <svl/inettype.hxx> #include <rtl/tencinfo.h> #include "UITools.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index c2536ea72..7dcf57338 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -55,7 +55,7 @@ #include <tools/color.hxx> #include <svtools/htmlout.hxx> #include <sfx2/frmhtmlw.hxx> -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <vcl/svapp.hxx> #include "UITools.hxx" #include <toolkit/helper/vclunohelper.hxx> @@ -63,7 +63,7 @@ #include <svtools/rtfout.hxx> #include <svx/htmlcfg.hxx> #include <connectivity/formattedcolumnvalue.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <comphelper/componentcontext.hxx> #include <rtl/logfile.hxx> diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index be7a105ae..db1b72181 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -61,13 +61,13 @@ namespace dbaui DBG_CTOR(OToolBoxHelper,NULL); OSL_ENSURE(m_nSymbolsSize != SvtMiscOptions().GetCurrentSymbolsSize(),"SymbolsSize should not be identical"); - SvtMiscOptions().AddListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); + SvtMiscOptions().AddListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::AddEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); } // ----------------------------------------------------------------------------- OToolBoxHelper::~OToolBoxHelper() { - SvtMiscOptions().RemoveListener( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); + SvtMiscOptions().RemoveListenerLink( LINK( this, OToolBoxHelper, ConfigOptionsChanged ) ); Application::RemoveEventListener( LINK( this, OToolBoxHelper, SettingsChanged ) ); DBG_DTOR(OToolBoxHelper,NULL); } diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index ee136d8d5..09f9b5e1a 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,7 +198,7 @@ #define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO #ifndef _SFXITEMPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #endif #ifndef _STRING_HXX #include <tools/string.hxx> @@ -207,16 +207,16 @@ #include "dbaccess_helpid.hrc" #endif #ifndef _SFXITEMSET_HXX //autogen wg. SfxItemSet -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #endif #ifndef DBACCESS_SBA_GRID_HRC #include "sbagrid.hrc" #endif #ifndef _SFXRNGITEM_HXX -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #endif #ifndef _SFXINTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_ALGITEM_HXX #include <svx/algitem.hxx> @@ -229,7 +229,7 @@ #include <svx/numinf.hxx> #endif #ifndef _ZFORLIST_HXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #endif #ifndef DBAUI_SBATTRDLG_HXX #include "dlgattr.hxx" @@ -283,13 +283,13 @@ #include <tools/diagnose_ex.h> #endif #ifndef _NUMUNO_HXX -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #endif #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef _SVT_FILEVIEW_HXX #include <svtools/fileview.hxx> diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 3612bb0da..963e97f36 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -86,7 +86,7 @@ #include <vcl/button.hxx> #endif #ifndef SVTOOLS_FILENOTATION_HXX -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index bbbf1bc81..4771552a4 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -92,7 +92,7 @@ #include "dbu_misc.hrc" #endif #ifndef SVTOOLS_FILENOTATION_HXX_ -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #endif #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 3f5e51976..5713171d0 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -39,7 +39,7 @@ #include <tools/resmgr.hxx> #endif #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index 6c2a48580..126460ab7 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -36,9 +36,9 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <memory> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index fab7b3d25..2b289081a 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -40,7 +40,7 @@ #include "JoinController.hxx" #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef DBAUI_QYDLGTAB_HXX #include "adtabdlg.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 948a3d0d4..0fc5c6067 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -70,7 +70,7 @@ #include "browserids.hxx" #endif #ifndef _URLBMK_HXX -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 0139ee114..87456bbdd 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -49,7 +49,7 @@ #include <vcl/split.hxx> #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> @@ -133,7 +133,7 @@ #include "sqlmessage.hxx" #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif using namespace ::dbaui; diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 7fabf5deb..5c02ef4c9 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -40,7 +40,7 @@ #include "RelationController.hxx" #endif #ifndef _UNDO_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #endif #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index fd47db6d2..aade6a93f 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -78,7 +78,7 @@ #include <connectivity/dbexception.hxx> #include "RTableWindow.hxx" #include "JAccess.hxx" -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> using namespace dbaui; diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index f38c5bcf8..eff3d1390 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -64,7 +64,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 3f376e8f8..cb04fa763 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -34,7 +34,7 @@ // include ----------------------------------------------------------- #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define RID_DIALOG_START RID_RPT_START diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 90e943ddd..709f23810 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -50,7 +50,7 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/svdouno.hxx> #include "RptModel.hxx" diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index 7d2ab1716..f522714e7 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <memory> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> namespace rptui { diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index e0f875b07..b59550c50 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -31,7 +31,7 @@ #define RTPUI_REPORTDESIGN_HELPID_HRC #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> // HID_RPT_DBACCESS_START +#include <svl/solar.hrc> // HID_RPT_DBACCESS_START #endif #define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index de2efb75c..6255bcdf8 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <svx/unolingu.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/syslocale.hxx> +#include <unotools/lingucfg.hxx> #include <i18npool/mslangid.hxx> // ============================================================================= @@ -128,7 +128,7 @@ void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xS { m_xProxy.set(_xShape,uno::UNO_QUERY); ::comphelper::query_aggregation(m_xProxy,m_xShape); - ::comphelper::query_aggregation(m_xProxy,m_xProperty); + ::comphelper::query_aggregation(m_xProxy,m_xProperty); _xShape.clear(); m_xTypeProvider.set(m_xShape,uno::UNO_QUERY); m_xUnoTunnel.set(m_xShape,uno::UNO_QUERY); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index c26207960..b0c34fc2d 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ #include <boost/mem_fn.hpp> #include <boost/bind.hpp> #include <boost/utility.hpp> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include "RptModel.hxx" #include "UndoEnv.hxx" #include "FormattedField.hxx" @@ -110,8 +110,8 @@ #include "ImageControl.hxx" #include "Shape.hxx" #include "ReportHelperImpl.hxx" -#include <svtools/itempool.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/itempool.hxx> +#include <unotools/moduleoptions.hxx> #include <osl/thread.hxx> #include <svx/paperinf.hxx> @@ -263,7 +263,7 @@ protected: ~OStyle(){} public: OStyle(); - + DECLARE_XINTERFACE( ) @@ -422,7 +422,7 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); uno::Sequence<sal_Int8> aSe; registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); - + } // ----------------------------------------------------------------------------- @@ -510,7 +510,7 @@ namespace ::rtl::OUString m_sMimeType; uno::Reference< uno::XComponentContext > m_xContext; public: - FactoryLoader(const ::rtl::OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext) + FactoryLoader(const ::rtl::OUString& _sMimeType,uno::Reference< uno::XComponentContext > const & _xContext) :m_sMimeType(_sMimeType) ,m_xContext(_xContext) {} @@ -528,14 +528,14 @@ namespace try { uno::Reference<frame::XComponentLoader> xFrameLoad( m_xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ,m_xContext) ,uno::UNO_QUERY); ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); - + if ( xFrameLoad.is() ) { uno::Sequence < beans::PropertyValue > aArgs( 3); @@ -582,7 +582,7 @@ struct OReportDefinitionImpl ::cppu::OInterfaceContainerHelper m_aDocEventListeners; ::std::vector< uno::Reference< frame::XController> > m_aControllers; uno::Sequence< beans::PropertyValue > m_aArgs; - + uno::Reference< report::XGroups > m_xGroups; uno::Reference< report::XSection> m_xReportHeader; uno::Reference< report::XSection> m_xReportFooter; @@ -608,7 +608,7 @@ struct OReportDefinitionImpl uno::Reference< frame::XUntitledNumbers > m_xNumberedControllers; uno::Reference< document::XDocumentProperties > m_xDocumentProperties; - ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> + ::boost::shared_ptr< ::comphelper::EmbeddedObjectContainer> m_pObjectContainer; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; ::rtl::OUString m_sCaption; @@ -618,7 +618,7 @@ struct OReportDefinitionImpl ::rtl::OUString m_sIdentifier; ::rtl::OUString m_sDataSourceName; awt::Size m_aVisualAreaSize; - ::sal_Int64 m_nAspect; + ::sal_Int64 m_nAspect; ::sal_Int16 m_nGroupKeepTogether; ::sal_Int16 m_nPageHeaderOption; ::sal_Int16 m_nPageFooterOption; @@ -776,7 +776,7 @@ void OReportDefinition::init() rAdmin.NewStandardLayer(RPT_LAYER_FRONT); rAdmin.NewLayer(UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "back" ) ), RPT_LAYER_BACK ); rAdmin.NewLayer( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "HiddenLayer" ) ), RPT_LAYER_HIDDEN ); - + m_pImpl->m_xFunctions = new OFunctions(this,m_aProps->m_xContext); if ( !m_pImpl->m_xStorage.is() ) m_pImpl->m_xStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); @@ -797,7 +797,7 @@ void OReportDefinition::init() } } // ----------------------------------------------------------------------------- -void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException) +void SAL_CALL OReportDefinition::dispose() throw(uno::RuntimeException) { ReportDefinitionPropertySet::dispose(); cppu::WeakComponentImplHelperBase::dispose(); @@ -870,7 +870,7 @@ uno::Sequence< ::rtl::OUString > OReportDefinition::getSupportedServiceNames_Sta { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_REPORTDEFINITION; - + return aServices; } // -------------------------------------------------------------------------------- @@ -1250,12 +1250,12 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u ::osl::ResettableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // notify our container listeners - lang::EventObject aEvt( static_cast< ::cppu::OWeakObject* >( this ) ); + lang::EventObject aEvt( static_cast< ::cppu::OWeakObject* >( this ) ); aGuard.clear(); m_pImpl->m_aCloseListener.forEach<util::XCloseListener>( ::boost::bind(&util::XCloseListener::queryClosing,_1,boost::cref(aEvt),boost::cref(_bDeliverOwnership))); aGuard.reset(); - + ::std::vector< uno::Reference< frame::XController> > aCopy = m_pImpl->m_aControllers; ::std::vector< uno::Reference< frame::XController> >::iterator aIter = aCopy.begin(); @@ -1277,11 +1277,11 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u } } } - + aGuard.clear(); m_pImpl->m_aCloseListener.notifyEach(&util::XCloseListener::notifyClosing,aEvt); aGuard.reset(); - + dispose(); } // ----------------------------------------------------------------------------- @@ -1412,7 +1412,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor ); fillArgs(aDescriptor); aDescriptor.createItemIfMissing(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Storage")),uno::makeAny(_xStorageToLoadFrom)); - + uno::Sequence< uno::Any > aDelegatorArguments(_aMediaDescriptor.getLength()); uno::Any* pIter = aDelegatorArguments.getArray(); uno::Any* pEnd = pIter + aDelegatorArguments.getLength(); @@ -1437,7 +1437,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< uno::Reference< document::XImporter> xImporter(xFilter,uno::UNO_QUERY_THROW); uno::Reference<XComponent> xComponent(static_cast<OWeakObject*>(this),uno::UNO_QUERY); xImporter->setTargetDocument(xComponent); - + ::comphelper::MediaDescriptor aTemp; aTemp << aDelegatorArguments; xFilter->filter(aTemp.getAsConstPropertyValueList()); @@ -1509,25 +1509,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } // if ( aSaveOpt.IsSaveRelFSys() ) const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) ); xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName)); - ::rtl::OUString aVersion; - SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion(); - // older versions can not have this property set, it exists only starting from ODF1.2 - if ( nDefVersion >= SvtSaveOptions::ODFVER_012 ) - aVersion = ODFVER_012_TEXT; - if ( aVersion.getLength() ) - { - try - { - xInfoSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Version" )), uno::makeAny( aVersion ) ); - } - catch( uno::Exception& ) - { - } - } - - sal_Int32 nArgsLen = aDelegatorArguments.getLength(); aDelegatorArguments.realloc(nArgsLen+1); aDelegatorArguments[nArgsLen++] <<= xInfoSet; @@ -1624,7 +1607,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS uno::Reference<io::XInputStream> xStream = new ::comphelper::SequenceInputStream( aSeq ); m_pImpl->m_pObjectContainer->InsertGraphicStreamDirectly(xStream,sObject1,sPng); } - + if ( !bErr ) { sal_Bool bPersist = sal_False; @@ -1632,7 +1615,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS bPersist = m_pImpl->m_pObjectContainer->StoreChildren(sal_True,sal_False); else bPersist = m_pImpl->m_pObjectContainer->StoreAsChildren(sal_True,sal_True,_xStorageToSaveTo); - + if( bPersist ) m_pImpl->m_pObjectContainer->SetPersistentEntries(m_pImpl->m_xStorage); try @@ -1734,7 +1717,7 @@ sal_Bool OReportDefinition::WriteThroughComponent( if( bPlainStream ) { - aAny <<= sal_False; + aAny <<= sal_False; xStreamProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Compressed") ), aAny ); } else @@ -1909,7 +1892,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { throw uno::RuntimeException(); } - + impl_loadFromStorage_nolck_throw( xDocumentStorage, aArguments.getPropertyValues() ); // TODO: do we need to take ownership of the storage? In opposite to loadFromStorage, we created the storage // ourself here, and perhaps this means we're also responsible for it ...? @@ -1951,12 +1934,12 @@ embed::VisualRepresentation SAL_CALL OReportDefinition::getPreferredVisualRepres { uno::Sequence<sal_Int8> aSeq; xStream->readBytes(aSeq,xStream->available()); - xStream->closeInput(); + xStream->closeInput(); aResult.Data <<= aSeq; aResult.Flavor.MimeType = sMimeType; aResult.Flavor.DataType = ::getCppuType( &aSeq ); } - + return aResult; } // ----------------------------------------------------------------------------- @@ -2014,7 +1997,7 @@ void OReportDefinition::notifyEvent(const ::rtl::OUString& _sEventName) { ::osl::ResettableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - document::EventObject aEvt(*this, _sEventName); + document::EventObject aEvt(*this, _sEventName); aGuard.clear(); m_pImpl->m_aDocEventListeners.notifyEach(&document::XEventListener::notifyEvent,aEvt); } @@ -2074,7 +2057,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat } } // if ( aIter->is() ) } - + } return m_pImpl->m_xViewData; } @@ -2160,7 +2143,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableMimeTyp s_aList[0] = MIMETYPE_OASIS_OPENDOCUMENT_TEXT; s_aList[1] = MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET; } - + return s_aList; } // ----------------------------------------------------------------------------- @@ -2208,10 +2191,10 @@ uno::Sequence< sal_Int8 > OReportDefinition::getUnoTunnelImplementationId() } // ----------------------------------------------------------------------------- uno::Reference< uno::XComponentContext > OReportDefinition::getContext() -{ +{ ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - return m_aProps->m_xContext; + return m_aProps->m_xContext; } // ----------------------------------------------------------------------------- ::boost::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel() const @@ -2267,7 +2250,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co || aServiceSpecifier == SERVICE_FIXEDLINE || aServiceSpecifier == SERVICE_IMAGECONTROL ) xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")) ),uno::UNO_QUERY_THROW); - else + else xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW); } else if ( aServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii("com.sun.star.form.component.") ) == 0 ) @@ -2276,7 +2259,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.style.PageStyle") ) == 0 || aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.style.FrameStyle") ) == 0 || - aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.style.GraphicStyle") ) == 0 + aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.style.GraphicStyle") ) == 0 ) { uno::Reference< style::XStyle> xStyle = new OStyle(); @@ -2284,13 +2267,13 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co uno::Reference<beans::XPropertySet> xProp(xStyle,uno::UNO_QUERY); ::rtl::OUString sTray; xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrinterPaperTray")))>>= sTray; - + return xStyle.get(); } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.Settings") ) == 0 ) { uno::Reference<beans::XPropertySet> xProp = new OStyle(); - + return xProp.get(); } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.Defaults") ) == 0 ) @@ -2374,7 +2357,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co } else xShape.set(SvxUnoDrawMSFactory::createInstance( aServiceSpecifier ),uno::UNO_QUERY_THROW); - + return m_pImpl->m_pReportModel->createShape(aServiceSpecifier,xShape); } //----------------------------------------------------------------------------- @@ -2390,7 +2373,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OReportDefinition::getAvailableService ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider")), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.NamespaceMap")), @@ -2548,12 +2531,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) thr { ::osl::MutexGuard aGuard(m_aMutex); uno::Sequence< ::rtl::OUString > aNameList(m_aElementsPos.size()); - + ::rtl::OUString* pStringArray = aNameList.getArray(); ::std::vector<TStyleElements::iterator>::const_iterator aEnd = m_aElementsPos.end(); for(::std::vector<TStyleElements::iterator>::const_iterator aIter = m_aElementsPos.begin(); aIter != aEnd;++aIter,++pStringArray) *pStringArray = (*aIter)->first; - + return aNameList; } // ----------------------------------------------------------------------------- @@ -2569,7 +2552,7 @@ void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const u ::osl::MutexGuard aGuard(m_aMutex); if ( m_aElements.find(aName) != m_aElements.end() ) throw container::ElementExistException(); - + if ( !aElement.isExtractableTo(m_aType) ) throw lang::IllegalArgumentException(); @@ -2706,19 +2689,19 @@ uno::Reference< frame::XTitle > OReportDefinition::impl_getTitleHelper_throw() ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + if ( ! m_pImpl->m_xTitleHelper.is ()) { uno::Reference< frame::XUntitledNumbers > xDesktop(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop")) ,m_aProps->m_xContext),uno::UNO_QUERY_THROW); uno::Reference< frame::XModel > xThis (static_cast< frame::XModel* >(this), uno::UNO_QUERY_THROW); - + ::framework::TitleHelper* pHelper = new ::framework::TitleHelper(uno::Reference< lang::XMultiServiceFactory >(m_aProps->m_xContext->getServiceManager(),uno::UNO_QUERY)); m_pImpl->m_xTitleHelper = uno::Reference< frame::XTitle >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); pHelper->setOwner (xThis ); pHelper->connectWithUntitledNumbers (xDesktop); } - + return m_pImpl->m_xTitleHelper; } // ----------------------------------------------------------------------------- @@ -2728,17 +2711,17 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + if ( ! m_pImpl->m_xNumberedControllers.is ()) { uno::Reference< frame::XModel > xThis (static_cast< frame::XModel* >(this), uno::UNO_QUERY_THROW); ::comphelper::NumberedCollection* pHelper = new ::comphelper::NumberedCollection(); m_pImpl->m_xNumberedControllers = uno::Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), uno::UNO_QUERY_THROW); - + pHelper->setOwner (xThis); pHelper->setUntitledPrefix (::rtl::OUString::createFromAscii(" : ")); } - + return m_pImpl->m_xNumberedControllers; } // ----------------------------------------------------------------------------- @@ -2751,7 +2734,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + return impl_getTitleHelper_throw()->getTitle (); } // ----------------------------------------------------------------------------- @@ -2764,7 +2747,7 @@ void SAL_CALL OReportDefinition::setTitle( const ::rtl::OUString& sTitle ) ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + impl_getTitleHelper_throw()->setTitle (sTitle); } // ----------------------------------------------------------------------------- @@ -2777,7 +2760,7 @@ void SAL_CALL OReportDefinition::addTitleChangeListener( const uno::Reference< f ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + uno::Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), uno::UNO_QUERY); if (xBroadcaster.is ()) xBroadcaster->addTitleChangeListener (xListener); @@ -2792,7 +2775,7 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + uno::Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper_throw(), uno::UNO_QUERY); if (xBroadcaster.is ()) xBroadcaster->removeTitleChangeListener (xListener); @@ -2807,7 +2790,7 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + return impl_getUntitledHelper_throw()->leaseNumber (xComponent); } // ----------------------------------------------------------------------------- @@ -2820,7 +2803,7 @@ void SAL_CALL OReportDefinition::releaseNumber( ::sal_Int32 nNumber ) vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + impl_getUntitledHelper_throw()->releaseNumber (nNumber); } // ----------------------------------------------------------------------------- @@ -2833,7 +2816,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + impl_getUntitledHelper_throw()->releaseNumberForComponent (xComponent); } // ----------------------------------------------------------------------------- @@ -2845,7 +2828,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - + return impl_getUntitledHelper_throw()->getUntitledPrefix (); } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 4cffa0219..3c1e25406 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include <tools/debug.hxx> #include <tools/urlobj.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <unotools/tempfile.hxx> #include <unotools/sharedunocomponent.hxx> @@ -81,8 +81,8 @@ OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentCon DBG_CTOR( rpt_OReportEngineJFree,NULL); } // ----------------------------------------------------------------------------- -// TODO: VirtualFunctionFinder: This is virtual function! -// +// TODO: VirtualFunctionFinder: This is virtual function! +// OReportEngineJFree::~OReportEngineJFree() { DBG_DTOR( rpt_OReportEngineJFree,NULL); @@ -90,10 +90,10 @@ OReportEngineJFree::~OReportEngineJFree() //-------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2(OReportEngineJFree,ReportEngineBase,ReportEnginePropertySet) // ----------------------------------------------------------------------------- -void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException) +void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException) { ReportEnginePropertySet::dispose(); - cppu::WeakComponentImplHelperBase::dispose(); + cppu::WeakComponentImplHelperBase::dispose(); m_xActiveConnection.clear(); } // ----------------------------------------------------------------------------- @@ -112,7 +112,7 @@ uno::Sequence< ::rtl::OUString > OReportEngineJFree::getSupportedServiceNames_St { uno::Sequence< ::rtl::OUString > aServices(1); aServices.getArray()[0] = SERVICE_REPORTENGINE; - + return aServices; } //------------------------------------------------------------------------------ @@ -142,7 +142,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getRepo // ----------------------------------------------------------------------------- void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< report::XReportDefinition >& _report ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - if ( !_report.is() ) + if ( !_report.is() ) throw lang::IllegalArgumentException(); BoundListeners l; { @@ -223,7 +223,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task else sFileURL = aTestFile.GetURL(); } - + uno::Reference< embed::XStorage > xOut = OStorageHelper::GetStorageFromURL(sFileURL,embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE,uno::Reference< lang::XMultiServiceFactory >(m_xContext->getServiceManager(),uno::UNO_QUERY)); utl::DisposableComponent aOut(xOut); xStorageProp.set(xOut,uno::UNO_QUERY); @@ -231,7 +231,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task { xStorageProp->setPropertyValue( s_sMediaType, uno::makeAny(sMimeType)); } - + aConvertedProperties[nPos++].Value <<= xOut; aConvertedProperties[nPos].Name = PROPERTY_REPORTDEFINITION; @@ -300,7 +300,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { uno::Reference< frame::XModel > xModel; ::rtl::OUString sOutputName = getNewOutputName(); // starts implicite the report generator - if ( sOutputName.getLength() ) + if ( sOutputName.getLength() ) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportEngineBase::rBHelper.bDisposed); @@ -309,7 +309,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive { // if there is no frame given, find the right xFrameLoad.set( m_xContext->getServiceManager()->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ,m_xContext) ,uno::UNO_QUERY); ::rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("_blank")); @@ -317,7 +317,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive uno::Reference< frame::XFrame> xFrame = uno::Reference< frame::XFrame>(xFrameLoad,uno::UNO_QUERY)->findFrame(sTarget,nFrameSearchFlag); xFrameLoad.set( xFrame,uno::UNO_QUERY); } - + if ( xFrameLoad.is() ) { uno::Sequence < beans::PropertyValue > aArgs( _bHidden ? 3 : 2 ); @@ -409,7 +409,7 @@ uno::Reference< sdbc::XConnection > SAL_CALL OReportEngineJFree::getActiveConnec // ----------------------------------------------------------------------------- void SAL_CALL OReportEngineJFree::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - if ( !_activeconnection.is() ) + if ( !_activeconnection.is() ) throw lang::IllegalArgumentException(); set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_xActiveConnection); } diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index 347ccd3e8..1c9c8811f 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -32,7 +32,7 @@ #define REPORTDESIGN_CORE_RESOURCE_HRC_ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif //------------------------------------------------------------------------------ diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 55b2b8ef0..e8eb8ebfb 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -42,7 +42,7 @@ #include <rtl/uri.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include "ModuleHelper.hxx" //......................................................................... diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 27ca3c490..c7e5f6d9e 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -37,7 +37,7 @@ #include <rtl/uri.hxx> #include <tools/debug.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index f1c04c795..9a20cb30f 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include "RptPage.hxx" #include <dbaccess/singledoccontroller.hxx> #include <tools/debug.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include "UndoActions.hxx" #include "UndoEnv.hxx" diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 5deb3ce2e..91398be6f 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -51,7 +51,7 @@ /** === end UNO includes === **/ #include <connectivity/dbtools.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/diagnose_ex.h> #include <comphelper/stl_types.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 3a0dc2569..19fbd7430 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -50,7 +50,7 @@ /** === end UNO includes === **/ #include <connectivity/dbtools.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/diagnose_ex.h> #include <comphelper/stl_types.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index f58b69819..9eb709368 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -39,7 +39,7 @@ /** === end UNO includes === **/ #include <dbaccess/singledoccontroller.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <connectivity/statementcomposer.hxx> #include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index a65d9442a..3d059f965 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ #include <osl/file.hxx> #include <ucbhelper/contentbroker.hxx> #include <sfx2/docfile.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/storagehelper.hxx> #include <com/sun/star/task/XJobExecutor.hpp> diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 847e34ff4..aa3600dfa 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlement.hxx> #include <xmloff/xmluconv.hxx> -#include <svtools/saveopt.hxx> +#include <unotools/saveopt.hxx> #include <rtl/ustrbuf.hxx> #include <connectivity/dbtools.hxx> #include <rtl/ustrbuf.hxx> @@ -158,7 +158,7 @@ void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, } void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException) -{ +{ bool bExport = true; if ( _sName.equalsAscii("office:chart") ) { @@ -189,9 +189,9 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE )); pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART); - + m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs); - + const ::rtl::OUString sTableCalc = lcl_createAttribute(XML_NP_TABLE,XML_CALCULATION_SETTINGS); m_xDelegatee->startElement(sTableCalc,NULL); pList = new SvXMLAttributeList(); @@ -224,7 +224,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName bExport = false; m_bTableRowsStarted = true; m_bFirstRowExported = true; - } + } else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) ) bExport = false; else if ( _sName.equalsAscii("chart:plot-area")) @@ -240,7 +240,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName else if ( _sName.equalsAscii("chart:series")) { static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS)); - lcl_correctCellAddress(s_sCellAddress,xAttribs); + lcl_correctCellAddress(s_sCellAddress,xAttribs); } else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAscii("table:table-cell") ) { @@ -328,7 +328,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); if ( !m_xDatabaseDataProvider.is() || !m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception(); - + uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext), uno::UNO_QUERY); @@ -339,7 +339,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > // set ourself as delegator m_xProxy->setDelegator( *this ); - + const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand(); if ( sCommand.getLength() ) m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection() @@ -369,7 +369,7 @@ void ExportDocumentHandler::exportTableRows() m_xDelegatee->startElement(sRow,NULL); const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) ); - + const static ::rtl::OUString s_sFieldPrefix(RTL_CONSTASCII_USTRINGPARAM("field:[")); const static ::rtl::OUString s_sFieldPostfix(RTL_CONSTASCII_USTRINGPARAM("]")); const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) ); @@ -425,7 +425,7 @@ void ExportDocumentHandler::exportTableRows() m_xDelegatee->startElement(sFtext,xAttribs); m_xDelegatee->startElement(sRElement,NULL); m_xDelegatee->startElement(sRComponent,NULL); - + m_xDelegatee->endElement(sRComponent); m_xDelegatee->endElement(sRElement); m_xDelegatee->endElement(sFtext); diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index da0e058b5..aaefd993e 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include "xmlControlProperty.hxx" #include "xmlHelper.hxx" #include <tools/debug.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <comphelper/componentcontext.hxx> #include <com/sun/star/awt/ImageScaleMode.hpp> @@ -57,7 +57,7 @@ DBG_NAME( rpt_OXMLImage ) OXMLImage::OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, const Reference< XAttributeList > & _xAttrList - ,const Reference< XImageControl > & _xComponent + ,const Reference< XImageControl > & _xComponent ,OXMLTable* _pContainer) : OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer) { @@ -86,7 +86,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, sValue = aPathOptions.SubstituteVariable(sValue); _xComponent->setImageURL(rImport.GetAbsoluteReference( sValue )); } - + break; case XML_TOK_PRESERVE_IRI: _xComponent->setPreserveIRI(s_sTRUE == sValue); @@ -106,7 +106,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, _xComponent->setScaleMode( nRet );
} break; - case XML_TOK_DATA_FORMULA: + case XML_TOK_DATA_FORMULA: _xComponent->setDataField(ORptFilter::convertFormula(sValue)); break; default: diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index f5caf0579..db7326fcc 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ #include <svx/tbxcolorupdate.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svtools/imgdef.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> #include <vcl/bmpacc.hxx> #include <tools/diagnose_ex.h> diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index dca80f3ac..ffea7996b 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -54,7 +54,7 @@ #include <svx/svxids.hrc> #endif #include <connectivity/dbconversion.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #ifndef RPTUI_TOOLS_HXX #include "UITools.hxx" #endif diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 935ec4c31..d8d640847 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -38,7 +38,7 @@ #include <vcl/mnemonic.hxx> #include <vcl/msgbox.hxx> #include <unotools/charclass.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/viewoptions.hxx> #include <tools/urlobj.hxx> #include <formula/formdata.hxx> #include <formula/funcutl.hxx> diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 586933d50..ab9af2979 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #include "cppuhelper/basemutex.hxx" #include "comphelper/SelectionMultiplex.hxx" #include <svtools/svtreebx.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include "ReportVisitor.hxx" #include "ModuleHelper.hxx" #include <rtl/ref.hxx> @@ -73,7 +73,7 @@ namespace rptui { using namespace ::com::sun::star; -using namespace svt; +using namespace utl; using namespace ::comphelper; USHORT lcl_getImageId(const uno::Reference< report::XReportComponent>& _xElement) diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index bb7a79b06..163fa6939 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -36,7 +36,7 @@ #ifndef _SBASLTID_HRC #include <svx/svxids.hrc> #endif -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) #define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3) diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index d853736e1..22d1359bd 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -38,9 +38,9 @@ #include "dlgpage.hxx" #include "ModuleHelper.hxx" #include "RptResId.hrc" -#include <svtools/intitem.hxx> //add CHINA001 -#include <svtools/cjkoptions.hxx> -#include <svtools/aeitem.hxx> +#include <svl/intitem.hxx> //add CHINA001 +#include <svl/cjkoptions.hxx> +#include <svl/aeitem.hxx> namespace rptui { diff --git a/reportdesign/source/ui/inc/DataProvider.hxx b/reportdesign/source/ui/inc/DataProvider.hxx index 5d2bc107b..1e07282c3 100644 --- a/reportdesign/source/ui/inc/DataProvider.hxx +++ b/reportdesign/source/ui/inc/DataProvider.hxx @@ -31,7 +31,7 @@ #ifndef RPT_DATAPROVIDER_HXX #define RPT_DATAPROVIDER_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> @@ -49,7 +49,7 @@ // #endif #include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <map> #include <list> diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index f733f2036..133f7c2a9 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -41,8 +41,8 @@ #include <tools/link.hxx> #include <tools/gen.hxx> #include <vcl/timer.hxx> -#include <svtools/hint.hxx> -#include <svtools/brdcst.hxx> +#include <svl/hint.hxx> +#include <svl/brdcst.hxx> #include <comphelper/stl_types.hxx> #include "ReportDefines.hxx" #include <svtools/colorcfg.hxx> diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 9eca95ac5..b2efd97b6 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -52,7 +52,7 @@ #include <com/sun/star/embed/XVisualObject.hpp> #include <cppuhelper/implbase5.hxx> #include <svtools/transfer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/svdedtv.hxx> #include <svx/zoomitem.hxx> #include "ModuleHelper.hxx" diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 9b193c0ef..a8b5c6079 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -39,7 +39,7 @@ #include <dllapi.h> #include <vector> -// #include <svtools/lstner.hxx> +// #include <svl/lstner.hxx> #include <vcl/svapp.hxx> #include <tools/link.hxx> diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 156ed2ad4..fb832a239 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <svx/svdedtv.hxx> #include <SectionView.hxx> - +#include <unotools/options.hxx> #include <list> #include <vector> #include <boost/shared_ptr.hpp> @@ -117,7 +117,7 @@ namespace rptui }; class OViewsWindow : public Window - , public SfxListener + , public utl::ConfigurationListener , public IMarkedSection { typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap; @@ -161,10 +161,9 @@ namespace rptui // windows overload virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); - using Window::Notify; + virtual void Paint( const Rectangle& rRect ); - // SfxListener - virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: OViewsWindow( OReportWindow* _pReportWindow); diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 14e607d82..f98e29f17 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -37,8 +37,8 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/inspection/XObjectInspector.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <vcl/dockwin.hxx> #include <svx/svdmark.hxx> #include "ModuleHelper.hxx" diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 495065f44..bb6bd7565 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -35,7 +35,7 @@ #include <comphelper/types.hxx> #include "uistrings.hrc" #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/PropertyLineElement.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 3c75b6637..beacc7f7b 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -42,7 +42,7 @@ #include <unotools/configmgr.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/diagnose_ex.h> #include <tools/StringListResource.hxx> #include <com/sun/star/lang/XInitialization.hpp> @@ -84,8 +84,8 @@ #include <boost/bind.hpp> #include <tools/string.hxx> #include "metadata.hxx" -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #define ITEMID_COLOR_TABLE SID_COLOR_TABLE #define ITEMID_DASH_LIST SID_DASH_LIST diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index f8be016fa..0a67ee68b 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -36,7 +36,7 @@ #endif #include <comphelper/types.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XSection.hpp> diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 836ece911..d6cf9fb7f 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include "precompiled_reportdesign.hxx" #include "ColorListener.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #ifndef REPORTDESIGN_SHARED_UISTRINGS_HRC #include "uistrings.hrc" #endif diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index d5b11a647..dc507afab 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -85,10 +85,10 @@ #include <svx/svxdlg.hxx> #include <svx/unoprov.hxx> -#include <svtools/pathoptions.hxx> +#include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <comphelper/propmultiplex.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -776,7 +776,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R { // want the dialog to be destroyed before our set SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get(),RID_SVXDLG_AREA )); + ::std::auto_ptr<AbstractSvxAreaTabDialog> pDialog(pFact->CreateSvxAreaTabDialog( pParent,pDescriptor.get(),pModel.get() )); // #i74099# by default, the dialog deletes the current color table if a different one is loaded // (see SwDrawShell::ExecDrawDlg) const SvxColorTableItem* pColorItem = static_cast<const SvxColorTableItem*>( pDescriptor->GetItem(SID_COLOR_TABLE) ); @@ -788,7 +788,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R lcl_fillItemsToShape(_xShape,*pDialog->GetOutputItemSet()); } } - + } catch(uno::Exception&) { diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 4ca2255a3..61858d01a 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <svtools/miscopt.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/menuoptions.hxx> #include <vos/mutex.hxx> #include <svx/svxids.hrc> @@ -111,7 +111,7 @@ OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& ,m_nToolBoxId(1) ,m_nSlotId(0) { - DBG_CTOR(rpt_OToolboxController,NULL); + DBG_CTOR(rpt_OToolboxController,NULL); osl_incrementInterlockedCount(&m_refCount); m_xServiceManager = _rxORB; osl_decrementInterlockedCount(&m_refCount); @@ -120,7 +120,7 @@ OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& // ----------------------------------------------------------------------------- OToolboxController::~OToolboxController() { - DBG_DTOR(rpt_OToolboxController,NULL); + DBG_DTOR(rpt_OToolboxController,NULL); } // ----------------------------------------------------------------------------- // XInterface @@ -221,7 +221,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments // ----------------------------------------------------------------------------- void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) { @@ -260,7 +260,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event } } } - + switch(m_nSlotId) { case SID_ATTR_CHAR_COLOR2: @@ -292,12 +292,12 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw { // execute the menu vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); Reference< awt::XWindow > xRet; if ( m_pToolbarController.is() ) xRet = m_pToolbarController.getRef()->createPopupWindow(); - + return xRet; } // ----------------------------------------------------------------------------- @@ -309,7 +309,7 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw ::rtl::OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) return xSub->getSubToolbarName(); @@ -319,8 +319,8 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); - + ::osl::MutexGuard aGuard(m_aMutex); + uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) { @@ -331,14 +331,14 @@ void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rComm void SAL_CALL OToolboxController::updateImage( ) throw (uno::RuntimeException) { vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - ::osl::MutexGuard aGuard(m_aMutex); - + ::osl::MutexGuard aGuard(m_aMutex); + uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) xSub->updateImage(); } // ----------------------------------------------------------------------------- -uno::Reference< awt::XWindow > SAL_CALL OToolboxController::createItemWindow( const uno::Reference< awt::XWindow >& _xParent) +uno::Reference< awt::XWindow > SAL_CALL OToolboxController::createItemWindow( const uno::Reference< awt::XWindow >& _xParent) throw (uno::RuntimeException) { uno::Reference< awt::XWindow > xWindow; diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 548c01128..05403d7e3 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include <tools/debug.hxx> #include "ReportController.hxx" #include <comphelper/types.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/syslocale.hxx> +#include <unotools/viewoptions.hxx> #include "RptDef.hxx" #include "UITools.hxx" #include "RptObject.hxx" @@ -74,9 +74,9 @@ class OTaskWindow : public Window public: OTaskWindow(Window* _pParent) : Window(_pParent),m_pPropWin(NULL){} - inline void setPropertyBrowser(PropBrw* _pPropWin) - { - m_pPropWin = _pPropWin; + inline void setPropertyBrowser(PropBrw* _pPropWin) + { + m_pPropWin = _pPropWin; } virtual void Resize() @@ -85,7 +85,7 @@ public: if ( m_pPropWin && aSize.Height() && aSize.Width() ) m_pPropWin->SetSizePixel(aSize); } - long getMinimumWidth() const + long getMinimumWidth() const { long nRet = 0; if ( m_pPropWin ) @@ -106,7 +106,7 @@ public: void setItemSizes() { const long nOutWidth = GetOutputSizePixel().Width(); - long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); + long nTaskPaneMinSplitSize = static_cast<OTaskWindow*>(GetItemWindow(TASKPANE_ID))->getMinimumWidth(); nTaskPaneMinSplitSize = static_cast<long>(nTaskPaneMinSplitSize*100/nOutWidth); if ( !nTaskPaneMinSplitSize ) nTaskPaneMinSplitSize = START_SIZE_TASKPANE; @@ -240,7 +240,7 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings(); + ImplInitSettings(); Invalidate(); } } @@ -269,7 +269,7 @@ long ODesignView::PreNotify( NotifyEvent& rNEvt ) default: break; } - + return nRet; } //------------------------------------------------------------------------------ @@ -320,7 +320,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground) } } } - // set the size of the report window + // set the size of the report window m_aSplitWin.SetPosSizePixel( _rPlayground.TopLeft(),aPlaygroundSize ); } // just for completeness: there is no space left, we occupied it all ... @@ -357,7 +357,7 @@ void ODesignView::SetMode( DlgEdMode _eNewMode ) m_eMode = _eNewMode; if ( m_eMode == RPTUI_SELECT ) m_eActObj = OBJ_NONE; - + m_aScrollWindow.SetMode(_eNewMode); } //---------------------------------------------------------------------------- @@ -428,7 +428,7 @@ void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView) m_xReportComponent.clear(); DlgEdHint aHint( RPTUI_HINT_SELECTIONCHANGED ); Broadcast( aHint ); - } + } m_aMarkTimer.Start(); } @@ -461,7 +461,7 @@ void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection void ODesignView::GetFocus() { Window::GetFocus(); - + if ( !m_bDeleted ) { ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_aScrollWindow.getMarkedSection(); @@ -498,7 +498,7 @@ IMPL_LINK( ODesignView, SplitHdl, void*, ) Invalidate(/*INVALIDATE_NOCHILDREN*/); } } - + return 0L; } //----------------------------------------------------------------------------- @@ -535,7 +535,7 @@ void ODesignView::togglePropertyBrowser(sal_Bool _bToogleOn) m_aSplitWin.InsertItem( TASKPANE_ID, m_pTaskPane,START_SIZE_TASKPANE, SPLITWINDOW_APPEND, COLSET_ID, SWIB_PERCENTSIZE/*|SWIB_COLSET */); else m_aSplitWin.RemoveItem(TASKPANE_ID); - + // TRY // Invalidate(/*INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE*/); if ( bWillBeVisible ) @@ -650,7 +650,7 @@ uno::Reference< report::XReportComponent > ODesignView::getCurrentControlModel() return m_aScrollWindow.getSectionWindow(_xSection); } // ------------------------------------------------------------------------- -void ODesignView::markSection(const sal_uInt16 _nPos) +void ODesignView::markSection(const sal_uInt16 _nPos) { m_aScrollWindow.markSection(_nPos); } diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index b66a893ff..ed6fc5d0b 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,12 +138,12 @@ #include "dlgpage.hxx" #include "RptResId.hrc" -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/aeitem.hxx> //CHINA001 +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/aeitem.hxx> //CHINA001 #include <svtools/cliplistener.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/viewoptions.hxx> +#include <unotools/syslocale.hxx> +#include <unotools/viewoptions.hxx> #include <vos/mutex.hxx> #include "PropertyForward.hxx" @@ -256,7 +256,7 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, } // if ( !xReportControlFormat.is() ) else _rControlsFormats.push_back(xReportControlFormat); - + if ( !_xWindow.is() ) _xWindow = VCLUnoHelper::GetInterface(_pView); } @@ -480,7 +480,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const break; case SID_ARRANGEMENU: case SID_FRAME_DOWN: - case SID_FRAME_UP: + case SID_FRAME_UP: case SID_FRAME_TO_TOP: case SID_FRAME_TO_BOTTOM: case SID_OBJECT_HEAVEN: @@ -509,7 +509,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const if ( xSection.is() ) { nCount = xSection->getCount(); - } + } aReturn.bEnabled = isEditable() && nCount > 0; } break; @@ -858,7 +858,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const { frame::status::FontHeight aFontHeight; aReturn.aValue >>= aFontHeight.Height; - aReturn.aValue <<= aFontHeight; // another type is needed here, so + aReturn.aValue <<= aFontHeight; // another type is needed here, so } break; case SID_ATTR_PARA_ADJUST_LEFT: @@ -1132,7 +1132,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > shrinkSection(RID_STR_UNDO_SHRINK, xSection, _nId); } break; - + case SID_SELECTALL: m_pMyOwnView->SelectAll(OBJ_NONE); break; @@ -1901,7 +1901,7 @@ void OReportController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:CenterPara", SID_ATTR_PARA_ADJUST_CENTER, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:RightPara", SID_ATTR_PARA_ADJUST_RIGHT, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:JustifyPara", SID_ATTR_PARA_ADJUST_BLOCK, CommandGroup::FORMAT ); - + implDescribeSupportedFeature( ".uno:FontHeight", SID_ATTR_CHAR_FONTHEIGHT, CommandGroup::FORMAT ); implDescribeSupportedFeature( ".uno:CharFontName", SID_ATTR_CHAR_FONT, CommandGroup::FORMAT ); @@ -2658,7 +2658,7 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS // sal_Int32 nMinPositionY = nSectionHeight; sal_Int32 nMaxPositionY = 0; uno::Reference< report::XReportComponent> xReportComponent; - + // for every component get it's Y-position and compare it to the current Y-position for (int i=0;i<nElements;i++) { @@ -2670,7 +2670,7 @@ void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xS nMaxPositionY = std::max(nReportComponentPositionYAndHeight, nMaxPositionY); } // now we know the minimal Y-Position and maximal Y-Position - + if (nMaxPositionY > (nSectionHeight - 7) ) // Magic Number, we use a little bit less heights for right positioning { // the lowest position is already 0 @@ -2688,11 +2688,11 @@ void OReportController::shrinkSectionTop(uno::Reference<report::XSection> _xSect return; } - const sal_Int32 nSectionHeight = _xSection->getHeight(); + const sal_Int32 nSectionHeight = _xSection->getHeight(); sal_Int32 nMinPositionY = nSectionHeight; // sal_Int32 nMaxPositionY = 0; uno::Reference< report::XReportComponent> xReportComponent; - + // for every component get it's Y-position and compare it to the current Y-position for (int i=0;i<nElements;i++) { @@ -2739,9 +2739,9 @@ void OReportController::shrinkSection(USHORT _nUndoStrId, uno::Reference<report: else if (_nSid == SID_SECTION_SHRINK_BOTTOM) { shrinkSectionBottom(_xSection); - } + } } - + InvalidateFeature( SID_SAVEDOC ); InvalidateFeature( SID_UNDO ); } @@ -3193,7 +3193,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId ) { pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); - + pNewControl->SetLogicRect(Rectangle(3000,500,8000,5500)); // switch height and width xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY_THROW); OOle2Obj* pObj = dynamic_cast<OOle2Obj*>(pNewControl); @@ -3217,7 +3217,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co OUnoObject* pObj = dynamic_cast<OUnoObject*>(pControl); uno::Reference<beans::XPropertySet> xUnoProp(pObj->GetUnoControlModel(),uno::UNO_QUERY); xShapeProp.set(pObj->getUnoShape(),uno::UNO_QUERY); - uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); + uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); const ::rtl::OUString sProps[] = { PROPERTY_NAME @@ -3237,8 +3237,8 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co if ( xInfo->hasPropertyByName(PROPERTY_BORDER) && xShapeInfo->hasPropertyByName(PROPERTY_CONTROLBORDER) ) xUnoProp->setPropertyValue(PROPERTY_BORDER,xShapeProp->getPropertyValue(PROPERTY_CONTROLBORDER)); - - + + if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) && _sFunction.getLength() ) { ReportFormula aFunctionFormula( ReportFormula::Expression, _sFunction ); @@ -3524,7 +3524,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) uno::Reference< report::XReportComponent> xShapeProp(pObjs[i]->getUnoShape(),uno::UNO_QUERY_THROW); xUnoProp->setPropertyValue(PROPERTY_NAME,xShapeProp->getPropertyValue(PROPERTY_NAME)); - uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); + uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); const ::rtl::OUString sProps[] = { PROPERTY_FONTDESCRIPTOR ,PROPERTY_FONTDESCRIPTORASIAN @@ -3597,7 +3597,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { correctOverlapping(pControl[i],pSectionWindow[1-i]->getReportSection()); } - + if (!bLabelAboveTextField ) { if ( pSectionViews[0] == pSectionViews[1] ) @@ -3623,7 +3623,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) bHasToMove = true; } } - + if (bHasToMove) { // There was a move down, we need to move the Label and the Textfield down @@ -3687,7 +3687,7 @@ void OReportController::changeZOrder(sal_Int32 _nId) case SID_FRAME_UP: pSectionView->MovMarkedToTop(); break; - + case SID_OBJECT_HEAVEN: pSectionView->SetMarkedToLayer( RPT_LAYER_FRONT ); break; @@ -4019,7 +4019,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); sal_Int16 nKeyModifier = 0; - if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) ) + if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) ) { Sequence< PropertyValue > aCreateArgs; m_pMyOwnView->unmarkAllObjects(NULL); @@ -4066,7 +4066,7 @@ void OReportController::checkChartEnabled() ::osl::MutexGuard aGuard( getMutex() ); uno::Reference< frame::XTitle> xTitle(m_xReportDefinition,uno::UNO_QUERY_THROW); - + return xTitle->getTitle (); } // ----------------------------------------------------------------------------- @@ -4150,7 +4150,7 @@ void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty uno::Reference< beans::XPropertySet> xProp(*aIter,uno::UNO_QUERY); try { - uno::Any aTemp2 = xProp->getPropertyValue(_sProperty); + uno::Any aTemp2 = xProp->getPropertyValue(_sProperty); if ( aIter == aSelection.begin() ) { aTemp = aTemp2; @@ -4260,7 +4260,7 @@ void OReportController::openZoomDialog() if ( pFact ) { static SfxItemInfo aItemInfos[] = - { + { { SID_ATTR_ZOOM, SFX_ITEM_POOLABLE } }; SfxPoolItem* pDefaults[] = @@ -4283,7 +4283,7 @@ void OReportController::openZoomDialog() aZoomItem.SetValueSet(SVX_ZOOM_ENABLE_100|SVX_ZOOM_ENABLE_WHOLEPAGE|SVX_ZOOM_ENABLE_PAGEWIDTH); pDescriptor->Put(aZoomItem); - ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get(), RID_SVXDLG_ZOOM) ); + ::std::auto_ptr<AbstractSvxZoomDialog> pDlg( pFact->CreateSvxZoomDialog(NULL, *pDescriptor.get()) ); pDlg->SetLimits( 20, 400 ); bool bCancel = ( RET_CANCEL == pDlg->Execute() ); @@ -4294,7 +4294,7 @@ void OReportController::openZoomDialog() m_nZoomValue = rZoomItem.GetValue(); if ( m_eZoomType != SVX_ZOOM_PERCENT ) m_nZoomValue = m_pMyOwnView->getZoomFactor( m_eZoomType ); - + impl_zoom_nothrow(); } // if ( !bCancel ) } diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 56b1d7152..c48297318 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -33,7 +33,7 @@ #include <ReportControllerObserver.hxx> #include <ReportController.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/report/XFormattedField.hpp> diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 4d9fc0269..2d5aef0da 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -67,7 +67,7 @@ #include <vcl/lineinfo.hxx> #include "ColorChanger.hxx" -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svtools/extcolorcfg.hxx> #include <unotools/confignode.hxx> #include <framework/imageproducer.hxx> diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 6cd1b418e..98872c605 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -37,8 +37,8 @@ #include <tools/debug.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/itempool.hxx> -#include <svtools/syslocale.hxx> +#include <svl/itempool.hxx> +#include <unotools/syslocale.hxx> #include "RptDef.hxx" #include "dlgedfunc.hxx" diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index d38041d53..3283a4a2e 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -41,8 +41,8 @@ #include <vcl/gradient.hxx> #include <vcl/lineinfo.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svtools/syslocale.hxx> -#include <svtools/smplhint.hxx> +#include <unotools/syslocale.hxx> +#include <svl/smplhint.hxx> #define CORNER_SPACE 5 diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 2369dc472..4786fda00 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -190,13 +190,13 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) SetPaintTransparent(TRUE); SetUniqueId(UID_RPT_VIEWSWINDOW); SetMapMode( MapMode( MAP_100TH_MM ) ); - StartListening(m_aColorConfig); + m_aColorConfig.AddListener(this); ImplInitSettings(); } // ----------------------------------------------------------------------------- OViewsWindow::~OViewsWindow() { - EndListening(m_aColorConfig); + m_aColorConfig.RemoveListener(this); m_aSections.clear(); DBG_DTOR( rpt_OViewsWindow,NULL); @@ -588,15 +588,10 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView) } */ // ----------------------------------------------------------------------- -void OViewsWindow::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint) +void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32) { - if (rHint.ISA(SfxSimpleHint) - && (static_cast< SfxSimpleHint const & >(rHint).GetId() - == SFX_HINT_COLORS_CHANGED)) - { ImplInitSettings(); Invalidate(); - } } // ----------------------------------------------------------------------------- void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt ) |