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

[Caolán McNamara]

 dictionaries                                   |    2 +-
 framework/source/fwe/classes/addonsoptions.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 296fece62ff1a1afc95a8968050fd146b39f1cb5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 28 17:15:24 2013 +0000

    get master dictionaries in master core
    
    and a janitorial drive-by in framework
    
    Change-Id: I3106925423cb53f58b59714da49b7928c533e613

diff --git a/dictionaries b/dictionaries
index f1a4eca..569915c 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit f1a4ecab4b10fe7e5daadd6529516d5ffeba0fda
+Subproject commit 569915c40dc4b3df1f75abe9e1202e0d66f03281
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index c0d5ff0..6880357 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -95,12 +95,12 @@ using namespace ::com::sun::star;
 #define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT          OUString("MergeContext" )
 #define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS          OUString("ToolBarItems" )
 
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT               ::rtl::OUString("MergePoint")
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND             ::rtl::OUString("MergeCommand")
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER    ::rtl::OUString("MergeCommandParameter")
-#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK            ::rtl::OUString("MergeFallback")
-#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT             ::rtl::OUString("MergeContext")
-#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS           ::rtl::OUString("StatusBarItems")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEPOINT               OUString("MergePoint")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMAND             OUString("MergeCommand")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECOMMANDPARAMETER    OUString("MergeCommandParameter")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGEFALLBACK            OUString("MergeFallback")
+#define PROPERTYNAME_MERGESTATUSBAR_MERGECONTEXT             OUString("MergeContext")
+#define PROPERTYNAME_MERGESTATUSBAR_STATUSBARITEMS           OUString("StatusBarItems")
 
 // The following order is mandatory. Please add properties at the end!
 #define INDEX_URL               0