litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Merge bugfixes from 1.2 beta

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@157 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2014-08-05 08:22:37 +00:00
parent 8d15813690
commit d3bd2a10d5
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/java/org/openoffice/da/comp/w2lcommon/filter/ConfigurationDialogBase.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright: 2002-2012 by Henrik Just
* Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
* Version 1.2 (2012-03-11)
* Version 1.4 (2014-08-05)
*
*/
@ -687,13 +687,15 @@ public abstract class ConfigurationDialogBase extends WeakBase implements XConta
private void newStyleClick(DialogAccess dlg) {
if (nCurrentFamily>-1) {
updateStyleMaps(dlg);
// Invalidate current style name in any case (appendItem returns null if the user
// selects an existing style, but it still changes the current item)
sCurrentStyleName = null;
String sNewName = appendItem(dlg, "StyleName",styleNameProvider.getInternalNames(sOOoFamilyNames[nCurrentFamily]).keySet());
if (sNewName!=null) {
styleMap[nCurrentFamily].put(sNewName, new HashMap<String,String>());
clearControls(dlg);
sCurrentStyleName=null;
styleNameChange(dlg);
}
styleNameChange(dlg);
updateStyleControls(dlg);
}
}