[Libreoffice-commits] .: 2 commits - sd/source

[Caolán McNamara]

 sd/source/filter/sdpptwrp.cxx                  |    2 +-
 sd/source/ui/slidesorter/view/SlsButtonBar.cxx |    2 +-
 sd/source/ui/unoidl/SdUnoSlideView.cxx         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8e8d738e4f391c169168eda35e6a1a84f88fa60f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 13 11:34:22 2011 +0100

    rename SetKey to SetCryptMaskKey

diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 119891c..3d4ee83 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -100,7 +100,7 @@ sal_Bool SdPPTFilter::Import()
         if( pDocStream )
         {
             pDocStream->SetVersion( pStorage->GetVersion() );
-            pDocStream->SetKey( pStorage->GetKey() );
+            pDocStream->SetCryptMaskKey(pStorage->GetKey());
 
             String aTraceConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Tracing/Import/PowerPoint" ) );
             Sequence< PropertyValue > aConfigData( 1 );
commit 0e7c3d351427f41a3cf0df7ae26c76d3b5e58ae7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 10 23:24:51 2011 +0100

    createFromAscii -> RTL_CONSTASCII_USTRINGPARAM

diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 517166f..5c0adf4 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -1449,7 +1449,7 @@ void StartShowButton::ProcessClick (const model::SharedPageDescriptor& rpDescrip
     if (xPresentation.is())
     {
         Sequence<PropertyValue> aProperties (1);
-        aProperties[0].Name = ::rtl::OUString::createFromAscii("FirstPage");
+        aProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPage"));
         const ::rtl::OUString sName (rpDescriptor->GetPage()->GetName());
         aProperties[0].Value = Any(sName);
         xPresentation->startWithArguments(aProperties);
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index 092911e..3541c82 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -168,7 +168,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage (
     if (xProperties.is())
     {
         sal_uInt16 nPageNumber(0);
-        if (xProperties->getPropertyValue(::rtl::OUString::createFromAscii("Number")) >>= nPageNumber)
+        if (xProperties->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number"))) >>= nPageNumber)
         {
             mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(
                 nPageNumber-1,