diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:48 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:48 +0200 |
commit | 0650647ed5196ab6f65875eacc99be87e6994d6f (patch) | |
tree | 0053ac989727ef4a17ddcaa86e72f4406ef5a7f4 /swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | |
parent | f76f752dc908cfbab1cade605fe4f742233dfa6d (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a9475f3ee585c2d8667a8823f46cb04a96da84b5 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 215bfd8724f8ebc7bdcd7c589dcd3ee2fc3cdef2
Author: Andras Timar <timar@fsf.hu>
Date: Mon Feb 7 23:18:59 2011 +0100
Added/modified NLPsolver translations from Pootle
nlpsolver/locale/NLPSolverCommon_de.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_fa.properties | 14 +++---
nlpsolver/locale/NLPSolverCommon_fr.properties | 4 +-
nlpsolver/locale/NLPSolverCommon_nl.properties | 2 +-
nlpsolver/locale/NLPSolverCommon_ru.properties | 21 +++++++++
nlpsolver/locale/NLPSolverCommon_zh_TW.properties | 2 +-
.../locale/NLPSolverStatusDialog_ast.properties | 4 +-
.../locale/NLPSolverStatusDialog_de.properties | 12 +++---
.../locale/NLPSolverStatusDialog_en_GB.properties | 2 +-
.../locale/NLPSolverStatusDialog_fa.properties | 46 ++++++++++----------
.../locale/NLPSolverStatusDialog_is.properties | 27 +++++++++++
.../locale/NLPSolverStatusDialog_ru.properties | 27 +++++++++++
12 files changed, 119 insertions(+), 44 deletions(-)
commit 740c46dbb713dcc3b4a07d69ccf7ff7a634cce24
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:23 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit 6e673b3b275a5008c654c4bbfb41709d30cd62af
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 12 10:03:30 2011 +0100
fix presenter screens description.xml build
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c6d30578f94bebfe154237496eceedd338d5982b
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit d36f5922c12c793b156396d68daffb55feb3b182
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: extensions_libreoffice-3.3.1.1
Diffstat (limited to 'swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java')
-rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java index 8b635d85c316..98fcb0ceb8d9 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase private XControlContainer m_xControlContainer; Settings m_aSettings; - + public WikiOptionsEventHandlerImpl( XComponentContext xContext ) { m_xContext = xContext; @@ -96,7 +96,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase catch ( Exception ex ) { ex.printStackTrace(); - } + } } } } @@ -166,7 +166,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase XPropertySet xListProps = GetPropSet("WikiList"); if ( xListProps != null ) { - try + try { short[] pSel = (short []) xListProps.getPropertyValue("SelectedItems"); String[] pItems = (String []) GetPropSet("WikiList").getPropertyValue("StringItemList"); @@ -200,16 +200,16 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase } // com.sun.star.lang.XServiceInfo: - public String getImplementationName() + public String getImplementationName() { return m_sImplementationName; } - public boolean supportsService( String sService ) + public boolean supportsService( String sService ) { int len = m_pServiceNames.length; - for( int i=0; i < len; i++ ) + for( int i=0; i < len; i++ ) { if ( sService.equals( m_pServiceNames[i] )) return true; @@ -217,7 +217,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase return false; } - public String[] getSupportedServiceNames() + public String[] getSupportedServiceNames() { return m_pServiceNames; } @@ -246,12 +246,12 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase m_xControlContainer = (XControlContainer)UnoRuntime.queryInterface( XControlContainer.class, m_xDialog ); m_aSettings = Settings.getSettings( m_xContext ); - m_aSettings.loadConfiguration(); // throw away all the noncommited changes + m_aSettings.loadConfiguration(); // throw away all the noncommited changes InitStrings(); } else if ( m_aSettings != null ) m_aSettings.loadConfiguration(); // throw away all the noncommited changes - + RefreshView(); CheckButtonState(); } @@ -283,7 +283,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase { CheckButtonState(); } - + return true; } |