diff options
Diffstat (limited to 'extensions/source')
87 files changed, 327 insertions, 778 deletions
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 41eda708fd19..622c913201d0 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -85,14 +85,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; @@ -110,7 +110,7 @@ namespace abp // context needs to be freshly created // Thus, we access the context here (within the WaitCursor), which means the user sees a waitcursor // while his/her office blocks a few seconds .... - m_xORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdbc.DriverManager" ) ); + m_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.DriverManager" )) ); } if (xDialog.is()) diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index eb024565a840..328f7513fd5f 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -81,7 +81,7 @@ namespace abp //--------------------------------------------------------------------- static Reference< XNameAccess > lcl_getDataSourceContext( const Reference< XMultiServiceFactory >& _rxORB ) SAL_THROW (( Exception )) { - Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ), UNO_QUERY ); + Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatabaseContext" )) ), UNO_QUERY ); DBG_ASSERT(xContext.is(), "lcl_getDataSourceContext: could not access the data source context!"); return xContext; } @@ -136,7 +136,7 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - ::rtl::OUString::createFromAscii( "URL" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )), makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) ) ); } @@ -524,7 +524,7 @@ namespace abp // ................................................................ // create the interaction handler (needed for authentication and error handling) - static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); + static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xInteractions; try { diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index c7af76636362..88c6c4747d71 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -61,16 +61,14 @@ namespace abp //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); + static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" )); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/AddressBook" ); + static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" )); return s_sAddressBookNodeName; } @@ -99,22 +97,22 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "ParentWindow" ), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); // the data source to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSource" ), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSourceName" ), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSource" )), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); // the table to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Command" ), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); // the title ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Title" ), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); // ........................................................ // create an instance of the dialog service - static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ); + static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" )); Reference< XExecutableDialog > xDialog( _rxORB->createInstanceWithArguments( s_sAdressBookFieldAssignmentServiceName, aArguments ), UNO_QUERY @@ -135,7 +133,7 @@ namespace abp #ifdef DBG_UTIL sal_Bool bSuccess = #endif - xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii( "FieldMapping" ) ) >>= aMapping; + xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -201,7 +199,7 @@ namespace abp // access the configuration information which the driver uses for determining it's column names ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); - sDriverAliasesNodeName += ::rtl::OUString::createFromAscii( "/ColumnAliases" ); + sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" )); // create a config node for this OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithServiceFactory( @@ -261,15 +259,15 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString::createFromAscii( "Fields" ) ); + OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) ); // loop through all existent fields Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames(); const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" ); - const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" ); + const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" )); + const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" )); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { @@ -338,9 +336,9 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "DataSourceName" ), makeAny( _rDataSourceName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "Command" ), makeAny( _rTableName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) ); // commit the changes done aAddressBookSettings.commit(); @@ -357,7 +355,7 @@ namespace abp _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); // set the flag - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) ); // commit the changes done aAddressBookSettings.commit(); diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk index 19477e1b6b2b..95c4208553f4 100644 --- a/extensions/source/abpilot/makefile.mk +++ b/extensions/source/abpilot/makefile.mk @@ -44,21 +44,21 @@ CDEFS+=-DCOMPMOD_RESPREFIX=abp # --- Files -------------------------------------------------------- EXCEPTIONSFILES= \ - $(SLO)$/fieldmappingimpl.obj \ - $(SLO)$/datasourcehandling.obj \ + $(SLO)$/abpfinalpage.obj \ + $(SLO)$/abpservices.obj \ + $(SLO)$/abspage.obj \ + $(SLO)$/abspilot.obj \ $(SLO)$/admininvokationimpl.obj \ - $(SLO)$/unodialogabp.obj \ - $(SLO)$/moduleabp.obj \ - $(SLO)$/abpservices.obj \ + $(SLO)$/admininvokationpage.obj \ + $(SLO)$/datasourcehandling.obj \ + $(SLO)$/fieldmappingimpl.obj \ + $(SLO)$/fieldmappingpage.obj \ + $(SLO)$/moduleabp.obj \ + $(SLO)$/tableselectionpage.obj \ $(SLO)$/typeselectionpage.obj \ + $(SLO)$/unodialogabp.obj \ SLOFILES= \ - $(SLO)$/fieldmappingpage.obj \ - $(SLO)$/abpfinalpage.obj \ - $(SLO)$/tableselectionpage.obj \ - $(SLO)$/admininvokationpage.obj \ - $(SLO)$/abspage.obj \ - $(SLO)$/abspilot.obj \ $(EXCEPTIONSFILES) diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 2d7c8633489c..5eb4b1d7681a 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -120,7 +120,7 @@ namespace abp //--------------------------------------------------------------------- ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.abp.OAddressBookSourcePilot"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot")); } //--------------------------------------------------------------------- @@ -133,7 +133,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot")); return aSupported; } @@ -177,7 +177,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = ::rtl::OUString::createFromAscii("Deactivate"); + lProtocol[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp index b795b92fcf76..e0ce5c5da58e 100644 --- a/extensions/source/activex/main/SOActionsApproval.cpp +++ b/extensions/source/activex/main/SOActionsApproval.cpp @@ -5,6 +5,7 @@ #include "so_activex.h" #include "SOActionsApproval.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -16,7 +17,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISOActionsApproval, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/main/SOComWindowPeer.cpp index 6ae1c805fa39..7fb56dbdfd32 100644 --- a/extensions/source/activex/main/SOComWindowPeer.cpp +++ b/extensions/source/activex/main/SOComWindowPeer.cpp @@ -4,6 +4,7 @@ #include "stdafx2.h" #include "so_activex.h" #include "SOComWindowPeer.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -15,7 +16,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISOComWindowPeer, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/main/SODispatchInterceptor.cpp index 5a4455265b97..dcddf0d86b0c 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.cpp +++ b/extensions/source/activex/main/SODispatchInterceptor.cpp @@ -7,6 +7,7 @@ #include "SOActiveX.h" #include "SODispatchInterceptor.h" #include "com_uno_helper.h" +#include <sal/macros.h> ///////////////////////////////////////////////////////////////////////////// // @@ -18,7 +19,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) &IID_ISODispatchInterceptor, }; - for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++) + for (int i=0;i<SAL_N_ELEMENTS(arr);i++) { #if defined(_MSC_VER) && (_MSC_VER >= 1300) if (InlineIsEqualGUID(*arr[i],riid)) diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 319c58d509ad..abcf68855263 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -45,9 +45,8 @@ #define RID_BIB_CONTROLS (RID_BIB_START + 100) #define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1) #define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2) -#define RID_TOOLBAR_IMGLIST_HC (RID_BIB_CONTROLS+ 3) +// free #define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4) -#define RID_TOOLBAR_BIGIMGLIST_HC (RID_BIB_CONTROLS+ 5) //Menu(100) #define RID_BIB_MENU (RID_BIB_CONTROLS + 100) diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 2ab99b35bf23..c86369f834b6 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -44,9 +44,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -/* -----------------11.11.99 14:34------------------- - --------------------------------------------------*/ typedef Mapping* MappingPtr; SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2) SV_IMPL_PTRARR(MappingArray, MappingPtr); @@ -54,9 +52,7 @@ SV_IMPL_PTRARR(MappingArray, MappingPtr); #define C2U(cChar) OUString::createFromAscii(cChar) const char* cDataSourceHistory = "DataSourceHistory"; -/* -----------------------------13.11.00 12:21-------------------------------- - ---------------------------------------------------------------------------*/ Sequence<OUString> BibConfig::GetPropertyNames() { static Sequence<OUString> aNames; @@ -75,9 +71,7 @@ Sequence<OUString> BibConfig::GetPropertyNames() } return aNames; } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::BibConfig() : ConfigItem(C2U("Office.DataAccess/Bibliography"), CONFIG_MODE_DELAYED_UPDATE), pMappingsArr(new MappingArray), @@ -211,18 +205,14 @@ BibConfig::BibConfig() : } } } -/* -----------------------------13.11.00 11:00-------------------------------- - ---------------------------------------------------------------------------*/ BibConfig::~BibConfig() { if(IsModified()) Commit(); delete pMappingsArr; } -/* -----------------------------13.11.00 12:08-------------------------------- - ---------------------------------------------------------------------------*/ BibDBDescriptor BibConfig::GetBibliographyURL() { BibDBDescriptor aRet; @@ -231,9 +221,7 @@ BibDBDescriptor BibConfig::GetBibliographyURL() aRet.nCommandType = nTblOrQuery; return aRet; }; -/* -----------------------------13.11.00 12:20-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc) { sDataSource = rDesc.sDataSource; @@ -321,9 +309,7 @@ void BibConfig::Commit() } } } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -335,9 +321,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const } return 0; } -/* -----------------------------13.11.00 12:23-------------------------------- - ---------------------------------------------------------------------------*/ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapping) { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) @@ -354,21 +338,15 @@ void BibConfig::SetMapping(const BibDBDescriptor& rDesc, const Mapping* pSetMapp pMappingsArr->Insert(pNew, pMappingsArr->Count()); SetModified(); } -/* -----------------------------20.11.00 11:56-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::DBChangeDialogConfig_Impl() { } -/* -----------------------------20.11.00 11:57-------------------------------- - ---------------------------------------------------------------------------*/ DBChangeDialogConfig_Impl::~DBChangeDialogConfig_Impl() { } -/* -----------------------------14.03.01 12:53-------------------------------- - ---------------------------------------------------------------------------*/ const Sequence<OUString>& DBChangeDialogConfig_Impl::GetDataSourceNames() { if(!aSourceNames.getLength()) diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 093f0078b828..982430bdacdb 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -140,9 +140,7 @@ public: void SetShowColumnAssignmentWarning(sal_Bool bSet) { bShowColumnAssignmentWarning = bSet;} }; -/* -----------------------------20.11.00 11:47-------------------------------- - ---------------------------------------------------------------------------*/ class DBChangeDialogConfig_Impl { com::sun::star::uno::Sequence<rtl::OUString> aSourceNames; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index db46e5d9f8d6..c4e8d93aa193 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -227,13 +227,12 @@ extern "C" { try { - rtl::OUString sKey = rtl::OUString::createFromAscii("/"); + rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/")); sKey += BibliographyLoader::getImplementationName_Static(); //creates the impl key: /com.sun.star.extensions.Bibliography Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey); - //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES"); Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static(); for( INT32 i = 0; i < aServices.getLength(); i++ ) @@ -411,9 +410,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: if ( xLayoutManager.is() ) xLayoutManager->createElement( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" ))); } -/* -----------------06.12.99 14:37------------------- - --------------------------------------------------*/ BibDataManager* BibliographyLoader::GetDataManager()const { if(!m_pDatMan) @@ -425,9 +422,7 @@ BibDataManager* BibliographyLoader::GetDataManager()const } return m_pDatMan; } -/* -----------------06.12.99 14:39------------------- - --------------------------------------------------*/ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const { if (!m_xColumns.is()) @@ -483,9 +478,7 @@ Reference< XNameAccess > BibliographyLoader::GetDataColumns() const return m_xColumns; } -/* -----------------17.12.99 12:29------------------- - --------------------------------------------------*/ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const { BibDataManager* pDatMan = GetDataManager(); @@ -501,9 +494,6 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const return xReturn; } -/* -----------------06.12.99 15:05------------------- - - --------------------------------------------------*/ Reference< XResultSet > BibliographyLoader::GetDataCursor() const { if (!m_xCursor.is()) @@ -513,9 +503,6 @@ Reference< XResultSet > BibliographyLoader::GetDataCursor() const return m_xCursor; } -/*-- 17.11.99 12:51:38--------------------------------------------------- - - -----------------------------------------------------------------------*/ rtl::OUString lcl_AddProperty(Reference< XNameAccess > xColumns, const Mapping* pMapping, const String& rColumnName) { @@ -595,9 +582,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw } return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException ) { Sequence< rtl::OUString > aRet(10); @@ -632,9 +617,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt aRet.realloc(nRealNameCount); return aRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException ) { sal_Bool bRet = sal_False; @@ -663,16 +646,12 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti } return bRet; } -/*-- 17.11.99 12:51:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Type BibliographyLoader::getElementType(void) throw ( RuntimeException ) { return ::getCppuType((Sequence<PropertyValue>*)0); } -/*-- 17.11.99 12:51:40--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) { Reference< XResultSet > xCursor = GetDataCursor(); @@ -680,9 +659,6 @@ sal_Bool BibliographyLoader::hasElements(void) throw ( RuntimeException ) return xColumns.is() && (xColumns->getElementNames().getLength() != 0); } -/*-- 07.12.99 14:28:39--------------------------------------------------- - - -----------------------------------------------------------------------*/ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) throw ( RuntimeException ) { @@ -695,9 +671,7 @@ Reference< XPropertySetInfo > BibliographyLoader::getPropertySetInfo(void) thro SfxItemPropertySet(aBibProps_Impl).getPropertySetInfo(); return xRet; } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, const Any& /*aValue*/) throw( UnknownPropertyException, PropertyVetoException, @@ -706,9 +680,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/, throw UnknownPropertyException(); //no changeable properties } -/*-- 07.12.99 14:28:39--------------------------------------------------- - -----------------------------------------------------------------------*/ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { @@ -763,36 +735,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) throw UnknownPropertyException(); return aRet; } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addPropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removePropertyChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no bound properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::addVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { //no vetoable properties } -/*-- 07.12.99 14:28:40--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibliographyLoader::removeVetoableChangeListener( const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index abf2d293ba82..c985291a5121 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -114,9 +114,6 @@ namespace bib m_xGeneralPage = NULL; } - /* -----------------16.11.99 13:13------------------- - - --------------------------------------------------*/ void BibView::UpdatePages() { // TODO: @@ -168,8 +165,6 @@ namespace bib } } } - //--------------------------------------------------------------------- - //--- 19.10.01 16:55:49 ----------------------------------------------- void BibView::_loaded( const EventObject& _rEvent ) { @@ -183,17 +178,12 @@ namespace bib FormControlContainer::_loaded( _rEvent ); } - /* -----------------------------02.02.00 16:49-------------------------------- - - ---------------------------------------------------------------------------*/ IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG ) { pThis->m_pDatMan->CreateMappingDialog( pThis ); return 0; } - /* -----------------------------13.04.00 16:12-------------------------------- - ---------------------------------------------------------------------------*/ void BibView::Resize() { if ( m_pGeneralPage ) @@ -204,9 +194,6 @@ namespace bib Window::Resize(); } - //--------------------------------------------------------------------- - //--- 18.10.01 18:52:45 ----------------------------------------------- - Reference< awt::XControlContainer > BibView::getControlContainer() { Reference< awt::XControlContainer > xReturn; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index fa9775377896..54ab918d7fbe 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -105,10 +105,6 @@ using namespace ::ucb; #define MAP_TOKEN ';' #define PAIR_TOKEN ':' - -/* -----------------17.01.00 14:38------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { // first get the sdb::DataSource corresponding to the url @@ -138,19 +134,12 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) ::rtl::OUString sUser, sPwd; Reference< XPropertySet > xDataSourceProps(xDataSource, UNO_QUERY); Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); -/* Reference< XPropertySetInfo > xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > (); - if (xInfo.is() && xInfo->hasPropertyByName(C2U("User"))) - xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser; - if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password"))) - xDataSourceProps->getPropertyValue(C2U("Password"))>>= sPwd; -*/ try { Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")); Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY); xConn = xComplConn->connectWithCompletion(xIHdl); -// xConn = xDataSource->getConnection(sUser, sPwd); } catch(SQLException&) { @@ -165,9 +154,6 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) return xConn; } -/* -----------------17.01.00 14:46------------------- - - --------------------------------------------------*/ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) { Reference< XConnection > xConn; @@ -191,9 +177,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe return xConn; } -/* -----------------17.01.00 16:07------------------- - --------------------------------------------------*/ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) { Reference< XNameAccess > xReturn; @@ -242,9 +226,6 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) return xReturn; } -/* -----------------11.11.99 15:54------------------- - - --------------------------------------------------*/ class MappingDialog_Impl : public ModalDialog { BibDataManager* pDatMan; @@ -331,9 +312,7 @@ public: void SetModified() {bModified = TRUE;} }; -/* -----------------11.11.99 16:42------------------- - --------------------------------------------------*/ sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , const ::rtl::OUString& rLogicalColumnName) { @@ -532,14 +511,10 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : } } } -/* -----------------11.11.99 16:44------------------- - --------------------------------------------------*/ MappingDialog_Impl::~MappingDialog_Impl() {} -/* -----------------15.11.99 10:38------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) { sal_uInt16 nEntryPos = pListBox->GetSelectEntryPos(); @@ -554,9 +529,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) SetModified(); return 0; } -/* -----------------12.11.99 14:50------------------- - --------------------------------------------------*/ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) { if(bModified) @@ -587,9 +560,7 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) EndDialog(bModified ? RET_OK : RET_CANCEL); return 0; } -/* -----------------18.11.99 10:23------------------- - --------------------------------------------------*/ class DBChangeDialog_Impl : public ModalDialog { OKButton aOKBT; @@ -604,7 +575,6 @@ class DBChangeDialog_Impl : public ModalDialog BibDataManager* pDatMan; -// DECL_LINK(EndDragHdl, HeaderBar*); DECL_LINK(DoubleClickHdl, SvTabListBox*); public: DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); @@ -613,9 +583,6 @@ public: String GetCurrentURL()const; }; -/*-- 18.11.99 10:35:20--------------------------------------------------- - - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ), aOKBT(this, BibResId( BT_OK )), @@ -669,36 +636,17 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) } -/* -----------------06.12.99 12:09------------------- - --------------------------------------------------*/ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/) { EndDialog(RET_OK); return 0; } -/* -----------------18.11.99 11:17------------------- - - --------------------------------------------------*/ -/*IMPL_LINK(DBChangeDialog_Impl, EndDragHdl, HeaderBar*, pHB) -{ - long nTabs[3]; - nTabs[0] = 2;// Number of Tabs - nTabs[1] = 0; - nTabs[2] = pHB->GetItemSize( 1 ); - aSelectionLB.SetTabs( &nTabs[0], MAP_PIXEL ); - return 0; -};*/ - -/*-- 18.11.99 10:35:20--------------------------------------------------- - -----------------------------------------------------------------------*/ DBChangeDialog_Impl::~DBChangeDialog_Impl() { } -/* -----------------18.11.99 12:36------------------- - --------------------------------------------------*/ String DBChangeDialog_Impl::GetCurrentURL()const { String sRet; @@ -710,7 +658,6 @@ String DBChangeDialog_Impl::GetCurrentURL()const return sRet; } -// #100312# -------------------------------------------------------------------- // XDispatchProvider BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch) { @@ -796,7 +743,6 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun: BibDataManager::BibDataManager() :BibDataManager_Base( GetMutex() ) - // #100312# -------------- ,m_pInterceptorHelper( NULL ) ,m_aLoadListeners(m_aMutex) ,pBibView( NULL ) @@ -825,7 +771,6 @@ BibDataManager::~BibDataManager() xConnection->dispose(); m_xForm = NULL; } - // #100312# ---------------- if( m_pInterceptorHelper ) { m_pInterceptorHelper->ReleaseInterceptor(); @@ -944,9 +889,6 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< m_xGridModel = createGridModel( gGridName ); Reference< XNameContainer > xNameCont(xDbForm, UNO_QUERY); -// if (xNameCont->hasByName(sName)) -// xNameCont->removeByName(sName); -// xNameCont->insertByName( sName, makeAny( m_xGridModel ) ); } @@ -1163,9 +1105,7 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery) } setFilter(aQueryString); } -/* -----------------03.12.99 15:05------------------- - --------------------------------------------------*/ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) { ::rtl::OUString uTable; @@ -1435,7 +1375,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" )); sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) ); } @@ -1549,7 +1489,6 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( // (as an anologon to the XStatusListener semantics). // // But this would be way too risky for this last-day fix here. - // 97140 - 30.01.2002 - fs@openoffice.org Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); if ( xLoad.is() && xLoad->isLoaded() ) { @@ -1703,18 +1642,13 @@ catch(Exception& e ) } -/* -----------------11.11.99 15:51------------------- - --------------------------------------------------*/ void BibDataManager::CreateMappingDialog(Window* pParent) { MappingDialog_Impl* pDlg = new MappingDialog_Impl(pParent, this); if(RET_OK == pDlg->Execute() && pBibView) { reload(); -// unload(); -// pBibView->UpdatePages(); -// load(); } delete pDlg; } @@ -1736,17 +1670,13 @@ void BibDataManager::CreateMappingDialog(Window* pParent) delete pDlg; return uRet; } -/*-- 18.05.2004 15:20:15--------------------------------------------------- - -----------------------------------------------------------------------*/ void BibDataManager::DispatchDBChangeDialog() { if(pToolbar) pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >()); } -/* -----------------06.12.99 15:11------------------- - --------------------------------------------------*/ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() { if(!sIdentifierMapping.getLength()) @@ -1772,18 +1702,14 @@ const ::rtl::OUString& BibDataManager::GetIdentifierMapping() } return sIdentifierMapping; } -/* -----------------------------20.11.00 10:31-------------------------------- - ---------------------------------------------------------------------------*/ void BibDataManager::SetToolbar(BibToolBar* pSet) { pToolbar = pSet; if(pToolbar) pToolbar->SetDatMan(*this); } -/* -----------------------------08.05.2002 09:26------------------------------ - ---------------------------------------------------------------------------*/ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController() { if(!m_xFormCtrl.is()) @@ -1792,13 +1718,11 @@ uno::Reference< form::runtime::XFormController > BibDataManager::GetFormControll m_xFormCtrl = uno::Reference< form::runtime::XFormController > ( xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY); m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY)); - // #100312# ------------- m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY); } return m_xFormCtrl; } -// #100312# ---------- void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) { DBG_ASSERT( !m_pInterceptorHelper, "BibDataManager::RegisterInterceptor: called twice!" ); @@ -1809,9 +1733,7 @@ void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer) m_pInterceptorHelper->acquire(); } -/*-- 18.05.2004 17:04:20--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection()const { sal_Bool bRet = sal_False; @@ -1824,9 +1746,7 @@ sal_Bool BibDataManager::HasActiveConnection()const } return bRet; } -/*-- 04.06.2004 14:37:29--------------------------------------------------- - -----------------------------------------------------------------------*/ sal_Bool BibDataManager::HasActiveConnection() { return getConnection( m_xForm ).is(); diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index db61efc3e7c3..665ced0242c5 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -54,8 +54,6 @@ namespace bib { } - //--------------------------------------------------------------------- - //--- 18.10.01 18:54:57 ----------------------------------------------- FormControlContainer::~FormControlContainer( ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::~FormControlContainer: you should disconnect in your derived class!" ); @@ -63,8 +61,6 @@ namespace bib disconnectForm(); } - //--------------------------------------------------------------------- - //--- 18.10.01 17:03:14 ----------------------------------------------- void FormControlContainer::disconnectForm() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -77,8 +73,6 @@ namespace bib } } - //--------------------------------------------------------------------- - //--- 18.10.01 16:56:01 ----------------------------------------------- void FormControlContainer::connectForm( const Reference< XLoadable >& _rxForm ) { DBG_ASSERT( !isFormConnected(), "FormControlContainer::connectForm: already connected!" ); @@ -96,8 +90,6 @@ namespace bib m_xForm = _rxForm; } - //--------------------------------------------------------------------- - //--- 18.10.01 18:50:14 ----------------------------------------------- struct ControlModeSwitch : public ::std::unary_function< Reference< XControl >, void > { sal_Bool bDesign; @@ -110,8 +102,6 @@ namespace bib } }; - //--------------------------------------------------------------------- - //--- 18.10.01 18:49:57 ----------------------------------------------- void FormControlContainer::implSetDesignMode( sal_Bool _bDesign ) { try @@ -134,42 +124,30 @@ namespace bib } } - //--------------------------------------------------------------------- - //--- 18.10.01 18:16:54 ----------------------------------------------- void FormControlContainer::ensureDesignMode() { implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:33 ----------------------------------------------- void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:35 ----------------------------------------------- void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:36 ----------------------------------------------- void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_True ); } - //--------------------------------------------------------------------- - //--- 18.10.01 16:45:37 ----------------------------------------------- void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ ) { implSetDesignMode( sal_False ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 1194982782c3..ff9f40229de9 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -218,7 +218,7 @@ BibFrameController_Impl::~BibFrameController_Impl() ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.extensions.Bibliography"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography")); } sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography"); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography")); return lNames; } @@ -379,9 +379,7 @@ sal_Bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet) _rxCursorSet->getPropertyValue(C2U("Privileges")) >>= nPriv; return ((_rxCursorSet.is() && (nPriv & sdbcx::Privilege::INSERT) != 0)); } -/* -----------------------------08.05.2002 08:58------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XFormController>& xController) { if (!xController.is()) @@ -397,7 +395,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X if (!_xSet.is()) return sal_False; - // muß gespeichert werden ? + // need to save? sal_Bool bIsNew = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsNew"))); sal_Bool bIsModified = ::comphelper::getBOOL(_xSet->getPropertyValue(C2U("IsModified"))); sal_Bool bResult = !bIsModified; @@ -513,27 +511,27 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen Sequence< Any > aDialogCreationArgs( 3 ); Any* pDialogCreationArgs = aDialogCreationArgs.getArray(); // the query composer - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "QueryComposer" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )), -1, makeAny( pDatMan->getParser() ), beans::PropertyState_DIRECT_VALUE ); // the rowset - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "RowSet" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )), -1, makeAny( pDatMan->getForm() ), beans::PropertyState_DIRECT_VALUE ); // the parent window for the dialog - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "ParentWindow" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xWindow ), beans::PropertyState_DIRECT_VALUE ); // create the dialog object - const ::rtl::OUString sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.FilterDialog" ); + const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" )); uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments( sDialogServiceName, aDialogCreationArgs diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 3cee7f8b8364..8100c1fcfa86 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -93,9 +93,7 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos ) } return sRet; } -/* -----------------------------04.01.00 10:54-------------------------------- - ---------------------------------------------------------------------------*/ class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener> { BibGeneralPage* pParentPage; @@ -111,16 +109,12 @@ public: virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException ); }; -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ BibPosListener::BibPosListener(BibGeneralPage* pParent) : pParentPage(pParent) { } -/* -----------------------------04.01.00 10:57-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno::RuntimeException ) { try @@ -193,16 +187,11 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno DBG_ERROR("BibPosListener::positioned: something went wrong !"); } } -/* -----------------------------04.01.00 11:28-------------------------------- - ---------------------------------------------------------------------------*/ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno::RuntimeException ) { } -/* -----------------16.11.99 13:06------------------- - - --------------------------------------------------*/ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): BibTabPage(pParent,BibResId(RID_TP_GENERAL)), aControlParentWin(this, WB_DIALOGCONTROL), @@ -432,11 +421,9 @@ BibGeneralPage::~BibGeneralPage() xRowSet->removeRowSetListener(xPosListener); } } - /* -----------------------------14.04.00 13:11-------------------------------- - ---------------------------------------------------------------------------*/ - void BibGeneralPage::RemoveListeners() - { +void BibGeneralPage::RemoveListeners() +{ for(USHORT i = 0; i < FIELD_COUNT; i++) { if(aControls[i].is()) @@ -446,10 +433,8 @@ BibGeneralPage::~BibGeneralPage() aControls[i] = 0; } } - } -/* -----------------------------21.01.00 17:05-------------------------------- +} - ---------------------------------------------------------------------------*/ void BibGeneralPage::CommitActiveControl() { uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 1cfb4726068d..986a9d78aad1 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -84,10 +84,6 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta pToolBar->CheckItem(nIndex, bChecked); } - /* - rtl::OUString FeatureDescriptor; - sal_Bool Requery; - ::com::sun::star::uno::Any State;*/ } }; @@ -166,7 +162,6 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i])); if(pStringArray[i]==rEvt.FeatureDescriptor) { -// XubString aStr = rEvt.FeatureDescriptor; pToolBar->SelectFilterItem(nID); } } @@ -204,9 +199,7 @@ SV_IMPL_PTRARR( BibToolBarListenerArr, BibToolBarListenerPtr); BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), - aImgLstHC(BibResId(RID_TOOLBAR_IMGLIST_HC )), aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), - aBigImgLstHC(BibResId( RID_TOOLBAR_BIGIMGLIST_HC )), aFtSource(this,WB_VCENTER), aLBSource(this,WB_DROPDOWN), aFtQuery(this,WB_VCENTER), @@ -462,7 +455,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt ) long nResult=sal_True; sal_uInt16 nSwitch=rNEvt.GetType(); - if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP) + if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT) { const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode(); sal_uInt16 nKey = aKeyCode.GetCode(); @@ -551,9 +544,7 @@ void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) (*pListener)->statusChanged(rEvent); } } -/* -----------------------------07.05.2002 15:08------------------------------ - ---------------------------------------------------------------------------*/ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -561,8 +552,6 @@ void BibToolBar::DataChanged( const DataChangedEvent& rDCEvt ) ApplyImageList(); ToolBox::DataChanged( rDCEvt ); } -/* -----------------------------07.05.2002 15:09------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ ) { @@ -614,8 +603,8 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) : - ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst ); + ( aImgLst ) : + ( aBigImgLst ); SetItemImage(TBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER)); SetItemImage(TBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT)); diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index fe1f615d8c2c..23237389fe1b 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -120,7 +120,6 @@ class BibToolBar: public ToolBox BibToolBarListenerArr aListenerArr; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController; Timer aTimer; -// Timer aMenuTimer; ImageList aImgLst; ImageList aImgLstHC; ImageList aBigImgLst; diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index b8a604587bc4..e968a78151a7 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -212,12 +212,6 @@ ImageList RID_TOOLBAR_IMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_IMGLIST_HC -{ - Prefix = "sch"; - MASKCOLOR - BIB_IMAGES -}; ImageList RID_TOOLBAR_BIGIMGLIST { @@ -225,13 +219,6 @@ ImageList RID_TOOLBAR_BIGIMGLIST MASKCOLOR BIB_IMAGES }; -ImageList RID_TOOLBAR_BIGIMGLIST_HC -{ - Prefix = "lch"; - MASKCOLOR - BIB_IMAGES -}; - diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 9a4747b74811..0d50f32ce945 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -297,20 +297,20 @@ void LdapConnection::loadModule() s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); if ( s_Ldap_Module != NULL ) { - s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData)); - s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData)); - s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData)); - s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData)); - s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData)); - s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData)); - s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData)); - s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData)); - s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_attribute").pData)); - s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_next_attribute").pData)); - s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData)); - s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData)); - s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData)); - s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData)); + s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData)); + s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_simple_bind_s")).pData)); + s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_set_option")).pData)); + s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_err2string")).pData)); + s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_init")).pData)); + s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_msgfree")).pData)); + s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_dn")).pData)); + s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_entry")).pData)); + s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_attribute")).pData)); + s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_next_attribute")).pData)); + s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_search_s")).pData)); + s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_value_free")).pData)); + s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_values")).pData)); + s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_memfree")).pData)); } } } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index c87c5935fee9..0a1c3a4bec6d 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -74,7 +74,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex &aDefinition, &loggedOnUser)) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")), NULL); } @@ -126,7 +126,7 @@ bool LdapUserProfileBe::readLdapConfiguration( if (!xCfgProvider.is()) return false; - css::beans::NamedValue aPath(rtl::OUString::createFromAscii("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -234,7 +234,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( //------------------------------------------------------------------------------ rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LdapUserProfileBe") ; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe")); } //------------------------------------------------------------------------------ @@ -276,5 +276,4 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) }}} // --------------------------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 8554dc52500f..1a5f7fb0aab6 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -120,7 +120,7 @@ namespace dbp try { ::rtl::OUString sDataSourceName; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName; Reference< XConnection > xConnection; bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection ); @@ -138,9 +138,9 @@ namespace dbp implFillTables(xConnection); ::rtl::OUString sCommand; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("Command") ) >>= sCommand ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")) ) >>= sCommand ); sal_Int32 nCommandType = CommandType::TABLE; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("CommandType") ) >>= nCommandType ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")) ) >>= nCommandType ); // search the entry of the given type with the given name XubString sLookup( sCommand ); @@ -175,13 +175,13 @@ namespace dbp xOldConn = getFormConnection(); ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), makeAny( sDataSource ) ); } ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("Command"), makeAny( sCommand ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("CommandType"), makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")), makeAny( sCommand ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")), makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, sal_False ); @@ -370,9 +370,8 @@ namespace dbp { ::svt::OLocalResourceAccess aLocalResAccess( ModuleRes( RID_PAGE_TABLESELECTION ), RSC_TABPAGE ); - bool bIsHiContrast = m_aTable.GetSettings().GetStyleSettings().GetHighContrastMode(); - aTableImage = Image( ModuleRes( bIsHiContrast ? IMG_TABLE_HC : IMG_TABLE ) ); - aQueryImage = Image( ModuleRes( bIsHiContrast ? IMG_QUERY_HC : IMG_QUERY ) ); + aTableImage = Image( ModuleRes( IMG_TABLE ) ); + aQueryImage = Image( ModuleRes( IMG_QUERY ) ); } lcl_fillEntries( m_aTable, aTableNames, aTableImage, CommandType::TABLE ); lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY ); diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index 41d199a70209..4e6969b57619 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.src @@ -96,24 +96,11 @@ TabPage RID_PAGE_TABLESELECTION MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - Image IMG_TABLE_HC - { - ImageBitmap = Bitmap { File = "sxh03188.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - Image IMG_QUERY { ImageBitmap = Bitmap { File = "sx03202.bmp"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; - - Image IMG_QUERY_HC - { - ImageBitmap = Bitmap { File = "sxh03202.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; - }; - }; TabPage RID_PAGE_OPTION_DBFIELD diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 202263cff749..408a45dda260 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -240,9 +240,9 @@ namespace dbp sal_Int32 nCommandType = CommandType::COMMAND; try { - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSource; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sCommand; - rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSource; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))) >>= sCommand; + rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))) >>= nCommandType; } catch(const Exception&) { @@ -306,7 +306,7 @@ namespace dbp sal_Int16 nClassId = FormComponentType::CONTROL; try { - getContext().xObjectModel->getPropertyValue(::rtl::OUString::createFromAscii("ClassId")) >>= nClassId; + getContext().xObjectModel->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"))) >>= nClassId; } catch(Exception&) { @@ -448,7 +448,7 @@ namespace dbp Reference< XInterface > xContext; if (xORB.is()) - xContext = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdb.DatabaseContext")); + xContext = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext"))); DBG_ASSERT(xContext.is(), "OControlWizard::implGetDSContext: invalid database context!"); m_aContext.xDatasourceContext = Reference< XNameAccess >(xContext, UNO_QUERY); @@ -472,7 +472,7 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn; + m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xConn; } catch(const Exception&) { @@ -502,7 +502,7 @@ namespace dbp } else { - m_aContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("ActiveConnection"), makeAny( _rxConn ) ); + m_aContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny( _rxConn ) ); } } catch(const Exception&) @@ -519,7 +519,7 @@ namespace dbp //--------------------------------------------------------------------- Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { - const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); + const ::rtl::OUString sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xHandler; try { @@ -572,8 +572,8 @@ namespace dbp if (m_aContext.xForm.is()) { // collect some properties of the form - ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command"))); - sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType"))); + ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")))); + sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")))); // calculate the connection the rowset is working with Reference< XConnection > xConnection; @@ -618,7 +618,7 @@ namespace dbp // not interested in any results, only in the fields Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY); - xStatementProps->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0))); + xStatementProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); // TODO: think about handling local SQLExceptions here ... Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY); @@ -632,7 +632,7 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type"); + static const ::rtl::OUString s_sFieldTypeProperty(RTL_CONSTASCII_USTRINGPARAM("Type")); const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) @@ -697,13 +697,13 @@ namespace dbp // the only thing we have at the moment is the label try { - ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); + ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { ::rtl::OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - ::rtl::OUString::createFromAscii("Label"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(sControlLabel) ); } @@ -724,7 +724,7 @@ namespace dbp // initialize some settings from the control model give try { - ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); + ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { @@ -745,31 +745,6 @@ namespace dbp // lemme see ... return (0 == getContext().aFieldNames.getLength()); // if we got fields, the data source is valid ... -// try -// { -// // first, we need a valid data source name -// ::rtl::OUString sDataSourceName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; -// if (m_aContext.xDatasourceContext.is() && m_aContext.xDatasourceContext->hasByName(sDataSourceName)) -// { // at least the data source name is valid ... -// // then, a CommandType "table" would be nice ... -// sal_Int32 nCommandType = CommandType::COMMAND; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; -// if (CommandType::TABLE == nCommandType) -// { // okay .... -// // now the table itself should be valid -// ::rtl::OUString sTableName; -// m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sTableName; -// if (m_aContext.xObjectContainer.is() && m_aContext.xObjectContainer->hasByName(sTableName)) -// return sal_False; -// } -// } -// } -// catch(Exception&) -// { -// DBG_ERROR("OControlWizard::needDatasourceSelection: caught an exception while checking the form settings!"); -// } -// return sal_True; } //......................................................................... diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index ecb424c5e3b7..4b5c1ec92d6d 100644 --- a/extensions/source/dbpilots/dbpresid.hrc +++ b/extensions/source/dbpilots/dbpresid.hrc @@ -210,9 +210,7 @@ // Image #define IMG_TABLE 1 -#define IMG_TABLE_HC 2 #define IMG_QUERY 3 -#define IMG_QUERY_HC 4 //======================================================================== // defines diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index f3bd194a27c3..ebc03de45850 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -111,10 +111,10 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField"); - static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label"); - static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width"); - static const ::rtl::OUString s_sMouseWheelBehavior = ::rtl::OUString::createFromAscii("MouseWheelBehavior"); + static const ::rtl::OUString s_sDataFieldProperty (RTL_CONSTASCII_USTRINGPARAM("DataField")); + static const ::rtl::OUString s_sLabelProperty (RTL_CONSTASCII_USTRINGPARAM("Label")); + static const ::rtl::OUString s_sWidthProperty (RTL_CONSTASCII_USTRINGPARAM("Width")); + static const ::rtl::OUString s_sMouseWheelBehavior (RTL_CONSTASCII_USTRINGPARAM("MouseWheelBehavior")); static const ::rtl::OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns @@ -143,14 +143,14 @@ namespace dbp { case DataType::BIT: case DataType::BOOLEAN: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("CheckBox")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("NumericField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumericField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; @@ -159,31 +159,31 @@ namespace dbp case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("FormattedField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::DATE: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIME: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIMESTAMP: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); aFormFieldNames.push_back(*pSelectedFields); - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); break; default: - aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TextField")); + aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField"))); aColumnLabelPostfixes.push_back(s_sEmptyString); } } diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index f8cd1c509ebf..66c97e59b83e 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -84,9 +84,6 @@ namespace dbp { switch (_nState) { -// case GBW_STATE_DATASELECTION: -// return new OTableSelectionPage(this); -// case GBW_STATE_OPTIONLIST: return new ORadioSelectionPage(this); @@ -111,9 +108,6 @@ namespace dbp { switch (_nCurrentState) { -// case GBW_STATE_DATASELECTION: -// return GBW_STATE_OPTIONLIST; -// case GBW_STATE_OPTIONLIST: return GBW_STATE_DEFAULTOPTION; diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index d70fdcb97378..0a93ad8c22d1 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -187,12 +187,12 @@ namespace dbp } // ListSourceType: SQL - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), makeAny((sal_Int32)ListSourceType_SQL)); if (isListBox()) { // BoundColumn: 1 - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("BoundColumn"), makeAny((sal_Int16)1)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundColumn")), makeAny((sal_Int16)1)); // build the statement to set as list source String sStatement; @@ -204,7 +204,7 @@ namespace dbp sStatement += getSettings().sListContentTable; Sequence< ::rtl::OUString > aListSource(1); aListSource[0] = sStatement; - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(aListSource)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(aListSource)); } else { @@ -214,11 +214,11 @@ namespace dbp sStatement += getSettings().sListContentField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(::rtl::OUString(sStatement))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(::rtl::OUString(sStatement))); } // the bound field - getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); } catch(Exception&) { diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index 13c453243d0f..e1de8e380b85 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -109,7 +109,7 @@ namespace dbp // shape collection (for grouping the shapes) Reference< XShapes > xButtonCollection(m_xORB->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection"))), UNO_QUERY); // first member : the shape of the control xButtonCollection->add(_rContext.xObjectShape.get()); @@ -124,7 +124,7 @@ namespace dbp ::com::sun::star::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; - ::rtl::OUString sElementsName = ::rtl::OUString::createFromAscii("RadioGroup"); + ::rtl::OUString sElementsName(RTL_CONSTASCII_USTRINGPARAM("RadioGroup")); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); @@ -134,28 +134,28 @@ namespace dbp aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace; Reference< XPropertySet > xRadioModel( - xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton")), + xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.RadioButton"))), UNO_QUERY); // the label - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Label"), makeAny(rtl::OUString(*aLabelIter))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(rtl::OUString(*aLabelIter))); // the value - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("RefValue"), makeAny(rtl::OUString(*aValueIter))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")), makeAny(rtl::OUString(*aValueIter))); // default selection if (_rSettings.sDefaultField == *aLabelIter) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DefaultState"), makeAny(sal_Int16(1))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), makeAny(sal_Int16(1))); // the connection to the database field if (0 != _rSettings.sDBField.Len()) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField))); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(_rSettings.sDBField))); // the name for the model - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); // create a shape for the radio button Reference< XControlShape > xRadioShape( - xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape")), + xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))), UNO_QUERY); Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY); @@ -170,7 +170,7 @@ namespace dbp // the name of the shape if (xShapeProperties.is()) - xShapeProperties->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); + xShapeProperties->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); // add to the page xPageShapes->add(xRadioShape.get()); @@ -179,7 +179,7 @@ namespace dbp // set the GroupBox as "LabelControl" for the RadioButton // (_after_ having inserted the model into the page!) - xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("LabelControl"), makeAny(_rContext.xObjectModel)); + xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), makeAny(_rContext.xObjectModel)); } // group the shapes @@ -203,7 +203,7 @@ namespace dbp //--------------------------------------------------------------------- void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static const ::rtl::OUString s_sAnchorPropertyName = ::rtl::OUString::createFromAscii("AnchorType"); + static const ::rtl::OUString s_sAnchorPropertyName(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index 23d0c2b6c80b..d6ac0d4765c3 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -70,14 +70,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGroupBoxSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGroupBoxWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGroupBoxWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupBoxAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupBoxAutoPilot")); return aReturn; } @@ -87,14 +87,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OListComboSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OListComboWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OListComboWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ListComboBoxAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ListComboBoxAutoPilot")); return aReturn; } @@ -104,14 +104,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGridSI::getImplementationName() const { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGridWizard"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGridWizard")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGridSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GridControlAutoPilot"); + aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GridControlAutoPilot")); return aReturn; } diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index fe8321be9cdd..35daf0e83799 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -264,7 +264,7 @@ namespace COMPMOD_NAMESPACE { ::rtl::OUString aMainKeyName(sRootKey); aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); + aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); try { diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index f6320c22f33e..742bedecc0e7 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -70,7 +70,6 @@ using namespace com::sun::star; char SoPluginInstance::sSO_Dir[] = {0}; Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL); - SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory > xMSF): m_xUnoWin(NULL), m_xComponent(NULL), @@ -86,7 +85,6 @@ SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory m_nY = 0; m_nFlag = 15; m_bInit = sal_False; - m_sURL = rtl::OUString::createFromAscii(""); m_hParent = 0; m_pParent = pParent; m_dParentStyl = 0; @@ -136,7 +134,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) { // try to create netscape plugin window Reference< awt::XToolkit > xToolkit( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY ); if( !xToolkit.is() ) { @@ -189,7 +187,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Frame") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -205,16 +203,16 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ) >>= xLMProps; + xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) ); } catch( uno::Exception& ) {} // get frames supplier Reference< frame::XFramesSupplier > m_xFramesSupplier( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); if ( !m_xFramesSupplier.is() ) { @@ -243,7 +241,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) //create stream for the document Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ), uno::UNO_QUERY ); if(!xSimpleFileAccess.is()) { @@ -275,14 +273,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), m_sURL.getLength() ); - // load document -/* - m_xComponent = xLoader->loadComponentFromURL( - OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL, - m_xFrame->getName(), 0, setPropValues ); - */ - Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3); setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") ); setPropValues2[0].Value <<= sal_True; @@ -316,7 +307,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame::XDispatchHelper and frame::XDispatchProvider m_xDispatcher = Reference< frame::XDispatchHelper > ( - mxRemoteMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), + mxRemoteMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), uno::UNO_QUERY ); if(!m_xDispatcher.is()) { @@ -335,7 +326,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") ); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")), m_xFrame->getName(), 0, propertyValue ); @@ -419,12 +410,6 @@ sal_Bool SoPluginInstance::Destroy(void) if(m_dParentStyl != 0) NSP_RestoreWinStyl(m_hParent, m_dParentStyl); #endif -// if(m_xDispatcher.is()){ -// m_xDispatcher->executeDispatch(m_xDispatchProvider, -// ::rtl::OUString::createFromAscii(".uno:CloseFrame"), -// ::rtl::OUString::createFromAscii("_top"), 0, -// Sequence< ::com::sun::star::beans::PropertyValue >() ); -// } uno::Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY ); @@ -489,7 +474,7 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:PrintDefault"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")), m_xFrame->getName(), 0, propertyValue ); return sal_True; diff --git a/extensions/source/ole/ole2uno.cxx b/extensions/source/ole/ole2uno.cxx index 203c6b4d3b8b..9bf89b02a398 100644 --- a/extensions/source/ole/ole2uno.cxx +++ b/extensions/source/ole/ole2uno.cxx @@ -55,22 +55,6 @@ Mutex * getBridgeMutex() } -// Mutex* getBridgeMutex() -// { -// static Mutex* pMutex= NULL; - -// if( ! pMutex) -// { -// MutexGuard guard( Mutex::getGlobalMutex() ); -// if( !pMutex) -// { -// static Mutex aMutex; -// pMutex= &aMutex; -// } -// } -// return pMutex; -// } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 847ce89ce4f9..5696375a5971 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -491,7 +491,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) // Instead here I chose a name that should be illegal both in COM and // UNO ( from an IDL point of view ) therefore I think this is a safe // hack - if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") )) + if ( aPropertyName.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$GetTypeName")) )) { if ( pInfo && m_sTypeName.getLength() == 0 ) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index a220bd5d1578..1ce9f3c9ae0b 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -563,13 +563,6 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny, bFail = true; break; default: -// case TypeClass_SERVICE: break; // meta construct -// case TypeClass_TYPEDEF: break; -// case TypeClass_UNION: break; -// case TypeClass_MODULE: break; // module -// case TypeClass_EXCEPTION: break; -// case TypeClass_ARRAY: break; // there's no Array at the moment -// case TypeClass_UNKNOWN: break; bCannotConvert = true; break; } diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index cae9ecb5caa3..91e154dd190f 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1125,7 +1125,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s sal_Bool bStruct= sal_False; - Reference<XInterface> xIntCore= m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection")); + Reference<XInterface> xIntCore= m_smgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection"))); Reference<XIdlReflection> xRefl( xIntCore, UNO_QUERY); if( xRefl.is() ) { diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx index 748d7a59da58..f2433befa6e1 100644 --- a/extensions/source/ole/unotypewrapper.hxx +++ b/extensions/source/ole/unotypewrapper.hxx @@ -35,8 +35,8 @@ #define STRICT #define _WIN32_WINNT 0x0403 #define _WIN32_DCOM -#if OSL_DEBUG_LEVEL > 0 -//#define _ATL_DEBUG_INTERFACES +#if OSL_DEBUG_LEVEL > 2 +#define _ATL_DEBUG_INTERFACES #endif #include <atlbase.h> extern CComModule _Module; diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 472d844337a3..00b6978a1e1d 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -121,17 +121,17 @@ namespace oooimprovecore OUString help_url; Reference<XCoreController> core_c( - xServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), + xServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))), UNO_QUERY); if(core_c.is()) ::comphelper::ConfigurationHelper::readDirectKey( xServiceFactory, - OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), - OUString::createFromAscii("Participation"), - OUString::createFromAscii("HelpUrl"), + OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Participation")), + OUString(RTL_CONSTASCII_USTRINGPARAM("HelpUrl")), ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url; else - help_url = OUString::createFromAscii("http://www.libreoffice.org"); + help_url = OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.libreoffice.org")); { SolarMutexGuard aGuard; SfxAllItemSet aSet( SFX_APP()->GetPool() ); @@ -161,12 +161,12 @@ namespace oooimprovecore { return getSupportedServiceNames_static(); } OUString SAL_CALL Core::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovecore.Core"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovecore.Core")); } Sequence<OUString> SAL_CALL Core::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.Core"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core")); return aServiceNames; } diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx index 296df200d50d..751adf3c965d 100644 --- a/extensions/source/oooimprovement/config.cxx +++ b/extensions/source/oooimprovement/config.cxx @@ -43,32 +43,32 @@ namespace { using namespace oooimprovement; - static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters"); - static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed"); - static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents"); - static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension"); - static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts"); - static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted"); - static const OUString CFG_L10N = OUString::createFromAscii("L10N"); - static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale"); - static const OUString CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging"); - static const OUString CFG_LOGPATH = OUString::createFromAscii("LogPath"); - static const OUString CFG_NAME = OUString::createFromAscii("ooName"); - static const OUString CFG_OFFICESTARTCOUNTDOWN = OUString::createFromAscii("OfficeStartCounterdown"); - static const OUString CFG_OOOIMPROVEMENT = OUString::createFromAscii("OOoImprovement"); - static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"); - static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation"); - static const OUString CFG_PRODUCT = OUString::createFromAscii("Product"); - static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports"); - static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail"); - static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup"); - static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation"); - static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions"); - static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl"); - static const OUString CFG_UPLOAD = OUString::createFromAscii("Upload"); - static const OUString CFG_VERSION = OUString::createFromAscii("ooSetupVersion"); - - static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n"); + static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters")); + static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed")); + static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents")); + static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")); + static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts")); + static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted")); + static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N")); + static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); + static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging")); + static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath")); + static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName")); + static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown")); + static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement")); + static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")); + static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation")); + static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product")); + static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports")); + static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail")); + static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); + static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation")); + static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions")); + static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl")); + static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload")); + static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion")); + + static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n")); static sal_Int32 incrementCfgValue( const Reference<XMultiServiceFactory> sm, @@ -183,14 +183,14 @@ namespace oooimprovement MyConfigurationHelper::E_READONLY) >>= value; result.append(value); - value = OUString::createFromAscii(""); + value = OUString(); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_VERSION, MyConfigurationHelper::E_READONLY) >>= value; if(value.getLength()) result.appendAscii(" ").append(value); - value = OUString::createFromAscii(""); + value = OUString(); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION, diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx index 8a9bae0f62dd..269d947c3e08 100644 --- a/extensions/source/oooimprovement/corecontroller.cxx +++ b/extensions/source/oooimprovement/corecontroller.cxx @@ -76,12 +76,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL CoreController::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.CoreController"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.CoreController")); } Sequence<OUString> SAL_CALL CoreController::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.CoreController"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController")); return aServiceNames; } diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx index 1b96c0c181cd..c62ab07671c0 100644 --- a/extensions/source/oooimprovement/invite_job.cxx +++ b/extensions/source/oooimprovement/invite_job.cxx @@ -50,7 +50,7 @@ namespace // [add additional conditions here] static bool lcl_IsInvitationAllowed() { - static OUString sNoFirstStartWizard = OUString::createFromAscii("-nofirststartwizard"); + static OUString sNoFirstStartWizard(RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard")); sal_Int32 nCount = rtl_getAppCommandArgCount(); for(sal_Int32 nCurrent=0; nCurrent<nCount; nCurrent++) { @@ -65,12 +65,6 @@ namespace namespace oooimprovement { -// InviteJob::InviteJob(const Reference<XComponentContext>& context) -// : m_ServiceFactory(Reference<XMultiServiceFactory>( -// context->getServiceManager()->createInstanceWithContext( -// OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context), -// UNO_QUERY)) -// { } InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf) : m_ServiceFactory(sf) @@ -93,7 +87,7 @@ namespace oooimprovement if(lcl_IsInvitationAllowed() && !config.getShowedInvitation()) { Reference<XCore> core( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.Core")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))), UNO_QUERY); if(core.is()) core->inviteUser(); } @@ -117,18 +111,15 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL InviteJob::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.InviteJob"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.InviteJob")); } Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob")); return aServiceNames; } -// Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context) -// { return *(new InviteJob(context)); } - Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm) { return *(new InviteJob(sm)); } } diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx index 4defc2ab2cbe..e74b74c31982 100644 --- a/extensions/source/oooimprovement/logpacker.cxx +++ b/extensions/source/oooimprovement/logpacker.cxx @@ -74,13 +74,13 @@ namespace oooimprovement sal_Int32 LogPacker::pack(const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); Reference<XStorage> storage; { Reference<XSingleServiceFactory> storage_factory( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.embed.StorageFactory")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), UNO_QUERY_THROW); Sequence<Any> storage_init_args(2); storage_init_args[0] = Any(getZipfileurl(fileurl)); @@ -91,7 +91,7 @@ namespace oooimprovement } Reference<XOutputStream> zipped_stream = storage->openStreamElement( - OUString::createFromAscii("logdata.csv"), + OUString(RTL_CONSTASCII_USTRINGPARAM("logdata.csv")), ElementModes::WRITE)->getOutputStream(); Reference<XInputStream> unzipped_stream = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 1024; diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx index 7181ed2fdce6..7bf3ef10ff10 100644 --- a/extensions/source/oooimprovement/logstorage.cxx +++ b/extensions/source/oooimprovement/logstorage.cxx @@ -47,7 +47,7 @@ namespace { using namespace oooimprovement; - static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution"); + static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution")); static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf) { @@ -63,14 +63,14 @@ namespace static bool isZipfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".zip"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()); }; static bool isLogfile(const OUString& fileurl) { - static const OUString file_extension = OUString::createFromAscii(".csv"); - static const OUString current = OUString::createFromAscii("Current.csv"); + static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv")); + static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv")); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()) && !fileurl.match(current, fileurl.getLength()-current.getLength()); @@ -84,7 +84,7 @@ namespace static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); return file_access->getFolderContents( getLogPathFromCfg(sf), @@ -107,7 +107,7 @@ namespace static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); OUString log_path(getLogPathFromCfg(sf)); if(!file_access->isFolder(log_path)) @@ -130,7 +130,7 @@ namespace oooimprovement void LogStorage::clear() { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile); for(vector<OUString>::iterator item = files_to_kill.begin(); diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx index d9ff3ecd03dc..b211fdb6756c 100644 --- a/extensions/source/oooimprovement/myconfigurationhelper.cxx +++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx @@ -74,28 +74,28 @@ namespace oooimprovement sal_Int32 eMode) { Reference<XMultiServiceFactory> xConfigProvider( - xSMGR->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + xSMGR->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), UNO_QUERY_THROW); vector<Any> lParams; css::beans::PropertyValue aParam; // set root path - aParam.Name = OUString::createFromAscii("nodepath"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Value <<= sPackage; lParams.push_back(makeAny(aParam)); // enable all locales mode if ((eMode & MyConfigurationHelper::E_ALL_LOCALES)==MyConfigurationHelper::E_ALL_LOCALES) { - aParam.Name = OUString::createFromAscii("locale"); - aParam.Value <<= OUString::createFromAscii("*"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("locale")); + aParam.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("*")); lParams.push_back(makeAny(aParam)); } // enable lazy writing sal_Bool bLazy = ((eMode & MyConfigurationHelper::E_LAZY_WRITE)==MyConfigurationHelper::E_LAZY_WRITE); - aParam.Name = OUString::createFromAscii("lazywrite"); + aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")); aParam.Value = makeAny(bLazy); lParams.push_back(makeAny(aParam)); @@ -105,11 +105,11 @@ namespace oooimprovement sal_Bool bReadOnly = ((eMode & MyConfigurationHelper::E_READONLY)==MyConfigurationHelper::E_READONLY); if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), sequenceFromVector(lParams)); else xCFG = xConfigProvider->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")), sequenceFromVector(lParams)); return xCFG; } diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx index 18108df7629e..5407c4b6edf0 100644 --- a/extensions/source/oooimprovement/onlogrotate_job.cxx +++ b/extensions/source/oooimprovement/onlogrotate_job.cxx @@ -74,7 +74,7 @@ namespace { Config config(sf); Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); SoapSender sender(sf, config.getSoapUrl()); OUString soap_id = config.getSoapId(); @@ -148,7 +148,7 @@ namespace oooimprovement OnLogRotateJob::OnLogRotateJob(const Reference<XComponentContext>& context) : m_ServiceFactory(Reference<XMultiServiceFactory>( context->getServiceManager()->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.XMultiServiceFactory")), context), UNO_QUERY)) { } @@ -186,12 +186,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL OnLogRotateJob::getImplementationName_static() - { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"); } + { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob")); } Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); + aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob")); return aServiceNames; } diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx index aad080ed9520..d4b1c8a2d85b 100644 --- a/extensions/source/oooimprovement/soaprequest.cxx +++ b/extensions/source/oooimprovement/soaprequest.cxx @@ -116,7 +116,7 @@ namespace static void writeFile(const Reference<XMultiServiceFactory>& sf, const Reference<XOutputStream>& target, const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY); Reference<XInputStream> file = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 3; diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx index 17a3252fb608..8cb9c2e9104f 100644 --- a/extensions/source/oooimprovement/soapsender.cxx +++ b/extensions/source/oooimprovement/soapsender.cxx @@ -78,13 +78,13 @@ namespace oooimprovement void SoapSender::send(const SoapRequest& request) const { Reference<XTempFile> temp_file( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.io.TempFile")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))), UNO_QUERY_THROW); Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), UNO_QUERY_THROW); Reference<XURLTransformer> url_trans( - m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")), + m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY_THROW); // writing request to tempfile @@ -109,7 +109,7 @@ namespace oooimprovement oslSocketResult result = socket->connect(addr); if(result != osl_Socket_Ok) throw RuntimeException( - OUString::createFromAscii("unable to connect to SOAP server"), + OUString(RTL_CONSTASCII_USTRINGPARAM("unable to connect to SOAP server")), Reference<XInterface>()); } @@ -121,7 +121,7 @@ namespace oooimprovement const OString header = getHttpPostHeader(path_on_server.makeStringAndClear(), file_access->getSize(temp_file->getUri())); if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength())) throw RuntimeException( - OUString::createFromAscii("error while sending HTTP header"), + OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending HTTP header")), Reference<XInterface>()); } @@ -140,7 +140,7 @@ namespace oooimprovement buf2[idx] = buf[idx]; if(socket->write(buf2, bytes_read) != bytes_read) throw RuntimeException( - OUString::createFromAscii("error while sending SOAP request"), + OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending SOAP request")), Reference<XInterface>()); } while(bytes_read == bufsize); } @@ -154,7 +154,7 @@ namespace oooimprovement const sal_Int32 returncode_start = answer.indexOf(' '); if(returncode_start==-1 || !answer.copy(returncode_start, 4).equals(OString(" 200"))) throw RuntimeException( - OUString::createFromAscii("SOAP server returns a error"), + OUString(RTL_CONSTASCII_USTRINGPARAM("SOAP server returns a error")), Reference<XInterface>()); } } diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 4d6a109d57e5..5f295a13e76b 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -124,7 +124,7 @@ XPluginContext_Impl::~XPluginContext_Impl() void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); if( ! xInst.is() ) return; @@ -151,7 +151,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -186,7 +186,7 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin ::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString::createFromAscii( "Mozilla 3.0" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Mozilla 3.0")); } void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) @@ -217,7 +217,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); if( ! xInst.is() ) return ; @@ -228,10 +228,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString::createFromAscii( "PostString" ); + aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostString")); aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = @@ -302,7 +302,7 @@ void FileSink::closeOutput() throw() if( fp ) fclose( fp ); - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); Reference< ::com::sun::star::frame::XComponentLoader > xLoader( xInst, UNO_QUERY ); XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( m_xPlugin ); @@ -311,7 +311,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); + aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 0ebee37244c9..9c0bd7dc1c7d 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -129,7 +129,7 @@ Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")); return aSNS; } diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index b378795a92f1..297f96a0a441 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -583,23 +583,6 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo *(NPBool*)value = false; break; } - /* - provisional code should there ever be NPNVariables that we actually - want to query from the PluginContext - ::rtl::OUString aValue; - try - { - pImpl->enterPluginCallback(); - aValue = pImpl->getPluginContext()-> - getValue( pImpl, (::com::sun::star::plugin::PluginVariable)variable ); - pImpl->leavePluginCallback(); - } - catch( ::com::sun::star::plugin::PluginException& e ) - { - pImpl->leavePluginCallback(); - return e.ErrorCode; - } - */ return aResult; } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 9cd5cd0e79cc..775e25bd07ff 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -58,7 +58,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); return aSNS; } @@ -190,7 +190,7 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject ::rtl::OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 1ce6dcc1a05c..51a79bdbc153 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -69,14 +69,14 @@ extern "C" { { Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) ); - ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" ); + ::rtl::OUString aImplName (RTL_CONSTASCII_USTRINGPARAM("/")); aImplName += XPluginManager_Impl::getImplementationName_Static(); - aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" ); + aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginManager")); xKey->createKey( aImplName ); - aImplName = ::rtl::OUString::createFromAscii( "/" ); + aImplName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); aImplName += PluginModel::getImplementationName_Static(); - aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" ); + aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginModel")); xKey->createKey( aImplName ); return sal_True; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 8e8af63b94b8..7dd600266e41 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -461,7 +461,7 @@ OUString XPlugin_Impl::getCreationURL() uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { - Any aValue = xPS->getPropertyValue( OUString::createFromAscii( "URL" ) ); + Any aValue = xPS->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ); aValue >>= aRet; } return aRet; @@ -649,9 +649,9 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { try { - xPS->setPropertyValue( OUString::createFromAscii( "URL" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), aAny ); aAny <<= mimetype; - xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); } catch(...) { @@ -713,7 +713,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { Any aAny; aAny <<= m_aDescription.Mimetype; - xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); + xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); } catch(...) { @@ -723,22 +723,8 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, // there may be plugins that can use the file length information, // but currently none are known. Since this file opening/seeking/closing - // is rather costly, it is #if'ed out. If there are plugins known to + // is rather costly, it is not implemented. If there are plugins known to // make use of the file length, simply put it in -#if 0 - if( isfile && ! length ) - { - osl::File aFile( url ); - if( aFile.open( OpenFlag_Read ) == FileBase::E_None ) - { - aFile.setPos( Pos_End, 0 ); - sal_uInt64 nPos = 0; - if( aFile.getPos( nPos ) == FileBase::E_None ) - length = nPos; - aFile.close(); - } - } -#endif PluginInputStream* pStream = new PluginInputStream( this, aURL.getStr(), length, lastmodified ); @@ -890,7 +876,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL ) { - uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), UNO_QUERY ); + uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), UNO_QUERY ); if( !xPMgr.is() ) { m_nProvidingState = PROVIDING_NONE; @@ -1140,7 +1126,7 @@ PluginOutputStream::PluginOutputStream( XPlugin_Impl* pPlugin, sal_uInt32 len, sal_uInt32 lastmod ) : PluginStream( pPlugin, url, len, lastmod ), - m_xStream( pPlugin->getServiceManager()->createInstance( OUString::createFromAscii( "com.sun.star.io.DataOutputStream" ) ), UNO_QUERY ) + m_xStream( pPlugin->getServiceManager()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) ), UNO_QUERY ) { Guard< Mutex > aGuard( m_pPlugin->getMutex() ); diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx index 6e862f67b2c0..d4cb19e3bce0 100644 --- a/extensions/source/plugin/unx/npnapi.cxx +++ b/extensions/source/plugin/unx/npnapi.cxx @@ -340,27 +340,6 @@ static const char* l_NPN_UserAgent( NPP instance ) return pAgent; } -#if 0 -static void l_NPN_Version( int* major, int* minor, int* net_major, int* net_minor ) -{ - MediatorMessage* pMes = pConnector-> - Transact( eNPN_Version, - NULL ); - - if( ! pMes ) - return; - - *major = pMes->GetUINT32(); - *minor = pMes->GetUINT32(); - *net_major = pMes->GetUINT32(); - *net_minor = pMes->GetUINT32(); - - medDebug( 1, "pluginapp: NPN_Version: results %d %d, %d %d\n", *major, *minor, *net_major, *net_minor ); - - delete pMes; -} -#endif - static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer ) { UINT32 nFileID = pConnector->GetStreamID( stream ); diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 0ecd12b65ff7..20c91bfba8b8 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -308,7 +308,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th // create return value aDescriptions = Sequence<PluginDescription>( aPlugins.size() ); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "found %d plugins\n", aPlugins.size() ); + fprintf( stderr, "found %" SAL_PRI_SIZET "u plugins\n", aPlugins.size() ); #endif list<PluginDescription*>::iterator iter; for( iter = aPlugins.begin(), i=0; iter != aPlugins.end(); ++iter ,i++ ) diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index db90cfbf7a45..8ebb7484271a 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -422,7 +422,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo rDescr.Description = aComment; sal_Int32 nPos = 0, nLen = aExtToken.getLength(); - OUString aExtensions( OUString::createFromAscii( nLen ? "*." : "*.*" ) ); + OUString aExtensions(nLen ? RTL_CONSTASCII_USTRINGPARAM( "*.") : RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ); for ( ; nPos < nLen; ++nPos ) { @@ -431,7 +431,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo { case ',': case ';': - aExtensions += OUString::createFromAscii( ";*." ); + aExtensions += OUString(RTL_CONSTASCII_USTRINGPARAM(";*.")); case ' ': break; case '*': diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx index 9264205d7ae0..e50a7426918f 100644 --- a/extensions/source/preload/oemwiz.cxx +++ b/extensions/source/preload/oemwiz.cxx @@ -74,9 +74,7 @@ namespace preload } void WriteUserData(); }; -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ OEMPreloadDialog_Impl::OEMPreloadDialog_Impl(OEMPreloadDialog* pDialog) { SfxItemPool& rPool = SFX_APP()->GetPool(); @@ -93,18 +91,13 @@ namespace preload pWelcomePage = new OEMWelcomeTabPage(pDialog); pLicensePage = new OEMLicenseTabPage(pDialog); } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ void OEMPreloadDialog_Impl::WriteUserData() { if ( pUserDataPage ) ((SfxTabPage*)pUserDataPage)->FillItemSet(*pSet); } -/* -----------------------------14.11.2001 11:33------------------------------ - - ---------------------------------------------------------------------------*/ //===================================================================== //= OEMPreloadDialog //===================================================================== @@ -144,16 +137,12 @@ namespace preload SetPage( OEM_USERDATA, pImpl->pUserDataPage ); ShowPage( OEM_WELCOME ); } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ OEMPreloadDialog::~OEMPreloadDialog( ) { delete pImpl; } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ IMPL_LINK(OEMPreloadDialog, NextPrevPageHdl, PushButton*, pButton) { if(pButton == &aPrevPB) @@ -191,9 +180,7 @@ namespace preload aPrevPB.Enable(GetCurLevel() != OEM_WELCOME); return 0; } -/* -----------------------------14.11.2001 11:33------------------------------ - ---------------------------------------------------------------------------*/ sal_Bool OEMPreloadDialog::LoadFromLocalFile(const String& rFileName, String& rContent) { SvtPathOptions aPathOpt; @@ -224,24 +211,17 @@ namespace preload aCancelPB.SetText(rText); } -/* -----------------------------13.11.2001 12:29------------------------------ - - ---------------------------------------------------------------------------*/ OEMWelcomeTabPage::OEMWelcomeTabPage(Window* pParent) : TabPage(pParent, ModuleRes(RID_TP_WELCOME)), aInfoFT(this, ModuleRes(FT_INFO)) { FreeResource(); } -/* -----------------------------13.11.2001 12:30------------------------------ - ---------------------------------------------------------------------------*/ OEMWelcomeTabPage::~OEMWelcomeTabPage() { } -/* -----------------------------13.11.2001 12:29------------------------------ - ---------------------------------------------------------------------------*/ OEMLicenseTabPage::OEMLicenseTabPage(OEMPreloadDialog* pParent) : TabPage(pParent, ModuleRes(RID_TP_LICENSE)), aLicenseML(this, ModuleRes(ML_LICENSE)), @@ -278,15 +258,11 @@ namespace preload aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() ); aInfo2FT.SetText( aText ); } -/* -----------------------------13.11.2001 12:30------------------------------ - ---------------------------------------------------------------------------*/ OEMLicenseTabPage::~OEMLicenseTabPage() { } -/* ---------------------------14.11.2001 11:24---------------------------- - -----------------------------------------------------------------------*/ void OEMLicenseTabPage::ActivatePage() { if(!aLicenseML.GetText().Len()) diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index b84319c47ad3..2b77ee5833fa 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -74,7 +74,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")); } //--------------------------------------------------------------------- @@ -87,7 +87,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.MasterDetailLinkDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.MasterDetailLinkDialog")); return aSupported; } diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ad43e61ca7f9..2a9ea8c493e8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -413,7 +413,7 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ) + void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) { try { @@ -425,24 +425,7 @@ namespace pcr aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); - _out_rImage = _out_rHCImage = Image( xGraphic ); - - // see if we find an HC version beside the normal graphic - INetURLObject aURL( _rImageURL ); - ::rtl::OUString sBaseName( aURL.getBase() ); - aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) ); - ::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - - Reference< XGraphic > xHCGraphic; - try - { - aMediaProperties[0].Value <<= sHCImageURL; - xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties ); - } - catch( const Exception& ) { } - - if ( xHCGraphic.is() ) - _out_rHCImage = Image( xHCGraphic ); + _out_rImage = Image( xGraphic ); } catch( const Exception& ) { @@ -456,12 +439,11 @@ namespace pcr PushButton& rButton( impl_ensureButton( _bPrimary ) ); OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" ); - Image aImage, aHCImage; - impl_getImagesFromURL_nothrow( _rImageURL, aImage, aHCImage ); + Image aImage; + impl_getImagesFromURL_nothrow( _rImageURL, aImage ); - rButton.SetModeImage( aImage, BMP_COLOR_NORMAL ); - rButton.SetModeImage( aHCImage, BMP_COLOR_HIGHCONTRAST ); - } + rButton.SetModeImage( aImage ); + } //------------------------------------------------------------------ void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ) diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index fd091c712e78..37a6a1f6a389 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -79,7 +79,7 @@ namespace pcr ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); - const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() + const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& getControl() const { return m_xControl; } @@ -131,7 +131,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ); + void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 90c729b01ab7..c08fba0e5fb9 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -33,7 +33,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/window.hxx> #include <tools/resid.hxx> -// #95343# -------------------- #include <com/sun/star/awt/Size.hpp> //............................................................................ @@ -74,7 +73,6 @@ namespace pcr void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; } Link getPageActivationHandler() const { return m_aPageActivationHandler; } - // #95343# ------------------ ::com::sun::star::awt::Size getMinimumSize(); protected: diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index fbe64bf1bd30..508d13ca6552 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -97,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.OControlFontDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OControlFontDialog")); } //--------------------------------------------------------------------- @@ -110,7 +110,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.ControlFontDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog")); return aSupported; } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 3fd14196537a..1cf3c9dc86e2 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -102,14 +102,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel")); return aSupported; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index f9d9fd8f5967..179eef90a819 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -90,14 +90,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultHelpProvider"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultHelpProvider")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.DefaultHelpProvider" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.DefaultHelpProvider")); return aSupported; } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 08aaa69b37cb..92eb90251607 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -447,9 +447,9 @@ namespace pcr Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString::createFromAscii( "EventType" ); + aScriptDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString::createFromAscii( "Script" ); + aScriptDescriptor[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index c5eb86be632c..63dac91d9b7f 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -383,8 +383,8 @@ namespace pcr // StringItemList? else if( eType == TypeClass_SEQUENCE ) { - static ::rtl::OUString aDot = ::rtl::OUString::createFromAscii( "." ); - static ::rtl::OUString aEsc = ::rtl::OUString::createFromAscii( "&" ); + static ::rtl::OUString aDot(RTL_CONSTASCII_USTRINGPARAM(".")); + static ::rtl::OUString aEsc(RTL_CONSTASCII_USTRINGPARAM("&")); // Put strings into resource using new ids Sequence< ::rtl::OUString > aNewStrings; @@ -1424,7 +1424,7 @@ namespace pcr aDescriptor.HasSecondaryButton = sal_True; bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0; - aDescriptor.Category = ::rtl::OUString::createFromAscii( bIsDataProperty ? "Data" : "General" ); + aDescriptor.Category = bIsDataProperty ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General")); return aDescriptor; } @@ -2785,8 +2785,9 @@ namespace pcr aFileDlg.SetTitle(aStrTrans); // non-linked images ( e.g. those located in the document - // stream ) cannot *currently* be handled by openoffice basic dialogs. - bool bHandleNonLink = ( m_eComponentClass == eFormControl ); + // stream ) only if document is available + Reference< XModel > xModel( impl_getContextDocument_nothrow() ); + bool bHandleNonLink = xModel.is(); Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY); DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!"); diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 14a4d6465bfc..9e6667baf5ff 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -145,14 +145,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.FormController"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.FormController")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.PropertyBrowserController" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.PropertyBrowserController")); return aSupported; } @@ -273,14 +273,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.DialogController"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DialogController")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.PropertyBrowserController" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PropertyBrowserController")); return aSupported; } diff --git a/extensions/source/propctrlr/formlocalid.hrc b/extensions/source/propctrlr/formlocalid.hrc index dca59a024321..708a1dbc2211 100644 --- a/extensions/source/propctrlr/formlocalid.hrc +++ b/extensions/source/propctrlr/formlocalid.hrc @@ -33,7 +33,5 @@ #define IMG_PLUS 1 #define IMG_MINUS 2 -#define IMG_PLUS_HC 3 -#define IMG_MINUS_HC 4 #endif // _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index 0aeab5306da9..2ab294754a9d 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -308,7 +308,6 @@ // - ImageLists #define RID_IL_FORMEXPLORER ( RID_PROPCONTROLLER_START + 0 ) -#define RID_IL_FORMEXPLORER_HC ( RID_PROPCONTROLLER_START + 1 ) // ----------------------------------------------------------------------- // - untyped resources diff --git a/extensions/source/propctrlr/pcr.xml b/extensions/source/propctrlr/pcr.xml index 3507a452d056..abd86572fc6b 100644 --- a/extensions/source/propctrlr/pcr.xml +++ b/extensions/source/propctrlr/pcr.xml @@ -4,7 +4,7 @@ <module-name>pcr</module-name> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.form.ui.OTabOrderDialog</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -14,7 +14,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.form.ControlFontDialog</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -24,7 +24,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.FormComponentPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -34,7 +34,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EFormsPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -44,7 +44,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EditPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -54,7 +54,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.ObjectInspector</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -64,7 +64,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.ObjectInspectorModel</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -74,7 +74,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>org.openoffice.comp.extensions.FormController</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -84,7 +84,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.GenericPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -94,7 +94,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.EventHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -104,7 +104,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.XSDValidationPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -114,7 +114,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.CellBindingPropertyHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -124,7 +124,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.ButtonNavigationHandler</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> @@ -134,7 +134,7 @@ </component-description> <component-description> - <author>Frank Schönheit</author> + <author>Frank Schönheit</author> <name>com.sun.star.comp.extensions.DefaultFormComponentInspectorModel</name> <description></description> <loader-name>com.sun.star.loader.SharedLibrary</loader-name> diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index d547b52ed5ea..98f30c30a12d 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/extensions/source/propctrlr/pcrmiscres.src @@ -48,14 +48,6 @@ Resource RID_RSC_BUTTON_IMAGES { ImageBitmap = Bitmap{ file = "buttonminus.png"; }; }; - Image IMG_PLUS_HC - { - ImageBitmap = Bitmap{ file = "buttonplus_hc.png"; }; - }; - Image IMG_MINUS_HC - { - ImageBitmap = Bitmap{ file = "buttonminus_hc.png"; }; - }; }; #define IMAGE_IDS \ @@ -100,13 +92,6 @@ ImageList RID_IL_FORMEXPLORER IMAGE_IDS; }; -ImageList RID_IL_FORMEXPLORER_HC -{ - Prefix = "sxh"; - MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; - IMAGE_IDS; -}; - String RID_STR_PROPTITLE_PUSHBUTTON { Text [ en-US ] = "Button" ; diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index f02be18b2f3b..20470e4ef802 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -97,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii( "org.openoffice.comp.form.ui.OTabOrderDialog" ); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OTabOrderDialog")); } //--------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 50a6ed66bd65..657b1f2e9955 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -375,7 +375,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString::createFromAscii("Unable to attach to a second frame."),*this); + throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to attach to a second frame.")),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -391,7 +391,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString::createFromAscii("The frame is invalid. Unable to extract the container window."),*this); + throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The frame is invalid. Unable to extract the container window.")),*this); if ( Construct( pParentWin ) ) { @@ -597,14 +597,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.ObjectInspector"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.ObjectInspector")); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.ObjectInspector" ); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.ObjectInspector")); return aSupported; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 8279dddd4356..5dea67099f86 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -590,7 +590,7 @@ namespace pcr // everything which survived the checks above should result in a factor of 1, i.e., // it should have a direct counterpart as FieldUnit throw RuntimeException(); - getTypedControlWindow()->SetUnit( eFieldUnit ); + getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit ); } //-------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index c21539e43d13..61dc96f287d7 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -106,9 +106,7 @@ namespace pcr aPB_OK.SetClickHdl( LINK( this, TabOrderDialog, OKClickHdl ) ); aPB_OK.Disable(); - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - pImageList = new ImageList( PcrRes( bIsHighContrast ? RID_IL_FORMEXPLORER_HC : RID_IL_FORMEXPLORER ) ); - + pImageList = new ImageList( PcrRes( RID_IL_FORMEXPLORER ) ); if ( m_xModel.is() ) m_xTempModel = new OSimpleTabModel( m_xModel->getControlModels() ); @@ -302,9 +300,7 @@ namespace pcr } // TODO: UNO action (to bracket all the single actions which are being created) -// pDrawModel->BegUndo(PcrRes(RID_STR_UNDO_TABORDER)); m_xModel->setControlModels( aSortedControlModelSeq ); -// pDrawModel->EndUndo(); EndDialog( sal_True ); return 0; diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index e5a61e69e376..8ebea6dc85d3 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.cxx @@ -172,7 +172,7 @@ Reference< XInvocation > ResourceService::getDefaultInvocation() const /* f�hrt zur Zeit noch zu einer rekursion if( xSMgr.is() ) { - Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY ); + Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY ); if( xFact.is() ) { Sequence< Any > aArgs( 1 ); diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index d6df2a30644a..9c2bf4a4ac45 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -160,7 +160,6 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction, pAction ); } #endif -// if( nInfo & ( SANE_INFO_RELOAD_OPTIONS | SANE_INFO_RELOAD_PARAMS ) ) if( nInfo & SANE_INFO_RELOAD_OPTIONS ) ReloadOptions(); return nStatus; @@ -188,17 +187,17 @@ Sane::~Sane() void Sane::Init() { - ::rtl::OUString sSaneLibName( ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ) ); + ::rtl::OUString sSaneLibName( RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ) ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); if( ! pSaneLib ) { - sSaneLibName = ::rtl::OUString::createFromAscii( "libsane" SAL_DLLEXTENSION ".1" ); + sSaneLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "libsane" SAL_DLLEXTENSION ".1" )); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } // try reasonable places that might not be in the library search path if( ! pSaneLib ) { - ::rtl::OUString sSaneLibSystemPath( ::rtl::OUString::createFromAscii( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) ); + ::rtl::OUString sSaneLibSystemPath( RTL_CONSTASCII_USTRINGPARAM( "/usr/local/lib/libsane" SAL_DLLEXTENSION ) ); osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData ); pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY ); } diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 0ab5a1271b0f..d1e8ed07ad58 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -743,21 +743,23 @@ void SaneDlg::AcquirePreview() maReslBox.SetValue( (ULONG)fResl ); if( mbDragEnable ) + { maPreviewRect = Rectangle( maTopLeft, Size( maBottomRight.X() - maTopLeft.X(), maBottomRight.Y() - maTopLeft.Y() ) ); + } else { Size aBMSize( maPreviewBitmap.GetSizePixel() ); - if( aBMSize.Width() > aBMSize.Height() ) + if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() ) { int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width(); maPreviewRect = Rectangle( Point( maTopLeft.X(), ( maTopLeft.Y() + maBottomRight.Y() )/2 - nVHeight/2 ), Size( maBottomRight.X() - maTopLeft.X(), nVHeight ) ); } - else + else if (aBMSize.Height()) { int nVWidth = (maBottomRight.Y() - maTopLeft.Y()) * aBMSize.Width() / aBMSize.Height(); maPreviewRect = Rectangle( Point( ( maTopLeft.X() + maBottomRight.X() )/2 - nVWidth/2, maTopLeft.Y() ), diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 7043c3d9a971..3b26c18afe52 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -268,7 +268,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { SEQ( ScannerContext ) aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString::createFromAscii( "SANE" ); + aRet.getArray()[0].ScannerName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SANE")); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -289,7 +289,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -297,7 +297,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner is busy" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -324,14 +324,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner is busy" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -350,7 +350,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -369,7 +369,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString::createFromAscii( "Scanner does not exist" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), REF( XScannerManager )( this ), ScanError_InvalidContext ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 457be67d0f9b..f1fd8b69c8af 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -222,7 +222,7 @@ ImpTwain::ImpTwain( ScannerManager& rMgr, const Link& rNotifyLink ) : hTwainWnd = CreateWindowEx( WS_EX_TOPMOST, aWc.lpszClassName, "TWAIN", 0, 0, 0, 0, 0, HWND_DESKTOP, NULL, aWc.hInstance, 0 ); hTwainHook = SetWindowsHookEx( WH_GETMESSAGE, &TwainMsgProc, NULL, GetCurrentThreadId() ); - // #107835# block destruction until ImplDestroyHdl is called + // block destruction until ImplDestroyHdl is called mxSelfRef = static_cast< ::cppu::OWeakObject* >( this ); } @@ -347,7 +347,7 @@ bool ImpTwain::ImplEnableSource() aNotifyLink.Call( (void*) TWAIN_EVENT_SCANNING ); nCurState = 5; - // #107835# register as vetoable close listener, to prevent application to die under us + // register as vetoable close listener, to prevent application to die under us ImplRegisterCloseListener(); if( PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_ENABLEDS, &aUI ) == TWRC_SUCCESS ) @@ -358,7 +358,7 @@ bool ImpTwain::ImplEnableSource() { nCurState = 4; - // #107835# deregister as vetoable close listener, dialog failed + // deregister as vetoable close listener, dialog failed ImplDeregisterCloseListener(); } } @@ -506,7 +506,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData ) PFUNC( &aAppIdent, &aSrcIdent, DG_CONTROL, DAT_USERINTERFACE, MSG_DISABLEDS, &aUI ); nCurState = 4; - // #107835# deregister as vetoable close listener + // deregister as vetoable close listener ImplDeregisterCloseListener(); } break; @@ -559,7 +559,7 @@ IMPL_LINK( ImpTwain, ImplDestroyHdl, void*, /*p*/ ) if( hTwainHook ) UnhookWindowsHookEx( hTwainHook ); - // #107835# permit destruction of ourselves (normally, refcount + // permit destruction of ourselves (normally, refcount // should drop to zero exactly here) mxSelfRef = NULL; pImpTwainInstance = NULL; @@ -579,7 +579,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() { // query desktop instance uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY ); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); if( xDesktop.is() ) { @@ -593,7 +593,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() try { aActiveFrame = xDesktopProps->getPropertyValue( - OUString::createFromAscii( "ActiveFrame" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveFrame")) ); } catch( const beans::UnknownPropertyException& ) { @@ -787,7 +787,7 @@ bool Twain::SelectSource( ScannerManager& rMgr ) if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), @@ -809,7 +809,7 @@ bool Twain::PerformTransfer( ScannerManager& rMgr, const uno::Reference< lang::X if( !mpImpTwain ) { - // #107835# hold reference to ScannerManager, to prevent premature death + // hold reference to ScannerManager, to prevent premature death mxMgr = uno::Reference< scanner::XScannerManager >( static_cast< OWeakObject* >( const_cast< ScannerManager* >( mpCurMgr = &rMgr ) ), uno::UNO_QUERY ), diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx index 14cd09c7fa20..97e1921542c2 100644 --- a/extensions/source/svg/svgaction.cxx +++ b/extensions/source/svg/svgaction.cxx @@ -842,19 +842,19 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { String aTransform; - aTransform = NMSP_RTL::OUString::createFromAscii( "translate" ); + aTransform = NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM("translate")); aTransform += '('; aTransform += String( GetValueString( aPt.X(), mbDoublePoints ) ); aTransform += ','; aTransform += String( GetValueString( aPt.Y(), mbDoublePoints ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString::createFromAscii( " rotate" ) ); + aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" rotate")) ); aTransform += '('; aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString::createFromAscii( " translate" ) ); + aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" translate")) ); aTransform += '('; aTransform += String( GetValueString( -aPt.X(), mbDoublePoints ) ); aTransform += ','; diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx index 30d5eded34ac..5344d516e87e 100644 --- a/extensions/source/svg/svgwriter.cxx +++ b/extensions/source/svg/svgwriter.cxx @@ -54,7 +54,6 @@ protected: public: - // #110680# SVGMtfExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const REF( NMSP_SAX::XDocumentHandler )& rxHandler ); @@ -66,7 +65,6 @@ public: // ----------------------------------------------------------------------------- -// #110680# SVGMtfExport::SVGMtfExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const REF( NMSP_SAX::XDocumentHandler )& rxHandler ) @@ -167,8 +165,6 @@ void SAL_CALL SVGWriter::write( const REF( NMSP_SAX::XDocumentHandler )& rxDocHa const REF( NMSP_SAX::XDocumentHandler ) xDocumentHandler( rxDocHandler ); - // #110680# - // SVGMtfExport* pWriter = new SVGMtfExport( xDocumentHandler ); SVGMtfExport* pWriter = new SVGMtfExport( mxFact, xDocumentHandler ); pWriter->writeMtf( aMtf ); diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index 881fe2572d67..f897eb668b3e 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -211,7 +211,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory() // This should become a desktop specific setting in some system backend .. rtl::OUString aHomeDir; osl::Security().getHomeDir( aHomeDir ); - aRet = aHomeDir + rtl::OUString::createFromAscii("/Desktop"); + aRet = aHomeDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Desktop")); // Set path to home directory when there is no /Desktop directory osl::Directory aDocumentsDir( aRet ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 550705ee4a67..1ef024d7e3dd 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -311,17 +311,10 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) if ( pMBarWin ) nMBarHeight = pMBarWin->GetOutputSizePixel().getHeight(); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26_HC; - else - nResID = RID_UPDATE_AVAILABLE_16_HC; - } else { - if ( nMBarHeight >= 35 ) - nResID = RID_UPDATE_AVAILABLE_26; - else - nResID = RID_UPDATE_AVAILABLE_16; - } + if ( nMBarHeight >= 35 ) + nResID = RID_UPDATE_AVAILABLE_26; + else + nResID = RID_UPDATE_AVAILABLE_16; return Image( ResId( nResID, *mpUpdResMgr ) ); } @@ -344,12 +337,12 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider( xServiceManager->createInstance( - ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), uno::UNO_QUERY ); if ( xGraphProvider.is() ) { uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); diff --git a/extensions/source/update/ui/updatecheckui.hrc b/extensions/source/update/ui/updatecheckui.hrc index 3d92e4579f58..636cff231ada 100644 --- a/extensions/source/update/ui/updatecheckui.hrc +++ b/extensions/source/update/ui/updatecheckui.hrc @@ -31,6 +31,4 @@ #define RID_UPDATE_AVAILABLE_16 RID_UPDATECHECKUI_START + 1 #define RID_UPDATE_AVAILABLE_26 RID_UPDATECHECKUI_START + 2 - #define RID_UPDATE_AVAILABLE_16_HC RID_UPDATECHECKUI_START + 3 - #define RID_UPDATE_AVAILABLE_26_HC RID_UPDATECHECKUI_START + 4 diff --git a/extensions/source/update/ui/updatecheckui.src b/extensions/source/update/ui/updatecheckui.src index 39b6f44dce4d..084b2f82149d 100644 --- a/extensions/source/update/ui/updatecheckui.src +++ b/extensions/source/update/ui/updatecheckui.src @@ -39,13 +39,3 @@ ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; }; STD_MASK_COLOR }; - Image RID_UPDATE_AVAILABLE_16_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; }; - STD_MASK_COLOR - }; - Image RID_UPDATE_AVAILABLE_26_HC - { - ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; }; - STD_MASK_COLOR - }; |