diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2018-11-02 13:53:16 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-11-06 10:41:08 +0100 |
| commit | 990761f5297ef7bff78f62e7df63d4d4a20616a6 (patch) | |
| tree | 412f9f51dd49fe74a159bf841a6818fa40fd4ca2 /sdext | |
| parent | 819149fb1f71fc13ffdc288736ce65bb3c6c75d8 (diff) | |
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: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 7 | ||||
| -rw-r--r-- | sdext/source/minimizer/pppoptimizertoken.cxx | 2 | ||||
| -rw-r--r-- | sdext/source/minimizer/pppoptimizertoken.hxx | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 17eb90630715..9185f8e4f327 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -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 ); } } diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index 8ad7bba53ce1..5470811249d5 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -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 } }; diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx index e458da0d3181..a72afd3ef83d 100644 --- a/sdext/source/minimizer/pppoptimizertoken.hxx +++ b/sdext/source/minimizer/pppoptimizertoken.hxx @@ -135,6 +135,7 @@ enum PPPOptimizerTokenEnum STR_OPTIMIZING_GRAPHICS, STR_CREATING_OLE_REPLACEMENTS, STR_FILESIZESEPARATOR, + STR_FILENAME_SUFFIX, TK_NotFound }; |