From 0d4720d1e1ffcefc43ae2af59c7487ab0bfab2ce Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Sun, 21 Aug 2011 18:12:16 -0500
Subject: undo anything not wizard related in the previous merge-commit

---
 cui/source/customize/acccfg.cxx  |  2 +-
 cui/source/customize/macropg.cxx | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'cui/source/customize')

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 4b955b653cd4..9436944924eb 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1041,7 +1041,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
 //-----------------------------------------------
 IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG )
 {
-    StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aLoadAccelConfigStr );
+    StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aSaveAccelConfigStr );
     return 0;
 }
 
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 007ad3d2ab1e..26847cc25666 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -344,7 +344,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
                 {
                     m_xAppEvents->replaceByName( eventName, GetPropsByName( eventName, m_appEventsHash ) );
                 }
-                catch( const Exception& )
+                catch (const Exception&)
                 {
                     DBG_UNHANDLED_EXCEPTION();
                 }
@@ -361,7 +361,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
                 {
                     m_xDocEvents->replaceByName( eventName, GetPropsByName( eventName, m_docEventsHash ) );
                 }
-                catch( const Exception& )
+                catch (const Exception&)
                 {
                     DBG_UNHANDLED_EXCEPTION();
                 }
@@ -375,7 +375,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
             }
         }
     }
-    catch(Exception&)
+    catch (const Exception&)
     {
     }
     // what is the return value about??
@@ -420,7 +420,7 @@ void _SvxMacroTabPage::Reset()
                 }
             }
     }
-    catch(Exception&)
+    catch (const Exception&)
     {
     }
     DisplayAppEvents(bAppEvents);
@@ -763,8 +763,9 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
         {
             m_appEventsHash[ eventNames[nEvent] ] = GetPairFromAny( m_xAppEvents->getByName( eventNames[nEvent] ) );
         }
-        catch (Exception e)
-        {}
+        catch (const Exception&)
+        {
+        }
     }
     if(m_xDocEvents.is())
     {
@@ -776,8 +777,9 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
             {
                 m_docEventsHash[ eventNames[nEvent] ] = GetPairFromAny( m_xDocEvents->getByName( eventNames[nEvent] ) );
             }
-            catch (Exception e)
-            {}
+            catch (const Exception&)
+            {
+            }
         }
     }
 }
@@ -924,7 +926,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
 {
     (void)pButton; //unused
     pPage->FillItemSet( *pOutSet );
-    EndDialog( RET_CANCEL );
+    EndDialog( RET_OK );
     return 0;
 }
 
-- 
cgit