summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRachit Gupta <rachitgupta1792@gmail.com>2014-06-30 18:46:47 +0530
committerJan Holesovsky <kendy@collabora.com>2014-08-14 19:43:30 +0200
commitb1824cfd16dcc1f8fa5563b737d95fb4767a5640 (patch)
treea47cdb8ceb1c001d9c9d1f23abe6c29aa494a756
parent49b08326e3ac2a805373f255b3b0fd2c6fa165fa (diff)
Dropped 'Persona' from the properties in PersonasEntry template.
Change-Id: Ic662f59c084eacc7e99762c3e94fbcc191629557
-rw-r--r--cui/source/options/personalization.cxx12
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs12
2 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index c2fe00c2dbf7..7e03250062ae 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 6548445053ed..408874f65e34 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>