[Libreoffice-commits] .: 2 commits - sd/source
Olivier Hallot
ohallot at kemper.freedesktop.org
Thu Apr 12 06:10:33 PDT 2012
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 3 -
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 16 ++++------
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 24 +++++----------
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 9 +----
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 8 +----
sd/source/ui/slidesorter/controller/SlsListener.cxx | 16 +++-------
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 13 +++-----
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 2 -
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 12 ++-----
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 2 -
sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 3 -
sd/source/ui/table/TableDesignPane.cxx | 21 ++++++-------
sd/source/ui/table/tablefunction.cxx | 4 +-
13 files changed, 52 insertions(+), 81 deletions(-)
New commits:
commit 674ed53bc00fbbbfec5661cbafcaa79669927cb8
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Thu Apr 12 10:04:33 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
module sd/../ui
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index fdd01a4..8c51857 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -488,10 +488,8 @@ void SAL_CALL Listener::propertyChange (
{
ThrowIfDisposed();
- static const ::rtl::OUString sCurrentPagePropertyName (
- RTL_CONSTASCII_USTRINGPARAM("CurrentPage"));
- static const ::rtl::OUString sEditModePropertyName (
- RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode"));
+ static const ::rtl::OUString sCurrentPagePropertyName ("CurrentPage");
+ static const ::rtl::OUString sEditModePropertyName ("IsMasterPageMode");
if (rEvent.PropertyName.equals(sCurrentPagePropertyName))
{
@@ -501,8 +499,7 @@ void SAL_CALL Listener::propertyChange (
{
try
{
- Any aPageNumber = xPageSet->getPropertyValue (
- String(RTL_CONSTASCII_USTRINGPARAM("Number")));
+ Any aPageNumber = xPageSet->getPropertyValue ("Number");
sal_Int32 nCurrentPage = 0;
aPageNumber >>= nCurrentPage;
// The selection is already set but we call SelectPage()
@@ -592,8 +589,7 @@ void Listener::UpdateEditMode (void)
{
try
{
- Any aValue (xSet->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsMasterPageMode"))));
+ Any aValue (xSet->getPropertyValue( "IsMasterPageMode" ));
aValue >>= bIsMasterPageMode;
}
catch (beans::UnknownPropertyException&)
@@ -693,9 +689,7 @@ void Listener::ThrowIfDisposed (void)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SlideSorterController object has already been disposed")),
+ throw lang::DisposedException ("SlideSorterController object has already been disposed",
static_cast<uno::XWeak*>(this));
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index fc5eec6..dcdad2b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -828,11 +828,11 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
SdPage* pFirstPage = NULL;
sal_uInt16 nFirstPage;
sal_uInt16 nSelectedPages = (sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
- String aPageStr;
+ rtl::OUString aPageStr;
String aLayoutStr;
if (nSelectedPages > 0)
- aPageStr = String(SdResId(STR_SD_PAGE));
+ aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE)));
if (nSelectedPages == 1)
{
@@ -846,11 +846,10 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet)
nFirstPage = pPage->GetPageNum()/2;
pFirstPage = pPage;
- aPageStr += sal_Unicode(' ');
- aPageStr += String::CreateFromInt32( nFirstPage + 1 );
- aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
- aPageStr += String::CreateFromInt32(
- mrSlideSorter.GetModel().GetPageCount());
+ aPageStr += " ";
+ aPageStr += rtl::OUString::valueOf( nFirstPage + 1 );
+ aPageStr += " / " ;
+ aPageStr += rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount());
aLayoutStr = pFirstPage->GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index a82c289..de0ddf5 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -248,7 +248,7 @@ sal_Int32 SlideSorterModel::GetIndex (const Reference<drawing::XDrawPage>& rxSli
{
try
{
- const Any aNumber (xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))));
+ const Any aNumber (xSet->getPropertyValue("Number"));
sal_Int16 nNumber (-1);
aNumber >>= nNumber;
nNumber -= 1;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 80952ad..1f37dbf 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -79,7 +79,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
::rtl::OUString SlideSorterService_getImplementationName (void) throw(RuntimeException)
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.SlideSorter"));
+ return OUString("com.sun.star.comp.Draw.SlideSorter");
}
@@ -88,8 +88,7 @@ Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
Sequence<rtl::OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
throw (RuntimeException)
{
- static const ::rtl::OUString sServiceName(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideSorter")));
+ static const ::rtl::OUString sServiceName("com.sun.star.drawing.SlideSorter");
return Sequence<rtl::OUString>(&sServiceName, 1);
}
@@ -174,8 +173,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
}
else
{
- throw RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorterService: invalid number of arguments")),
+ throw RuntimeException("SlideSorterService: invalid number of arguments",
static_cast<drawing::XDrawView*>(this));
}
}
@@ -632,9 +630,7 @@ void SlideSorterService::ThrowIfDisposed (void)
{
if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose)
{
- throw lang::DisposedException (
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "SlideSorterService object has already been disposed")),
+ throw lang::DisposedException ("SlideSorterService object has already been disposed",
static_cast<drawing::XDrawView*>(this));
}
}
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index fc4d05b..919f812 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -1174,7 +1174,7 @@ void StartShowButton::ProcessClick (const model::SharedPageDescriptor& rpDescrip
if (xPresentation.is())
{
Sequence<PropertyValue> aProperties (1);
- aProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPage"));
+ aProperties[0].Name = ::rtl::OUString("FirstPage");
const ::rtl::OUString sName (rpDescriptor->GetPage()->GetName());
aProperties[0].Value = Any(sName);
diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
index 8ff3414..1e28546 100644
--- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx
@@ -66,8 +66,7 @@ FontProvider& FontProvider::Instance (void)
// We throw an exception when for some strange reason no instance of
// this class exists.
if (mpInstance == NULL)
- throw ::com::sun::star::uno::RuntimeException(::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")),
+ throw ::com::sun::star::uno::RuntimeException("com.sun.star.document.IndexedPropertyValues",
NULL);
return *mpInstance;
commit 139b5e76721c685abdbb51a317c3804ffd9cafcb
Author: Olivier Hallot <olivier.hallot at alta.org.br>
Date: Thu Apr 12 09:23:33 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
module sd/../ui
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index d556c5c..eaed94a 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -144,8 +144,7 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize)
mnMaximalNormalCacheSize = nMaximalNormalCacheSize;
else
{
- Any aCacheSize (CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CacheSize"))));
+ Any aCacheSize (CacheConfiguration::Instance()->GetValue("CacheSize"));
if (aCacheSize.has<sal_Int32>())
aCacheSize >>= mnMaximalNormalCacheSize;
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 3a59eca..94f1343 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -96,16 +96,15 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
BitmapCache& rCache,
sal_Int32 nMaximalCacheSize)
{
- static const ::rtl::OUString sNone (RTL_CONSTASCII_USTRINGPARAM("None"));
- static const ::rtl::OUString sCompress (RTL_CONSTASCII_USTRINGPARAM("Compress"));
- static const ::rtl::OUString sErase (RTL_CONSTASCII_USTRINGPARAM("Erase"));
- static const ::rtl::OUString sResolution (RTL_CONSTASCII_USTRINGPARAM("ResolutionReduction"));
- static const ::rtl::OUString sPNGCompression (RTL_CONSTASCII_USTRINGPARAM("PNGCompression"));
+ static const ::rtl::OUString sNone ("None");
+ static const ::rtl::OUString sCompress ("Compress");
+ static const ::rtl::OUString sErase ("Erase");
+ static const ::rtl::OUString sResolution ("ResolutionReduction");
+ static const ::rtl::OUString sPNGCompression ("PNGCompression");
::boost::shared_ptr<BitmapCompressor> pCompressor;
::rtl::OUString sCompressionPolicy(sPNGCompression);
- Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CompressionPolicy"))));
+ Any aCompressionPolicy (CacheConfiguration::Instance()->GetValue("CompressionPolicy"));
if (aCompressionPolicy.has<rtl::OUString>())
aCompressionPolicy >>= sCompressionPolicy;
if (sCompressionPolicy == sNone)
@@ -119,8 +118,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<CacheCompactor> pCompactor (NULL);
::rtl::OUString sCompactionPolicy(sCompress);
- Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CompactionPolicy"))));
+ Any aCompactionPolicy (CacheConfiguration::Instance()->GetValue("CompactionPolicy"));
if (aCompactionPolicy.has<rtl::OUString>())
aCompactionPolicy >>= sCompactionPolicy;
if (sCompactionPolicy == sNone)
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index fce57b1..95c0bab 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -82,14 +82,9 @@ Timer CacheConfiguration::maReleaseTimer;
CacheConfiguration::CacheConfiguration (void)
{
// Get the cache size from configuration.
- const ::rtl::OUString sConfigurationProviderServiceName(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationProvider"));
- const ::rtl::OUString sPathToImpressConfigurationRoot(
- RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Impress/"));
- const ::rtl::OUString sPathToNode(
- RTL_CONSTASCII_USTRINGPARAM(
- "MultiPaneGUI/SlideSorter/PreviewCache"));
+ const ::rtl::OUString sConfigurationProviderServiceName("com.sun.star.configuration.ConfigurationProvider");
+ const ::rtl::OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/");
+ const ::rtl::OUString sPathToNode("MultiPaneGUI/SlideSorter/PreviewCache");
try
{
@@ -104,25 +99,24 @@ CacheConfiguration::CacheConfiguration (void)
// Obtain access to Impress configuration.
Sequence<Any> aCreationArguments(3);
aCreationArguments[0] = makeAny(beans::PropertyValue(
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("nodepath")),
+ "nodepath",
0,
makeAny(sPathToImpressConfigurationRoot),
beans::PropertyState_DIRECT_VALUE));
aCreationArguments[1] = makeAny(beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")),
+ "depth",
0,
makeAny((sal_Int32)-1),
beans::PropertyState_DIRECT_VALUE));
aCreationArguments[2] = makeAny(beans::PropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")),
+ "lazywrite",
0,
makeAny(true),
beans::PropertyState_DIRECT_VALUE));
- ::rtl::OUString sAccessService (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.configuration.ConfigurationAccess")));
+
Reference<XInterface> xRoot (xProvider->createInstanceWithArguments(
- sAccessService, aCreationArguments));
+ "com.sun.star.configuration.ConfigurationAccess",
+ aCreationArguments));
if ( ! xRoot.is())
return;
Reference<container::XHierarchicalNameAccess> xHierarchy (xRoot, UNO_QUERY);
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index e40c7bd..028b8bf 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -57,18 +57,15 @@ QueueProcessor::QueueProcessor (
{
// Look into the configuration if there for overriding values.
::com::sun::star::uno::Any aTimeBetweenReqeusts;
- aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenHighPriorityRequests")));
+ aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenHighPriorityRequests");
if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenHighPriorityRequests;
- aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenLowPriorityRequests")));
+ aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenLowPriorityRequests");
if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenLowPriorityRequests;
- aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeBetweenRequestsDuringShow")));
+ aTimeBetweenReqeusts = CacheConfiguration::Instance()->GetValue("TimeBetweenRequestsDuringShow");
if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle;
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index a79ddaf..15da3fc 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -202,9 +202,7 @@ CacheKey RequestQueue::GetFront (void)
::osl::MutexGuard aGuard (maMutex);
if (mpRequestQueue->empty())
- throw ::com::sun::star::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "RequestQueue::GetFront(): queue is empty")),
+ throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFront(): queue is empty",
NULL);
return mpRequestQueue->begin()->maKey;
@@ -218,9 +216,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void)
::osl::MutexGuard aGuard (maMutex);
if (mpRequestQueue->empty())
- throw ::com::sun::star::uno::RuntimeException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "RequestQueue::GetFrontPriorityClass(): queue is empty")),
+ throw ::com::sun::star::uno::RuntimeException("RequestQueue::GetFrontPriorityClass(): queue is empty",
NULL);
return mpRequestQueue->begin()->meClass;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 2263f8d..112be10 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -62,7 +62,6 @@
#include "sdresid.hxx"
#include "EventMultiplexer.hxx"
-#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
using ::rtl::OUString;
using namespace ::com::sun::star;
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 ] =
{
- C2U( "UseFirstRowStyle" ),
- C2U( "UseLastRowStyle" ),
- C2U( "UseBandingRowStyle" ),
- C2U( "UseFirstColumnStyle" ),
- C2U( "UseLastColumnStyle" ),
- C2U( "UseBandingColumnStyle" )
+ "UseFirstRowStyle" ,
+ "UseLastRowStyle" ,
+ "UseBandingRowStyle" ,
+ "UseFirstColumnStyle" ,
+ "UseLastColumnStyle" ,
+ "UseBandingColumnStyle"
};
return &gPropNames[0];
}
@@ -101,7 +100,7 @@ static const OUString* getPropertyNames()
TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool bModal )
: Control( pParent, SdResId(DLG_TABLEDESIGNPANE) )
, mrBase( rBase )
-, msTableTemplate( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) )
+, msTableTemplate( "TableTemplate" )
, mbModal( bModal )
, mbStyleSelected( false )
, mbOptionsChanged( false )
@@ -146,7 +145,7 @@ TableDesignPane::TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool
Reference< XController > xController( mrBase.GetController(), UNO_QUERY_THROW );
Reference< XStyleFamiliesSupplier > xFamiliesSupp( xController->getModel(), UNO_QUERY_THROW );
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 );
}
@@ -494,7 +493,7 @@ void TableDesignPane::updateControls()
sal_uInt16 nSelection = 0;
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() )
{
const OUString sStyleName( xNamed->getName() );
@@ -870,7 +869,7 @@ void TableDesignPane::FillDesignPreviewControl()
Reference< XPropertySet > xPageSet( mxView->getCurrentPage(), UNO_QUERY );
if( xPageSet.is() )
{
- const OUString sIsBackgroundDark( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundDark" ) );
+ const OUString sIsBackgroundDark( "IsBackgroundDark" );
xPageSet->getPropertyValue(sIsBackgroundDark) >>= bIsPageDark;
}
}
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 5ca59e1..10066a9 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -97,9 +97,9 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel* pModel, const OUStri
Reference< XNameAccess > xPool( dynamic_cast< XNameAccess* >( pModel->GetStyleSheetPool() ) );
if( xPool.is() ) try
{
- const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM( "table" ) );
+ const OUString sFamilyName("table" );
Reference< XNameContainer > xTableFamily( xPool->getByName( sFamilyName ), UNO_QUERY_THROW );
- OUString aStdName( RTL_CONSTASCII_USTRINGPARAM("default") );
+ OUString aStdName( "default" );
if( !sTableStyle.isEmpty() )
aStdName = sTableStyle;
Reference< XIndexAccess > xStyle( xTableFamily->getByName( aStdName ), UNO_QUERY_THROW );
More information about the Libreoffice-commits
mailing list