[Libreoffice-commits] core.git: framework/source

Noel Grandin noel at peralex.com
Wed Oct 1 23:49:45 PDT 2014


 framework/source/classes/menumanager.cxx                          |    2 +-
 framework/source/uiconfiguration/imagemanagerimpl.cxx             |    6 +++---
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |    6 +++---
 framework/source/uiconfiguration/uiconfigurationmanager.cxx       |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b1472db9db602a9014cd46775412521bede1e643
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Oct 2 08:48:32 2014 +0200

    fix for older compiler, doesn't like <::
    
    Change-Id: I8113125b7eb9d919aaf84a1dcde3e58e41e978f4

diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index fd8ca50..e246e8f 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -944,7 +944,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,bool
                 OUString aImageId;
 
                 ::framework::MenuConfiguration::Attributes* pMenuAttributes =
-                    reinterpret_cast<::framework::MenuConfiguration::Attributes*>(_pMenu->GetUserValue( nId ));
+                    reinterpret_cast< ::framework::MenuConfiguration::Attributes*>(_pMenu->GetUserValue( nId ));
 
                 if ( pMenuAttributes )
                     aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 9a718d7..2273860 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -1368,13 +1368,13 @@ void ImageManagerImpl::implts_notifyContainerListener( const ConfigurationEvent&
                 switch ( eOp )
                 {
                     case NotifyOp_Replace:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
                         break;
                     case NotifyOp_Insert:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
                         break;
                     case NotifyOp_Remove:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
                         break;
                 }
             }
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index d247f14..30ace31 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1693,13 +1693,13 @@ void ModuleUIConfigurationManager::implts_notifyContainerListener( const ui::Con
                 switch ( eOp )
                 {
                     case NotifyOp_Replace:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
                         break;
                     case NotifyOp_Insert:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
                         break;
                     case NotifyOp_Remove:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
                         break;
                 }
             }
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 27dc2ef..df7d2bc 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1400,13 +1400,13 @@ void UIConfigurationManager::implts_notifyContainerListener( const Configuration
                 switch ( eOp )
                 {
                     case NotifyOp_Replace:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementReplaced( aEvent );
                         break;
                     case NotifyOp_Insert:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementInserted( aEvent );
                         break;
                     case NotifyOp_Remove:
-                        static_cast<::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
+                        static_cast< ::com::sun::star::ui::XUIConfigurationListener*>(pIterator.next())->elementRemoved( aEvent );
                         break;
                 }
             }


More information about the Libreoffice-commits mailing list