mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More RTL_CONSTASCII_USTRINGPARAM removals

Browse Source 
module sd/../ui
This commit is contained in:
Olivier Hallot
2012-04-12 09:23:33 -03:00
parent 43aabb908e
commit 139b5e7672
7 changed files with 34 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx vendored
View File

@@ -144,8 +144,7 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize)
mnMaximalNormalCacheSize = nMaximalNormalCacheSize; mnMaximalNormalCacheSize = nMaximalNormalCacheSize;
else else
{ {
Any aCacheSize (CacheConfiguration::Instance()->GetValue( Any aCacheSize (CacheConfiguration::Instance()->GetValue("CacheSize"));
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CacheSize"))));
if (aCacheSize.has<sal_Int32>()) if (aCacheSize.has<sal_Int32>())
aCacheSize >>= mnMaximalNormalCacheSize; aCacheSize >>= mnMaximalNormalCacheSize;
} }

16
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx vendored
View File

@@ -96,16 +96,15 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
BitmapCache& rCache, BitmapCache& rCache,
sal_Int32 nMaximalCacheSize) sal_Int32 nMaximalCacheSize)
{ {
static const ::rtl::OUString sNone (RTL_CONSTASCII_USTRINGPARAM("None")); static const ::rtl::OUString sNone ("None");
static const ::rtl::OUString sCompress (RTL_CONSTASCII_USTRINGPARAM("Compress")); static const ::rtl::OUString sCompress ("Compress");
static const ::rtl::OUString sErase (RTL_CONSTASCII_USTRINGPARAM("Erase")); static const ::rtl::OUString sErase ("Erase");
static const ::rtl::OUString sResolution (RTL_CONSTASCII_USTRINGPARAM("ResolutionReduction")); static const ::rtl::OUString sResolution ("ResolutionReduction");
static const ::rtl::OUString sPNGCompression (RTL_CONSTASCII_USTRINGPARAM("PNGCompression")); static const ::rtl::OUString sPNGCompression ("PNGCompression");
::boost::shared_ptr<BitmapCompressor> pCompressor; ::boost::shared_ptr<BitmapCompressor> pCompressor;
::rtl::OUString sCompressionPolicy(sPNGCompression); ::rtl::OUString sCompressionPolicy(sPNGCompression);
Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue( Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue("CompressionPolicy"));
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CompressionPolicy"))));
if (aCompressionPolicy.has<rtl::OUString>()) if (aCompressionPolicy.has<rtl::OUString>())
aCompressionPolicy >>= sCompressionPolicy; aCompressionPolicy >>= sCompressionPolicy;
if (sCompressionPolicy == sNone) if (sCompressionPolicy == sNone)
@@ -119,8 +118,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<CacheCompactor> pCompactor (NULL); ::std::auto_ptr<CacheCompactor> pCompactor (NULL);
::rtl::OUString sCompactionPolicy(sCompress); ::rtl::OUString sCompactionPolicy(sCompress);
Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue( Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue("CompactionPolicy"));
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CompactionPolicy"))));
if (aCompactionPolicy.has<rtl::OUString>()) if (aCompactionPolicy.has<rtl::OUString>())
aCompactionPolicy >>= sCompactionPolicy; aCompactionPolicy >>= sCompactionPolicy;
if (sCompactionPolicy == sNone) if (sCompactionPolicy == sNone)

24
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx vendored
View File

@@ -82,14 +82,9 @@ Timer CacheConfiguration::maReleaseTimer;
CacheConfiguration::CacheConfiguration (void) CacheConfiguration::CacheConfiguration (void)
{ {
// Get the cache size from configuration. // Get the cache size from configuration.
const ::rtl::OUString sConfigurationProviderServiceName( const ::rtl::OUString sConfigurationProviderServiceName("com.sun.star.configuration.ConfigurationProvider");
RTL_CONSTASCII_USTRINGPARAM( const ::rtl::OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/");
"com.sun.star.configuration.ConfigurationProvider")); const ::rtl::OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache");
const ::rtl::OUString sPathToImpressConfigurationRoot(
RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/"));
const ::rtl::OUString sPathToNode(
RTL_CONSTASCII_USTRINGPARAM(
"MultiPaneGUI/SlideSorter/PreviewCache"));
try try
{ {
@@ -104,25 +99,24 @@ CacheConfiguration::CacheConfiguration (void)
// Obtain access to Impress configuration. // Obtain access to Impress configuration.
Sequence<Any> aCreationArguments(3); Sequence<Any> aCreationArguments(3);
aCreationArguments[0] = makeAny(beans::PropertyValue( aCreationArguments[0] = makeAny(beans::PropertyValue(
::rtl::OUString( "nodepath",
RTL_CONSTASCII_USTRINGPARAM("nodepath")),
0, 0,
makeAny(sPathToImpressConfigurationRoot), makeAny(sPathToImpressConfigurationRoot),
beans::PropertyState_DIRECT_VALUE)); beans::PropertyState_DIRECT_VALUE));
aCreationArguments[1] = makeAny(beans::PropertyValue( aCreationArguments[1] = makeAny(beans::PropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), "depth",
0, 0,
makeAny((sal_Int32)-1), makeAny((sal_Int32)-1),
beans::PropertyState_DIRECT_VALUE)); beans::PropertyState_DIRECT_VALUE));
aCreationArguments[2] = makeAny(beans::PropertyValue( aCreationArguments[2] = makeAny(beans::PropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), "lazywrite",
0, 0,
makeAny(true), makeAny(true),
beans::PropertyState_DIRECT_VALUE)); beans::PropertyState_DIRECT_VALUE));
::rtl::OUString sAccessService (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration.ConfigurationAccess")));
Reference<XInterface> xRoot (xProvider->createInstanceWithArguments( Reference<XInterface> xRoot (xProvider->createInstanceWithArguments(
sAccessService, aCreationArguments)); "com.sun.star.configuration.ConfigurationAccess",
aCreationArguments));
if ( ! xRoot.is()) if ( ! xRoot.is())
return; return;
Reference<container::XHierarchicalNameAccess> xHierarchy (xRoot, UNO_QUERY); Reference<container::XHierarchicalNameAccess> xHierarchy (xRoot, UNO_QUERY);

9
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx vendored
View File

@@ -57,18 +57,15 @@ QueueProcessor::QueueProcessor (
{ {
// Look into the configuration if there for overriding values. // Look into the configuration if there for overriding values.
::com::sun::star::uno::Any aTimeBetweenReqeusts; ::com::sun::star::uno::Any aTimeBetweenReqeusts;
aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenHighPriorityRequests");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenHighPriorityRequests")));
if (aTimeBetweenReqeusts.has<sal_Int32>()) if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests; aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests;
aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenLowPriorityRequests");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenLowPriorityRequests")));
if (aTimeBetweenReqeusts.has<sal_Int32>()) if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenLowPriorityRequests; aTimeBetweenReqeusts >>= mnTimeBetweenLowPriorityRequests;
aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue( aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenRequestsDuringShow");
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenRequestsDuringShow")));
if (aTimeBetweenReqeusts.has<sal_Int32>()) if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle; aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle;

8
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx vendored
View File

@@ -202,9 +202,7 @@ CacheKey RequestQueue::GetFront (void)
::osl::MutexGuard aGuard (maMutex); ::osl::MutexGuard aGuard (maMutex);
if (mpRequestQueue->empty()) if (mpRequestQueue->empty())
throw ::com::sun::star::uno::RuntimeException( throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFront(): queue is empty",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"RequestQueue::GetFront(): queue is empty")),
NULL); NULL);
return mpRequestQueue->begin()->maKey; return mpRequestQueue->begin()->maKey;
@@ -218,9 +216,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void)
::osl::MutexGuard aGuard (maMutex); ::osl::MutexGuard aGuard (maMutex);
if (mpRequestQueue->empty()) if (mpRequestQueue->empty())
throw ::com::sun::star::uno::RuntimeException( throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty",
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"RequestQueue::GetFrontPriorityClass(): queue is empty")),
NULL); NULL);
return mpRequestQueue->begin()->meClass; return mpRequestQueue->begin()->meClass;

