svn commit: r1448713 [2/2] - in /openoffice/trunk/main: cli_ure/source/native/ cppuhelper/source/ cui/source/dialogs/ desktop/source/app/ helpcontent2/source/text/shared/00/ instsetoo_native/inc_openoffice/windows/msi_templates/ instsetoo_native/inc_sd...

[orw]

Modified: openoffice/trunk/main/unotools/source/config/configmgr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/config/configmgr.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/source/config/configmgr.cxx (original)
+++ openoffice/trunk/main/unotools/source/config/configmgr.cxx Thu Feb 21 
16:37:14 2013
@@ -62,6 +62,8 @@ namespace
 {
     struct BrandName
         : public rtl::Static< ::rtl::OUString, BrandName > {};
+    struct FullProductname
+        : public rtl::Static< ::rtl::OUString, FullProductname > {};
     struct ProductVersion
         : public rtl::Static< ::rtl::OUString, ProductVersion > {};
     struct AboutBoxProductVersion
@@ -417,6 +419,13 @@ Any ConfigManager::GetDirectConfigProper
         return aRet;
     }
 
+    ::rtl::OUString& rFullProductname = FullProductname::get();
+    if ( eProp == FULLPRODUCTNAME && rFullProductname.getLength() )
+    {
+        aRet <<= rFullProductname;
+        return aRet;
+    }
+
     rtl::OUString &rProductVersion = ProductVersion::get();
     if ( eProp == PRODUCTVERSION && rProductVersion.getLength() )
     {
@@ -494,6 +503,7 @@ Any ConfigManager::GetDirectConfigProper
                case LOCALE:                                            sPath 
+= C2U("Setup/L10N"); break;
 
         case PRODUCTNAME:
+        case FULLPRODUCTNAME:
         case PRODUCTVERSION:
         case PRODUCTEXTENSION:
         case PRODUCTXMLFILEFORMATNAME :
@@ -531,6 +541,7 @@ Any ConfigManager::GetDirectConfigProper
                {
                        case LOCALE:                                            
        sProperty = C2U("ooLocale"); break;
             case PRODUCTNAME:                                          
sProperty = C2U("ooName"); break;
+            case FULLPRODUCTNAME:                                      
sProperty = C2U("ooFullname"); break;
             case PRODUCTVERSION:                                       
sProperty = C2U("ooSetupVersion"); break;
             case ABOUTBOXPRODUCTVERSION:                       sProperty = 
C2U("ooSetupVersionAboutBox"); break;
             case OOOVENDOR:                         sProperty = 
C2U("ooVendor"); break;

Modified: openoffice/trunk/main/vcl/source/app/settings.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/settings.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/app/settings.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/settings.cxx Thu Feb 21 16:37:14 2013
@@ -1167,7 +1167,7 @@ sal_Bool MiscSettings::GetEnableATToolSu
         HKEY hkey;
 
         if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-            "Software\\Aapche OpenOffice\\Accessibility\\AtToolSupport",
+            "Software\\OpenOffice\\Accessibility\\AtToolSupport",
             &hkey) )
         {
             DWORD dwType;
@@ -1245,7 +1245,7 @@ void MiscSettings::SetEnableATToolSuppor
 
         // If the accessibility key in the Windows registry exists, change it 
synchronously
                if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-                       "Software\\Apache 
OpenOffice\\Accessibility\\AtToolSupport",
+                       "Software\\OpenOffice\\Accessibility\\AtToolSupport",
                        &hkey) )
                {
                        DWORD dwType;

Modified: openoffice/trunk/main/vcl/source/window/toolbox.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/toolbox.cxx?rev=1448713&r1=1448712&r2=1448713&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/toolbox.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/toolbox.cxx Thu Feb 21 16:37:14 2013
@@ -6302,7 +6302,7 @@ void ToolBox::ImplDisableFlatButtons()
         HKEY hkey;
 
                if( ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER,
-                       "Software\\Apache 
OpenOffice\\Accessibility\\AtToolSupport",
+                       "Software\\OpenOffice\\Accessibility\\AtToolSupport",
                        &hkey) )
                {
                        DWORD dwType = 0;