Date: prev next · Thread: first prev next last
2014 Archives by date, by thread · List index


Silly me, I should have waited before sending the last message. Or I
should have checked commit cbd4986.

On Tue, 2014-05-06 at 01:54 -0400, Terrence Enger wrote:
gcc (Debian 4.7.2-5) 4.7.2 on debian-wheezy just choked on
sfx2/source/control/querystatus.cxx ...

And exactly similar errors with exactly the same fix:
    sfx2/source/statbar/stbitem.cxx
    sfx2/source/toolbox/tbxitem.cxx

The attached patch fixes all three files.  I.e., it repeats the change
attached to my previous e-mail.

Terry.

diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index f9fa487..04e91f0 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -135,14 +135,14 @@ throw( RuntimeException, std::exception )
             rEvent.State >>= sTemp ;
             m_pItem = new SfxStringItem( m_nSlotID, sTemp );
         }
-        else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+        else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
         {
             ItemStatus aItemStatus;
             rEvent.State >>= aItemStatus;
             m_eState = aItemStatus.State;
             m_pItem = new SfxVoidItem( m_nSlotID );
         }
-        else if ( pType == cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+        else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() )
         {
             Visibility aVisibilityStatus;
             rEvent.State >>= aVisibilityStatus;
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 549b46f..df13974 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -286,7 +286,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                     rEvent.State >>= sTemp ;
                     pItem = new SfxStringItem( nSlotID, sTemp );
                 }
-                else if ( pType == 
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+                else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::ItemStatus>::get() )
                 {
                     frame::status::ItemStatus aItemStatus;
                     rEvent.State >>= aItemStatus;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index bb1be33..2b4efb0 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -565,14 +565,14 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                     rEvent.State >>= sTemp ;
                     pItem = new SfxStringItem( nSlotId, sTemp );
                 }
-                else if ( pType == 
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+                else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::ItemStatus>::get() )
                 {
                     ItemStatus aItemStatus;
                     rEvent.State >>= aItemStatus;
                     eState = aItemStatus.State;
                     pItem = new SfxVoidItem( nSlotId );
                 }
-                else if ( pType == 
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+                else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::Visibility>::get() )
                 {
                     Visibility aVisibilityStatus;
                     rEvent.State >>= aVisibilityStatus;
@@ -1111,14 +1111,14 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                     rEvent.State >>= sTemp ;
                     pItem = new SfxStringItem( nSlotId, sTemp );
                 }
-                else if ( pType == 
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+                else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::ItemStatus>::get() )
                 {
                     ItemStatus aItemStatus;
                     rEvent.State >>= aItemStatus;
                     eState = aItemStatus.State;
                     pItem = new SfxVoidItem( nSlotId );
                 }
-                else if ( pType == 
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+                else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::Visibility>::get() )
                 {
                     Visibility aVisibilityStatus;
                     rEvent.State >>= aVisibilityStatus;

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.