Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

4 files changed, 7 insertions, 7 deletions

diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 1e10f902cf2a..e1f3156485e9 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -262,7 +262,7 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
         {
             xRet = xContext->getAccessibleChild( nChildIndex );
         }
-        catch( lang::IndexOutOfBoundsException& )
+        catch (const lang::IndexOutOfBoundsException&)
         {
             OSL_FAIL( "implGetHeaderBar - wrong child index" );
         }
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 4c2c5d130582..70976a1494eb 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -360,7 +360,7 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
         {
             xRet = xContext->getAccessibleChild( nChildIndex );
         }
-        catch( lang::IndexOutOfBoundsException& )
+        catch (const lang::IndexOutOfBoundsException&)
         {
             OSL_FAIL( "implGetHeaderBar - wrong child index" );
         }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 3dbe462c227a..622ef04664c9 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -305,7 +305,7 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException)
     {
         m_xDocument->changeParagraphSelection(this, 0, 0);
     }
-    catch (::css::lang::IndexOutOfBoundsException & rEx)
+    catch (const ::css::lang::IndexOutOfBoundsException & rEx)
     {
         OSL_TRACE(
             "textwindowaccessibility.cxx: ParagraphImpl::grabFocus:"
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
index 44638b099edc..1820f4e57f6c 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
@@ -174,17 +174,17 @@ public class StateSetView
             }
 
             // Draw string of set states.
-            String sStates = new String ();
+            StringBuffer sStates = new StringBuffer ();
             for (int i=0; i<aStates.length; i++)
             {
                 if (i > 0)
-                    sStates = sStates + ", ";
-                sStates = sStates + NameProvider.getStateName(aStates[i]);
+                    sStates.append(", ");
+                sStates.append(NameProvider.getStateName(aStates[i]));
             }
             g.setTransform (aTransform);
             g.translate (10,aWidgetArea.y+aWidgetArea.height-3);
             g.scale (0.9,0.9);
-            g.drawString (sStates,0,0);
+            g.drawString (sStates.toString(),0,0);
         }
     }