mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dropped 'Persona' from the properties in PersonasEntry template.

Browse Source 
Change-Id: Ic662f59c084eacc7e99762c3e94fbcc191629557
This commit is contained in:
Rachit Gupta
2014-06-30 18:46:47 +05:30
committed by Jan Holesovsky
parent 49b08326e3
commit b1824cfd16
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cui/source/options/personalization.cxx
View File

@@ -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;

12
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -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>