[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source officecfg/registry

[Rachit Gupta]

 cui/source/options/personalization.cxx                     |   12 ++++++------
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit c64c61ff06e27791e38f36fed7cda3d283ac5115
Author: Rachit Gupta <rachitgupta1792 at gmail.com>
Date:   Mon Jun 30 18:46:47 2014 +0530

    Dropped 'Persona' from the properties in PersonasEntry template.
    
    Change-Id: Ic662f59c084eacc7e99762c3e94fbcc191629557

diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index e78c779..0a431f0 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -376,7 +376,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
     {
         Reference< XPropertySet > xPropertySet( officecfg::Office::Common::Misc::PersonasList::get()->getByName( installedPersonas[nIndex] ), UNO_QUERY_THROW );
         OUString aPersonaName, aPreviewFile, aHeaderFile, aFooterFile, aTextColor, aAccentColor, aPersonaSettings;
-        Any aValue = xPropertySet->getPropertyValue( "PersonaPreview" );
+        Any aValue = xPropertySet->getPropertyValue( "Preview" );
         aValue >>= aPreviewFile;
         INetURLObject aURLObj( aPreviewFile );
         aFilter.ImportGraphic( aGraphic, aURLObj );
@@ -384,19 +384,19 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
         m_vExtensionPersonas[nCount]->Show();
         m_vExtensionPersonas[nCount++]->SetModeImage( Image( aBmp ) );
 
-        aValue = xPropertySet->getPropertyValue( "PersonaName" );
+        aValue = xPropertySet->getPropertyValue( "Name" );
         aValue >>= aPersonaName;
 
-        aValue = xPropertySet->getPropertyValue( "PersonaHeader" );
+        aValue = xPropertySet->getPropertyValue( "Header" );
         aValue >>= aHeaderFile;
 
-        aValue = xPropertySet->getPropertyValue( "PersonaFooter" );
+        aValue = xPropertySet->getPropertyValue( "Footer" );
         aValue >>= aFooterFile;
 
-        aValue = xPropertySet->getPropertyValue( "PersonaTextColor" );
+        aValue = xPropertySet->getPropertyValue( "TextColor" );
         aValue >>= aTextColor;
 
-        aValue = xPropertySet->getPropertyValue( "PersonaAccentColor" );
+        aValue = xPropertySet->getPropertyValue( "AccentColor" );
         aValue >>= aAccentColor;
 
         aPersonaSettings = aHeaderFile + ";" + aFooterFile + ";" + aTextColor + ";" + aAccentColor;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6548445..408874f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -810,35 +810,35 @@
       <info>
         <desc>Stores the details of the installed personas.</desc>
       </info>
-      <prop oor:name="PersonaName" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="Name" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>The Persona's name</desc>
         </info>
       </prop>
-      <prop oor:name="PersonaPreview" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="Preview" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Name of the preview file for the Persona to show in the UI</desc>
         </info>
       </prop>
-      <prop oor:name="PersonaHeader" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="Header" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Name of the header file for the Persona</desc>
         </info>
         <value/>
       </prop>
-      <prop oor:name="PersonaFooter" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="Footer" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Name of the footer file for the Persona</desc>
         </info>
         <value/>
       </prop>
-      <prop oor:name="PersonaTextColor" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="TextColor" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Value of the text color for the Persona</desc>
         </info>
         <value/>
       </prop>
-      <prop oor:name="PersonaAccentColor" oor:type="xs:string" oor:nillable="false">
+      <prop oor:name="AccentColor" oor:type="xs:string" oor:nillable="false">
         <info>
           <desc>Value of the accent color for the Persona</desc>
         </info>