21
sd/source/ui/table/TableDesignPane.cxx
View File

@@ -62,7 +62,6 @@
#include "sdresid.hxx" #include "sdresid.hxx"
#include "EventMultiplexer.hxx" #include "EventMultiplexer.hxx"
#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
using ::rtl::OUString; using ::rtl::OUString;
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
@@ -87,12 +86,12 @@ static const OUString* getPropertyNames()
static const OUString gPropNames[ CB_BANDED_COLUMNS-CB_HEADER_ROW+1 ] = static const OUString gPropNames[ CB_BANDED_COLUMNS-CB_HEADER_ROW+1 ] =
{ {
C2U( "UseFirstRowStyle" ), "UseFirstRowStyle" ,
C2U( "UseLastRowStyle" ), "UseLastRowStyle" ,
C2U( "UseBandingRowStyle" ), "UseBandingRowStyle" ,
C2U( "UseFirstColumnStyle" ), "UseFirstColumnStyle" ,
C2U( "UseLastColumnStyle" ), "UseLastColumnStyle" ,
C2U( "UseBandingColumnStyle" ) "UseBandingColumnStyle"
}; };
return &gPropNames[0]; return &gPropNames[0];
} }
@@ -101,7 +100,7 @@ static const OUString* getPropertyNames()
TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool bModal ) TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool bModal )
: Control( pParent, SdResId(DLG_TABLEDESIGNPANE) ) : Control( pParent, SdResId(DLG_TABLEDESIGNPANE) )
, mrBase( rBase ) , mrBase( rBase )
, msTableTemplate( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) , msTableTemplate( "TableTemplate" )
, mbModal( bModal ) , mbModal( bModal )
, mbStyleSelected( false ) , mbStyleSelected( false )
, mbOptionsChanged( false ) , mbOptionsChanged( false )
@@ -146,7 +145,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool
Reference< XController > xController( mrBase.GetController(), UNO_QUERY_THROW ); Reference< XController > xController( mrBase.GetController(), UNO_QUERY_THROW );
Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW ); Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW );
Reference< XNameAccess > xFamilies( xFamiliesSupp->getStyleFamilies() ); Reference< XNameAccess > xFamilies( xFamiliesSupp->getStyleFamilies() );
const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM("table" ) ); const OUString sFamilyName( "table" );
mxTableFamily = Reference< XIndexAccess >( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); mxTableFamily = Reference< XIndexAccess >( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW );
} }
@@ -494,7 +493,7 @@ void TableDesignPane::updateControls()
sal_uInt16 nSelection = 0; sal_uInt16 nSelection = 0;
if( mxSelectedTable.is() ) if( mxSelectedTable.is() )
{ {
Reference< XNamed > xNamed( mxSelectedTable->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ) ), UNO_QUERY ); Reference< XNamed > xNamed( mxSelectedTable->getPropertyValue( OUString( "TableTemplate" ) ), UNO_QUERY );
if( xNamed.is() ) if( xNamed.is() )
{ {
const OUString sStyleName( xNamed->getName() ); const OUString sStyleName( xNamed->getName() );
@@ -870,7 +869,7 @@ void TableDesignPane::FillDesignPreviewControl()
Reference< XPropertySet > xPageSet( mxView->getCurrentPage(), UNO_QUERY ); Reference< XPropertySet > xPageSet( mxView->getCurrentPage(), UNO_QUERY );
if( xPageSet.is() ) if( xPageSet.is() )
{ {
const OUString sIsBackgroundDark( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) ); const OUString sIsBackgroundDark( "IsBackgroundDark" );
xPageSet->getPropertyValue(sIsBackgroundDark) >>= bIsPageDark; xPageSet->getPropertyValue(sIsBackgroundDark) >>= bIsPageDark;
} }
} }

4
sd/source/ui/table/tablefunction.cxx
View File

@@ -97,9 +97,9 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel* pModel, const OUStri
Reference< XNameAccess > xPool( dynamic_cast< XNameAccess* >( pModel->GetStyleSheetPool() ) ); Reference< XNameAccess > xPool( dynamic_cast< XNameAccess* >( pModel->GetStyleSheetPool() ) );
if( xPool.is() ) try if( xPool.is() ) try
{ {
const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); const OUString sFamilyName("table" );
Reference< XNameContainer > xTableFamily( xPool->getByName( sFamilyName ), UNO_QUERY_THROW ); Reference< XNameContainer > xTableFamily( xPool->getByName( sFamilyName ), UNO_QUERY_THROW );
OUString aStdName( RTL_CONSTASCII_USTRINGPARAM("default") ); OUString aStdName( "default" );
if( !sTableStyle.isEmpty() ) if( !sTableStyle.isEmpty() )
aStdName = sTableStyle; aStdName = sTableStyle;
Reference< XIndexAccess > xStyle( xTableFamily->getByName( aStdName ), UNO_QUERY_THROW ); Reference< XIndexAccess > xStyle( xTableFamily->getByName( aStdName ), UNO_QUERY_THROW );