diff options
Diffstat (limited to 'ucbhelper/source')
26 files changed, 195 insertions, 170 deletions
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx index 029fb60e616f..5cdfa4f3df59 100644 --- a/ucbhelper/source/client/activedatasink.cxx +++ b/ucbhelper/source/client/activedatasink.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index 5f26334ab376..aa90802a16e7 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream() } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx index 75a137faeb5b..7824e2b378fb 100644 --- a/ucbhelper/source/client/commandenvironment.cxx +++ b/ucbhelper/source/client/commandenvironment.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using namespace rtl; namespace ucbhelper { @@ -137,3 +137,4 @@ CommandEnvironment::getProgressHandler() } /* namespace ucbhelper */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 4debb1728bfe..7f73b6492d55 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -226,9 +227,9 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker, if ( !xMgr.is() ) { throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProviderManager!" ), + "XContentProviderManager!" )), Reference< XInterface >() ); } else @@ -238,8 +239,8 @@ static void ensureContentProviderForURL( const ContentBroker & rBroker, if ( !xProv.is() ) { throw ContentCreationException( - rtl::OUString::createFromAscii( - "No Content Provider available for given URL!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "No Content Provider available for given URL!" )), Reference< XInterface >(), ContentCreationError_NO_CONTENT_PROVIDER ); } @@ -256,7 +257,7 @@ static ContentBroker* getContentBroker( bool bThrow ) { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( "No Content Broker!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Content Broker!")), Reference< XInterface >() ); } else @@ -268,9 +269,9 @@ static ContentBroker* getContentBroker( bool bThrow ) { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProviderManager!" ), + "XContentProviderManager!" )), Reference< XInterface >() ); } else @@ -306,8 +307,8 @@ static Reference< XContentIdentifier > getContentIdentifier( ensureContentProviderForURL( rBroker, rURL ); throw ContentCreationException( - rtl::OUString::createFromAscii( - "Unable to create Content Identifier!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to create Content Identifier!" )), Reference< XInterface >(), ContentCreationError_IDENTIFIER_CREATION_FAILED ); } @@ -316,9 +317,9 @@ static Reference< XContentIdentifier > getContentIdentifier( { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentIdentifierFactory!" ), + "XContentIdentifierFactory!" )), Reference< XInterface >() ); } @@ -356,8 +357,8 @@ static Reference< XContent > getContent( ensureContentProviderForURL( rBroker, xId->getContentIdentifier() ); throw ContentCreationException( - rtl::OUString::createFromAscii( - "Unable to create Content! " ) + msg, + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to create Content! " )) + msg, Reference< XInterface >(), ContentCreationError_CONTENT_CREATION_FAILED ); } @@ -366,9 +367,9 @@ static Reference< XContent > getContent( { if ( bThrow ) throw RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UCB does not implement mandatory interface " - "XContentProvider!" ), + "XContentProvider!" )), Reference< XInterface >() ); } @@ -534,7 +535,7 @@ Reference< XCommandInfo > Content::getCommands() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getCommandInfo" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo")); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -550,7 +551,7 @@ Reference< XPropertySetInfo > Content::getProperties() throw( CommandAbortedException, RuntimeException, Exception ) { Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertySetInfo" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo")); aCommand.Handle = -1; // n/a aCommand.Argument = Any(); @@ -677,7 +678,7 @@ Reference< XRow > Content::getPropertyValuesInterface( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -710,7 +711,7 @@ Reference< XRow > Content::getPropertyValuesInterface( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "getPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -731,9 +732,9 @@ Sequence< Any > Content::setPropertyValues( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Length of property names sequence and value " - "sequence are unequal!" ), + "sequence are unequal!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -758,7 +759,7 @@ Sequence< Any > Content::setPropertyValues( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "setPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -779,9 +780,9 @@ Sequence< Any > Content::setPropertyValues( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Length of property handles sequence and value " - "sequence are unequal!" ), + "sequence are unequal!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -806,7 +807,7 @@ Sequence< Any > Content::setPropertyValues( } Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "setPropertyValues" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aProps; @@ -875,7 +876,7 @@ Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames, aArg.Properties = aProps; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -908,7 +909,7 @@ Any Content::createCursorAny( const Sequence< sal_Int32 >& rPropertyHandles, aArg.Properties = aProps; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1021,7 +1022,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor, @@ -1056,7 +1057,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor, @@ -1096,7 +1097,7 @@ Reference< XResultSet > Content::createSortedCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet, @@ -1150,7 +1151,7 @@ Reference< XResultSet > Content::createSortedCursor( if( aServiceManager.is() ) { Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.ucb.SortedDynamicResultSetFactory" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))), UNO_QUERY ); aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet, @@ -1197,7 +1198,7 @@ Reference< XInputStream > Content::openStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1222,7 +1223,7 @@ Reference< XInputStream > Content::openStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1247,7 +1248,7 @@ Reference< XStream > Content::openWriteableStream() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1272,7 +1273,7 @@ Reference< XStream > Content::openWriteableStreamNoLock() aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1295,7 +1296,7 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1318,7 +1319,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream ) aArg.Properties = Sequence< Property >( 0 ); // unused Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "open" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1337,7 +1338,7 @@ void Content::writeStream( const Reference< XInputStream >& rStream, aArg.ReplaceExisting = bReplaceExisting; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "insert" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aArg; @@ -1353,7 +1354,7 @@ Sequence< ContentInfo > Content::queryCreatableContentsInfo() // First, try it using "CreatableContentsInfo" property -> the "new" way. Sequence< ContentInfo > aInfo; if ( getPropertyValue( - rtl::OUString::createFromAscii( "CreatableContentsInfo" ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo")) ) >>= aInfo ) return aInfo; @@ -1414,7 +1415,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, aInfo.Attributes = 0; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "createNewContent" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aInfo; @@ -1448,7 +1449,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, Content aNewContent( xNew, m_xImpl->getEnvironment() ); aNewContent.setPropertyValues( rPropertyNames, rPropertyValues ); - aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), + aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), makeAny( InsertCommandArgument( rData.is() ? rData : new EmptyInputStream, @@ -1477,7 +1478,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, aInfo.Attributes = 0; Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "createNewContent" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aInfo; @@ -1511,7 +1512,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType, Content aNewContent( xNew, m_xImpl->getEnvironment() ); aNewContent.setPropertyValues( nPropertyHandles, rPropertyValues ); - aNewContent.executeCommand( rtl::OUString::createFromAscii( "insert" ), + aNewContent.executeCommand( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert")), makeAny( InsertCommandArgument( rData.is() ? rData : new EmptyInputStream, @@ -1532,8 +1533,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, ContentBroker* pBroker = ContentBroker::get(); if ( !pBroker ) { - OSL_ENSURE( sal_False, - "Content::transferContent - No Content Broker!" ); + OSL_FAIL( "Content::transferContent - No Content Broker!" ); return sal_False; } @@ -1541,8 +1541,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, pBroker->getCommandProcessorInterface() ); if ( !xCmdProc.is() ) { - OSL_ENSURE( sal_False, - "Content::transferContent - No XCommandProcessor!" ); + OSL_FAIL( "Content::transferContent - No XCommandProcessor!" ); return sal_False; } @@ -1566,8 +1565,8 @@ sal_Bool Content::transferContent( const Content& rSourceContent, default: ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString::createFromAscii( - "Unknown transfer operation!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unknown transfer operation!" )), get(), -1 ) ), m_xImpl->getEnvironment() ); @@ -1581,7 +1580,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, rTitle, nNameClashAction ); Command aCommand; - aCommand.Name = rtl::OUString::createFromAscii( "globalTransfer" ); + aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("globalTransfer")); aCommand.Handle = -1; // n/a aCommand.Argument <<= aTransferArg; @@ -1594,14 +1593,14 @@ sal_Bool Content::isFolder() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bFolder = sal_False; - if ( getPropertyValue( rtl::OUString::createFromAscii( "IsFolder" ) ) + if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder ) return bFolder; ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString::createFromAscii( - "Unable to retreive value of property 'IsFolder'!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to retreive value of property 'IsFolder'!" )), get() ) ), m_xImpl->getEnvironment() ); @@ -1615,14 +1614,14 @@ sal_Bool Content::isDocument() throw( CommandAbortedException, RuntimeException, Exception ) { sal_Bool bDoc = sal_False; - if ( getPropertyValue( rtl::OUString::createFromAscii( "IsDocument" ) ) + if ( getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")) ) >>= bDoc ) return bDoc; ucbhelper::cancelCommandExecution( makeAny( UnknownPropertyException( - rtl::OUString::createFromAscii( - "Unable to retreive value of property 'IsDocument'!" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Unable to retreive value of property 'IsDocument'!" )), get() ) ), m_xImpl->getEnvironment() ); @@ -1970,3 +1969,4 @@ void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source ) } /* namespace ucbhelper */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx index 408ff6af0dee..8eb455ca0aeb 100644 --- a/ucbhelper/source/client/contentbroker.cxx +++ b/ucbhelper/source/client/contentbroker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using namespace rtl; + +using ::rtl::OUString; namespace { @@ -284,8 +286,8 @@ bool ContentBroker_Impl::initialize() try { xIfc = m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.ucb.UniversalContentBroker" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )) ); } catch ( Exception const & ) { @@ -318,8 +320,8 @@ bool ContentBroker_Impl::initialize() try { xIfc = m_xSMgr->createInstanceWithArguments( - OUString::createFromAscii( - "com.sun.star.ucb.UniversalContentBroker" ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.UniversalContentBroker" )), m_aArguments ); } catch ( Exception const & ) @@ -378,3 +380,4 @@ bool ContentBroker_Impl::initialize() } /* namespace ucbhelper */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx index 64bc428a9934..514772363ca9 100644 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ b/ucbhelper/source/client/fileidentifierconverter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ getSystemPathFromFileURL( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index a23206f615f3..0d774b29c793 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,7 +130,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref // Runtime error! The defined continuation could not be located // inside the set of available containuations of the incoming request. // Whats wrong - the interception list or the request? - OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!"); + OSL_FAIL("InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!"); } break; @@ -199,3 +200,5 @@ InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_intercep } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index d6fc260f558b..4f99baacbb2d 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,7 +115,7 @@ public: rValue = (*it).second; return true; } - it++; + ++it; } return false; } @@ -259,8 +260,7 @@ bool getConfigStringValue( if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) ) >>= value ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " + OSL_FAIL( "InternetProxyDecider - " "Error getting config item value!" ); return false; } @@ -288,8 +288,7 @@ bool getConfigInt32Value( rtl::OUString::createFromAscii( key ) ); if ( aValue.hasValue() && !( aValue >>= value ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " + OSL_FAIL( "InternetProxyDecider - " "Error getting config item value!" ); return false; } @@ -326,17 +325,17 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( uno::Reference< lang::XMultiServiceFactory > xConfigProv( rxSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationProvider" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationProvider" )) ), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArguments( 1 ); - aArguments[ 0 ] <<= rtl::OUString::createFromAscii( CONFIG_ROOT_KEY ); + aArguments[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CONFIG_ROOT_KEY )); uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationAccess" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.configuration.ConfigurationAccess" )), aArguments ) ); OSL_ENSURE( xInterface.is(), @@ -405,7 +404,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( catch ( uno::Exception const & ) { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, "InternetProxyDecider - Exception!" ); + OSL_FAIL( "InternetProxyDecider - Exception!" ); } } @@ -478,7 +477,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const rtl::OUString & rHost, if ( (*it).first.Matches( aHostAndPort ) ) return false; } - it++; + ++it; } return true; @@ -602,8 +601,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_nProxyType ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -613,8 +611,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( rtl::OUString aNoProxyList; if ( !( rElem.Element >>= aNoProxyList ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -625,8 +622,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -635,8 +631,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -648,8 +643,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpsProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -658,8 +652,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpsProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -671,8 +664,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aFtpProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -681,8 +673,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aFtpProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -746,14 +737,14 @@ void InternetProxyDecider_Impl::setNoProxyList( if ( nColonPos == -1 ) { // No port given, server pattern equals current token - aPort = rtl::OUString::createFromAscii( "*" ); + aPort = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")); if ( aToken.indexOf( '*' ) == -1 ) { // pattern describes exactly one server aServer = aToken; } - aToken += rtl::OUString::createFromAscii( ":*" ); + aToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":*")); } else { @@ -864,3 +855,5 @@ const InternetProxyServer & InternetProxyDecider::getProxy( } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 8be75ee8aabd..457c1b4e81e7 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX #include <ucbhelper/interactionrequest.hxx> -#endif #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/simpleioerrorrequest.hxx> @@ -85,7 +84,7 @@ void cancelCommandExecution( const uno::Any & rException, cppu::throwException( rException ); - OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" ); + OSL_FAIL( "Return from cppu::throwException call!!!" ); throw uno::RuntimeException(); } @@ -123,8 +122,10 @@ void cancelCommandExecution( const ucb::IOErrorCode eError, cppu::throwException( xRequest->getRequest() ); - OSL_ENSURE( sal_False, "Return from cppu::throwException call!!!" ); + OSL_FAIL( "Return from cppu::throwException call!!!" ); throw uno::RuntimeException(); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx index 33b8dd3fdfca..7e3f10047812 100644 --- a/ucbhelper/source/provider/commandenvironmentproxy.cxx +++ b/ucbhelper/source/provider/commandenvironmentproxy.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,7 +46,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::task; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using namespace rtl; namespace ucbhelper { @@ -165,3 +165,4 @@ CommandEnvironmentProxy::getProgressHandler() } /* namespace ucbhelper */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 17b494e00437..6a5073750b9a 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,7 @@ *************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/ucb/ContentAction.hpp> #include <com/sun/star/ucb/CommandInfoChange.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> @@ -101,7 +102,7 @@ struct hashPtr } }; -typedef std::hash_map +typedef boost::unordered_map < XPropertiesChangeListenerPtr, PropertyEventSequence*, @@ -596,20 +597,17 @@ void SAL_CALL ContentImplHelper::addProperty( } catch ( beans::PropertyExistException const & ) { - OSL_ENSURE( sal_False, - "ContentImplHelper::addProperty - Exists!" ); + OSL_FAIL( "ContentImplHelper::addProperty - Exists!" ); throw; } catch ( beans::IllegalTypeException const & ) { - OSL_ENSURE( sal_False, - "ContentImplHelper::addProperty - Wrong Type!" ); + OSL_FAIL( "ContentImplHelper::addProperty - Wrong Type!" ); throw; } catch ( lang::IllegalArgumentException const & ) { - OSL_ENSURE( sal_False, - "ContentImplHelper::addProperty - Illegal Arg!" ); + OSL_FAIL( "ContentImplHelper::addProperty - Illegal Arg!" ); throw; } @@ -663,7 +661,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, "ContentImplHelper::removeProperty - Unknown!" ); + OSL_FAIL( "ContentImplHelper::removeProperty - Unknown!" ); throw; } @@ -691,14 +689,12 @@ void SAL_CALL ContentImplHelper::removeProperty( const rtl::OUString& Name ) } catch ( beans::UnknownPropertyException const & ) { - OSL_ENSURE( sal_False, - "ContentImplHelper::removeProperty - Unknown!" ); + OSL_FAIL( "ContentImplHelper::removeProperty - Unknown!" ); throw; } catch ( beans::NotRemoveableException const & ) { - OSL_ENSURE( - sal_False, + OSL_FAIL( "ContentImplHelper::removeProperty - Unremoveable!" ); throw; } @@ -1125,3 +1121,5 @@ ContentImplHelper::getPropertySetInfo( } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 7324c2cd5835..71db204a30b8 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,11 +39,12 @@ #include <cppuhelper/typeprovider.hxx> #include <osl/mutex.hxx> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; +using ::rtl::OUString; + namespace ucbhelper { @@ -219,3 +221,4 @@ OUString SAL_CALL ContentIdentifier::getContentProviderScheme() } /* namespace ucbhelper */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 72dc633bd274..d7d982364b14 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -421,3 +422,5 @@ sal_Bool CommandProcessorInfo::queryCommand( } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx index 395a81c36fed..84a010fde6d9 100644 --- a/ucbhelper/source/provider/handleinteractionrequest.cxx +++ b/ucbhelper/source/provider/handleinteractionrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,9 +39,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "osl/diagnose.h" #include "rtl/ustring.hxx" -#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX #include "ucbhelper/interactionrequest.hxx" -#endif #include "ucbhelper/simpleauthenticationrequest.hxx" #include "ucbhelper/simpleinteractionrequest.hxx" #include "ucbhelper/simplecertificatevalidationrequest.hxx" @@ -162,3 +161,4 @@ handleInteractionRequest( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 3704a0f1546c..18cd2435c7f2 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1149,3 +1150,4 @@ void SAL_CALL InteractionReplaceExistingData::select() recordSelection(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 1c857ca467f0..c6ab550237c1 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,7 +56,7 @@ using namespace com::sun::star::script; using namespace com::sun::star::sdbc; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using namespace rtl; +using ::rtl::OUString; namespace ucbhelper_impl { @@ -163,7 +164,7 @@ class PropertyValues : public PropertyValuesVector {}; if ( ( columnIndex < 1 ) \ || ( columnIndex > sal_Int32( m_pValues->size() ) ) ) \ { \ - OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" ); \ + OSL_FAIL( "PropertyValueSet - index out of range!" ); \ } \ else \ { \ @@ -479,7 +480,7 @@ Any SAL_CALL PropertyValueSet::getObject( if ( ( columnIndex < 1 ) || ( columnIndex > sal_Int32( m_pValues->size() ) ) ) { - OSL_ENSURE( sal_False, "PropertyValueSet - index out of range!" ); + OSL_FAIL( "PropertyValueSet - index out of range!" ); } else { @@ -576,8 +577,7 @@ Any SAL_CALL PropertyValueSet::getObject( case OBJECT_VALUE_SET: // Fall-through is intended! default: - OSL_ENSURE( sal_False, - "PropertyValueSet::getObject - " + OSL_FAIL( "PropertyValueSet::getObject - " "Wrong original type" ); break; } @@ -665,8 +665,8 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter() m_bTriedToGetTypeConverter = sal_True; m_xTypeConverter = Reference< XTypeConverter >( m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.script.Converter" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.script.Converter" )) ), UNO_QUERY ); OSL_ENSURE( m_xTypeConverter.is(), @@ -922,3 +922,5 @@ sal_Bool PropertyValueSet::appendPropertySetValue( } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index ac35df0e3420..d418005eb439 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,7 @@ *************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -76,7 +77,7 @@ struct hashString } }; -typedef std::hash_map +typedef boost::unordered_map < rtl::OUString, uno::WeakReference< ucb::XContent >, @@ -325,8 +326,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry() uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory > xRegFac( m_xSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.Store" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.Store" )) ), uno::UNO_QUERY ); OSL_ENSURE( xRegFac.is(), @@ -670,3 +671,5 @@ sal_Bool ContentProviderImplHelper::removeAdditionalPropertySet( } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index e6ccaf4743a8..2f45d1507ef4 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,5 @@ registerAtUcb( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 47825f15c6b1..b39d6aa886a6 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -308,8 +309,8 @@ XTYPEPROVIDER_IMPL_9( ResultSet, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, - rtl::OUString::createFromAscii( "ResultSet" ), - rtl::OUString::createFromAscii( RESULTSET_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResultSet")), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( RESULTSET_SERVICE_NAME )) ); //========================================================================= // @@ -1357,13 +1358,13 @@ void SAL_CALL ResultSet::setPropertyValue( const rtl::OUString& aPropertyName, throw beans::UnknownPropertyException(); if ( aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) ) { // property is read-only. throw lang::IllegalArgumentException(); } else if ( aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) { // property is read-only. throw lang::IllegalArgumentException(); @@ -1388,12 +1389,12 @@ uno::Any SAL_CALL ResultSet::getPropertyValue( uno::Any aValue; if ( PropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) ) { aValue <<= m_pImpl->m_xDataSupplier->currentCount(); } else if ( PropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) { aValue <<= m_pImpl->m_xDataSupplier->isCountFinal(); } @@ -1420,9 +1421,9 @@ void SAL_CALL ResultSet::addPropertyChangeListener( if ( aPropertyName.getLength() && !aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) && + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) && !aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) throw beans::UnknownPropertyException(); if ( !m_pImpl->m_pPropertyChangeListeners ) @@ -1446,9 +1447,9 @@ void SAL_CALL ResultSet::removePropertyChangeListener( if ( aPropertyName.getLength() && !aPropertyName.equals( - rtl::OUString::createFromAscii( "RowCount" ) ) && + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) ) && !aPropertyName.equals( - rtl::OUString::createFromAscii( "IsRowCountFinal" ) ) ) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ) ) throw beans::UnknownPropertyException(); if ( m_pImpl->m_pPropertyChangeListeners ) @@ -1535,7 +1536,7 @@ void ResultSet::rowCountChanged( sal_uInt32 nOld, sal_uInt32 nNew ) propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString::createFromAscii( "RowCount" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")), sal_False, 1001, uno::makeAny( nOld ), // old value @@ -1551,7 +1552,7 @@ void ResultSet::rowCountFinal() propertyChanged( beans::PropertyChangeEvent( static_cast< cppu::OWeakObject * >( this ), - rtl::OUString::createFromAscii( "IsRowCountFinal" ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")), sal_False, 1000, uno:: makeAny( sal_False ), // old value @@ -1693,3 +1694,5 @@ sal_Bool PropertySetInfo::queryProperty( } } // namespace ucbhelper_impl + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index a10f527b2ba9..ac6798e7450e 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,10 +117,10 @@ XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, //========================================================================= XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, - rtl::OUString::createFromAscii( - "ResultSetImplHelper" ), - rtl::OUString::createFromAscii( - DYNAMICRESULTSET_SERVICE_NAME ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "ResultSetImplHelper" )), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + DYNAMICRESULTSET_SERVICE_NAME )) ); //========================================================================= // @@ -272,8 +273,8 @@ void SAL_CALL ResultSetImplHelper::connectToCache( = uno::Reference< com::sun::star::ucb::XCachedDynamicResultSetStubFactory >( m_xSMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ), uno::UNO_QUERY ); } catch ( uno::Exception const & ) @@ -327,3 +328,5 @@ void ResultSetImplHelper::init( sal_Bool bStatic ) } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index 30ba735943bc..80b3bc12c51b 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,7 +56,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; using namespace com::sun::star::uno; using namespace com::sun::star::util; -using namespace rtl; + +using ::rtl::OUString; namespace ucbhelper_impl { @@ -411,32 +413,12 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) { Reference< XPropertySetInfo > xInfo( m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.ucb.PropertiesManager" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.ucb.PropertiesManager" )) ), UNO_QUERY ); if ( xInfo.is() ) { -#if 0 - // Convenient... - - sal_Int32 nCount = m_pImpl->m_aProps.getLength(); - Property* pProps = m_pImpl->m_aProps.getArray(); - for ( sal_Int32 n = 0; n < nCount; ++n ) - { - Property& rProp = pProps[ n ]; - try - { - Property aProp - = xInfo->getPropertyByName( rProp.Name ); - rProp.Type = aProp.Type; - } - catch ( UnknownPropertyException& ) - { - // getPropertyByName - } - } -#else // Less (remote) calls... Sequence< Property > aProps = xInfo->getProperties(); @@ -460,7 +442,6 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column ) } } } -#endif } } catch ( RuntimeException& ) @@ -600,3 +581,5 @@ OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column ) } } // namespace ucbhelper + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx index 8fc94cf88438..c4ac91cb5789 100644 --- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx +++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -241,3 +242,5 @@ void SimpleAuthenticationRequest::initialize( setContinuations( aContinuations ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx index 8a34dc3c4e13..16946664e518 100755..100644 --- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx +++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,7 +83,9 @@ sal_Int32 SimpleCertificateValidationRequest::getResponse() const if ( xDisapprove.is() ) return 8; - OSL_ENSURE( sal_False, "CertificateValidationRequest - Unknown continuation!" ); + OSL_FAIL( "CertificateValidationRequest - Unknown continuation!" ); } return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx index 6f5fb5d4e820..69e833434b54 100644 --- a/ucbhelper/source/provider/simpleinteractionrequest.cxx +++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,9 +125,9 @@ sal_Int32 SimpleInteractionRequest::getResponse() const if ( xDisapprove.is() ) return CONTINUATION_DISAPPROVE; - OSL_ENSURE( sal_False, - "SimpleInteractionRequest::getResponse - Unknown continuation!" ); + OSL_FAIL( "SimpleInteractionRequest::getResponse - Unknown continuation!" ); } return CONTINUATION_UNKNOWN; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx index da6eea06cda0..4cf82b342365 100644 --- a/ucbhelper/source/provider/simpleioerrorrequest.cxx +++ b/ucbhelper/source/provider/simpleioerrorrequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ SimpleIOErrorRequest::SimpleIOErrorRequest( setContinuations( aContinuations ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx index 3c3c69d93b3e..36fa09516fbf 100644 --- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx +++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ SimpleNameClashResolveRequest::SimpleNameClashResolveRequest( setContinuations( aContinuations ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |