Kaydet (Commit) 990761f5 authored tarafından Vasily Melenchuk's avatar Vasily Melenchuk Kaydeden (comit) Thorsten Behrens

presentation minimizer: fixed problem with default filename

According to code, it is expected that minimized copy of
presentation is proposed with ".mini" suffix as default,
but this does not works right now. As a solution a new
localized prefix "(minimized)" is added to filename.

Change-Id: If869c70a5885a9c917fc7254aa8b0d164a6f5a50
Reviewed-on: https://gerrit.libreoffice.org/62781
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 819149fb
......@@ -196,6 +196,9 @@ The current presentation contains no OLE objects.</value>
<prop oor:name="STR_FILESIZESEPARATOR">
<value xml:lang="en-US">.</value>
</prop>
<prop oor:name="STR_FILENAME_SUFFIX">
<value xml:lang="en-US">(minimized)</value>
</prop>
</node>
<node oor:name="LastUsedSettings">
<prop oor:name="Name">
......
......@@ -361,6 +361,10 @@ The current presentation contains no OLE objects.</value>
<info><desc>String STR_FILESIZESEPARATOR.</desc></info>
<value>.</value>
</prop>
<prop oor:name="STR_FILENAME_SUFFIX" oor:type="xs:string" oor:localized="true">
<info><desc>String STR_FILENAME_SUFFIX.</desc></info>
<value>(minimized)</value>
</prop>
</group>
<node-ref oor:name="LastUsedSettings" oor:node-type="OptimizerSettings">
<info>
......
......@@ -508,12 +508,15 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
if ( xStorable.is() && xStorable->hasLocation() )
{
INetURLObject aURLObj( xStorable->getLocation() );
if ( !aURLObj.hasFinalSlash() &&
aURLObj.setExtension( "mini", INetURLObject::LAST_SEGMENT, false ) ) {
if ( !aURLObj.hasFinalSlash() ) {
// tdf#105382 uri-decode file name
aURLObj.removeExtension(INetURLObject::LAST_SEGMENT, false);
auto aName( aURLObj.getName( INetURLObject::LAST_SEGMENT,
false,
INetURLObject::DecodeMechanism::WithCharset ) );
// Add "(minimized)"
aName += " ";
aName += mrOptimizerDialog.getString(STR_FILENAME_SUFFIX);
aFileOpenDialog.setDefaultName( aName );
}
}
......
......@@ -152,6 +152,8 @@ static const TokenTable pTokenTableArray[] =
{ "STR_OPTIMIZING_GRAPHICS", STR_OPTIMIZING_GRAPHICS },
{ "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS },
{ "STR_FileSizeSeparator", STR_FILESIZESEPARATOR },
{ "STR_FILENAME_SUFFIX", STR_FILENAME_SUFFIX },
{ "NotFound", TK_NotFound }
};
......
......@@ -135,6 +135,7 @@ enum PPPOptimizerTokenEnum
STR_OPTIMIZING_GRAPHICS,
STR_CREATING_OLE_REPLACEMENTS,
STR_FILESIZESEPARATOR,
STR_FILENAME_SUFFIX,
TK_NotFound
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment