[Libreoffice-commits] .: sd/source

[Andrzej J.R. Hunt]

 sd/source/ui/remotecontrol/ImagePreparer.cxx |    4 ++--
 sd/source/ui/remotecontrol/Listener.cxx      |    4 ++--
 sd/source/ui/remotecontrol/Transmitter.cxx   |    4 ++--
 sd/source/ui/remotecontrol/Transmitter.hxx   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5c0e6df23eeae7c836bd9cb548922ed53bc5b791
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date:   Mon Aug 6 15:02:52 2012 +0200

    Fixed scoped enums (for no C++0x).
    
    Change-Id: I46759d420cac2a0975be45f20d1414c85979f5ed

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index defc863..3555aee 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -117,7 +117,7 @@ void ImagePreparer::sendPreview( sal_uInt32 aSlideNumber )
     aBuffer.append( aEncodedShortString.getStr() );
     aBuffer.append( "\n\n" );
     pTransmitter->addMessage( aBuffer.makeStringAndClear(),
-        Transmitter::Priority::LOW );
+        Transmitter::PRIORITY_LOW );
 
 }
 
@@ -219,7 +219,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
     aBuffer.append( "</html></body>" );
     aBuffer.append( "\n\n" );
     pTransmitter->addMessage( aBuffer.makeStringAndClear(),
-        Transmitter::Priority::LOW );
+        Transmitter::PRIORITY_LOW );
 }
 
 sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String 
aUrl );
diff --git a/sd/source/ui/remotecontrol/Listener.cxx 
b/sd/source/ui/remotecontrol/Listener.cxx
index 016becb..e326ea5 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -50,7 +50,7 @@ void Listener::init( const css::uno::Reference< 
css::presentation::XSlideShowCon
               .append( OString::valueOf( aCurrentSlide ) ).append( "\n\n" );
 
         pTransmitter->addMessage( aBuffer.makeStringAndClear(),
-                                  Transmitter::Priority::HIGH );
+                                  Transmitter::PRIORITY_HIGH );
 
         mPreparer.set( new ImagePreparer( aController, pTransmitter, mPreparer 
) );
         mPreparer->launch();
@@ -118,7 +118,7 @@ void SAL_CALL Listener::slideTransitionStarted (void)
     if ( pTransmitter )
     {
         pTransmitter->addMessage( aBuilder.makeStringAndClear(),
-                               Transmitter::Priority::HIGH );
+                               Transmitter::PRIORITY_HIGH );
     }
 }
 
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx 
b/sd/source/ui/remotecontrol/Transmitter.cxx
index ba432c1..ef58097 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -61,10 +61,10 @@ void Transmitter::addMessage( const OString& aMessage, 
const Priority aPriority
     ::osl::MutexGuard aQueueGuard( mQueueMutex );
     switch ( aPriority )
     {
-        case Priority::LOW:
+        case PRIORITY_LOW:
             mLowPriority.push( aMessage );
             break;
-        case Priority::HIGH:
+        case PRIORITY_HIGH:
             mHighPriority.push( aMessage );
             break;
     }
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx 
b/sd/source/ui/remotecontrol/Transmitter.hxx
index 14da76f..b042454 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -24,7 +24,7 @@ class Transmitter
 : public salhelper::Thread
 {
 public:
-    enum Priority { LOW = 1, HIGH };
+    enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH };
     Transmitter( osl::StreamSocket &aSocket );
     ~Transmitter();
     void addMessage( const rtl::OString& aMessage, const Priority aPriority );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits