[Libreoffice-commits] core.git: 5 commits - connectivity/source cppu/source desktop/source qadevOOo/tests solenv/gbuild
Stephan Bergmann
sbergman at redhat.com
Thu Aug 22 05:56:05 PDT 2013
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 5
cppu/source/uno/lbmap.cxx | 5
desktop/source/offacc/acceptor.cxx | 74 ++++------
desktop/source/offacc/acceptor.hxx | 12 -
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java | 2
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java | 2
qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java | 2
qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java | 2
qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java | 2
qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScCellsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScChartObj.java | 2
qadevOOo/tests/java/mod/_sc/ScChartsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java | 2
qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java | 2
qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java | 2
qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java | 2
qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java | 2
qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java | 2
qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java | 2
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java | 2
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScModelObj.java | 4
qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java | 2
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScScenariosObj.java | 2
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java | 2
qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java | 2
qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java | 2
qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java | 2
qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java | 2
qadevOOo/tests/java/mod/_sc/ScStyleObj.java | 2
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java | 2
qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTabViewObj.java | 4
qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java | 2
qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java | 2
qadevOOo/tests/java/mod/_sc/ScTableRowObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java | 2
qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java | 2
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java | 2
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java | 2
qadevOOo/tests/java/mod/_sc/XMLContentImporter.java | 2
qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java | 2
qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java | 2
qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java | 2
solenv/gbuild/CppunitTest.mk | 1
111 files changed, 154 insertions(+), 167 deletions(-)
New commits:
commit 34ff95a4e11d9b81e3258eb451ece7e201c3657d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 22 14:38:32 2013 +0200
At least CppunitTest_connectivity_ado requires the affine_uno bridge
Change-Id: I15b7069e2c7362b9554bf0f869d7c922895a6466
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 7ab9259..fb36b1b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -160,6 +160,7 @@ define gb_CppunitTest_use_ure
$(call gb_CppunitTest_use_rdb,$(1),ure/services)
$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,affine_uno)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unobootstrapprotector)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexceptionprotector)
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper_unorc)
commit cb327052cbf1a4deab6285b1318dec8d1c3c4d90
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 22 14:38:01 2013 +0200
Better assertions
Change-Id: I4ba11570328e17abdf063049065b4fc6dcc65a9d
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 6b8e152..9b4204c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -24,6 +24,7 @@
#include <boost/unordered_map.hpp>
#include <set>
#include <algorithm>
+#include <cassert>
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.hxx"
@@ -571,7 +572,9 @@ void SAL_CALL uno_getMapping(
rtl_uString * pAddPurpose )
SAL_THROW_EXTERN_C()
{
- OSL_ENSURE( ppMapping && pFrom && pTo, "### null ptr!" );
+ assert(ppMapping != 0);
+ assert(pFrom != 0);
+ assert(pTo != 0);
if (*ppMapping)
{
(*(*ppMapping)->release)( *ppMapping );
commit 77dc93ddeaee5ee73c7b0afe49da7d699fe62e23
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 22 14:33:51 2013 +0200
What's it with all those *static* XSpreadsheetDocument instances?
...appears to be completely unnecessary, and maybe this helps fix some obscure
DispsedException failures in JunitTest_sc_unoapi (not ones resulting from a
crashed soffice.bin, but "genuine" ones happening when chasing
util.AccessibilityTools.getAccessibleObjectForRole).
Change-Id: I127940e9a2a9784d01255307b60614d53c86436f
diff --git a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
index ac90e5b..c4808d0 100644
--- a/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java
@@ -52,7 +52,7 @@ import com.sun.star.util.XURLTransformer;
public class AccessibleEditableTextPara_PreviewCell extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
@@ -177,4 +177,4 @@ public class AccessibleEditableTextPara_PreviewCell extends TestCase {
System.out.println("While waiting :" + e);
}
}
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
index aabc77c..62d6acb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java
@@ -72,7 +72,7 @@ import com.sun.star.uno.XInterface;
*/
public class ScAccessibleCell extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Called to create an instance of <code>TestEnvironment</code>
@@ -182,4 +182,4 @@ public class ScAccessibleCell extends TestCase {
XComponent oComp = UnoRuntime.queryInterface (XComponent.class, xSpreadsheetDoc) ;
util.DesktopTools.closeDoc(oComp);
}
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
index 4c6c647..2b29031 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java
@@ -69,7 +69,7 @@ import com.sun.star.util.XURLTransformer;
*/
public class ScAccessibleDocumentPagePreview extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Called to create an instance of <code>TestEnvironment</code>
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
index 734c855..fb18312 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java
@@ -73,7 +73,7 @@ import com.sun.star.util.XURLTransformer;
*/
public class ScAccessiblePageHeader extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Called to create an instance of <code>TestEnvironment</code>
@@ -262,4 +262,4 @@ public class ScAccessiblePageHeader extends TestCase {
throw new StatusException( "Couldn't create document ", e );
}
}
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
index 3d3a8c0..dacfad8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java
@@ -70,7 +70,7 @@ import com.sun.star.util.XURLTransformer;
*/
public class ScAccessiblePageHeaderArea extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Called to create an instance of <code>TestEnvironment</code>
@@ -213,4 +213,4 @@ public class ScAccessiblePageHeaderArea extends TestCase {
throw new StatusException( "Couldn't create document ", e );
}
}
-}
\ No newline at end of file
+}
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index e740ca6..08588f8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -76,7 +76,7 @@ import com.sun.star.util.XURLTransformer;
* @see ifc.accessibility._XAccessibleTable
*/
public class ScAccessiblePreviewCell extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
index 134433d..54c5e93 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java
@@ -79,7 +79,7 @@ import util.PropertyName;
* @see ifc.accessibility._XAccessibleTable
*/
public class ScAccessiblePreviewTable extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
index 18ddab6..09e98c9 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java
@@ -67,7 +67,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.accessibility._XAccessibleTable
*/
public class ScAccessibleSpreadsheet extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
index fb61f60..d0b5952 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java
@@ -63,7 +63,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XSheetAnnotation
*/
public class ScAnnotationObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
index 4daf692..8e84f4e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java
@@ -69,7 +69,7 @@ import util.InstCreator;
* @see ifc.sheet._XSheetAnnotation
*/
public class ScAnnotationShapeObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates a spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
index 11171c8..f2ac410 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java
@@ -60,7 +60,7 @@ import com.sun.star.uno.XInterface;
*/
public class ScAnnotationTextCursor extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
protected void initialize( TestParameters tParam, PrintWriter log ) {
SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() );
diff --git a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
index 17cfffc..28f9bff 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XSheetAnnotations
*/
public class ScAnnotationsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
index 563bd6b..cc2863c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java
@@ -63,7 +63,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScAreaLinkObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
index 74f02ca..d0bee62 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see com.sun.star.sheet.CellAreaLinks
*/
public class ScAreaLinksObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
index 58c0510..d4dc3c8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAutoFormatsObj.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XNameContainer
*/
public class ScAutoFormatsObj extends TestCase{
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static SOfficeFactory SOF = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
index be5780c..eb38052 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java
@@ -98,7 +98,7 @@ import ifc.sheet._XCellRangesQuery;
* @see ifc.table._XColumnRowRange
*/
public class ScCellCursorObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java
index 2d9cfaf..3b182eb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.text._TextContent
*/
public class ScCellFieldObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java
index 4daecc7..3fd0285 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScCellFieldsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
index f194c7a..9c0aacd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java
@@ -51,7 +51,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XEnumeration
*/
public class ScCellFormatsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
index 361160c..c9a846d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java
@@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScCellFormatsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellObj.java b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
index c29dbc3..a9ad532 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellObj.java
@@ -80,7 +80,7 @@ import ifc.sheet._XCellRangesQuery;
* @see ifc.sheet._XCellAddressable
*/
public class ScCellObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
index 32916c7..d14f904 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java
@@ -83,7 +83,7 @@ import ifc.sheet._XCellRangesQuery;
* @see ifc.container._XNameAccess
*/
public class ScCellRangesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
index 27d2781..83f683f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java
@@ -60,7 +60,7 @@ import com.sun.star.util.XSearchable;
* @see ifc.util._XReplaceDescriptor
*/
public class ScCellSearchObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
index 3632ce3..906e7dd 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java
@@ -89,7 +89,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.style._CharacterPropertiesAsian
*/
public class ScCellTextCursor extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
index 6bc3158..7ce9e70 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java
@@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XEnumeration
*/
public class ScCellsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
index 4680ed5..9321a2a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
@@ -56,7 +56,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScCellsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartObj.java b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
index 5004635..74f7ddc 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartObj.java
@@ -63,7 +63,7 @@ import com.sun.star.uno.UnoRuntime;
* @see ifc.document._XEmbeddedObjectSupplier
*/
public class ScChartObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
index ed22161..a28e3f8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScChartsObj.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.UnoRuntime;
* @see ifc.table._XTableCharts
*/
public class ScChartsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
index 63061be..d356194 100644
--- a/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScConsolidationDescriptor.java
@@ -45,7 +45,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XConsolidationDescriptor
*/
public class ScConsolidationDescriptor extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java
index 6e69385..710944b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java
@@ -60,7 +60,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XDDELink
*/
public class ScDDELinkObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static XComponent oDoc = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java
index 58c2bd0..4232520 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java
@@ -58,7 +58,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScDDELinksObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static XComponent oDoc = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
index cc0a6cc..af45fc4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java
@@ -51,7 +51,7 @@ import util.SOfficeFactory;
public class ScDataPilotFieldGroupItemObj extends TestCase
{
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
index b3462fb..ff38753 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java
@@ -50,7 +50,7 @@ import util.SOfficeFactory;
public class ScDataPilotFieldGroupObj extends TestCase
{
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
index 59fa43e..76c61d4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java
@@ -50,7 +50,7 @@ import util.SOfficeFactory;
public class ScDataPilotFieldGroupsObj extends TestCase
{
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
index 1219e53..7b01294 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java
@@ -64,7 +64,7 @@ import util.SOfficeFactory;
* @see ifc.beans._XPropertySet
*/
public class ScDataPilotFieldObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
index 2b5573e..b5c8477 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java
@@ -57,7 +57,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScDataPilotFieldsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
index bce5155..4089f9e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java
@@ -65,7 +65,7 @@ import util.SOfficeFactory;
* @see ifc.beans._XPropertySet
*/
public class ScDataPilotItemObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
index fb2aa6d..79f5462 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java
@@ -65,7 +65,7 @@ import util.SOfficeFactory;
* @see ifc.beans._XPropertySet
*/
public class ScDataPilotItemsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
index 19ee1dc..004089c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
@@ -63,7 +63,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XDataPilotDescriptor
*/
public class ScDataPilotTableObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
index 9ff3ebb..d4d0687 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java
@@ -60,7 +60,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScDataPilotTablesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
index 9930c0f..e648da0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java
@@ -70,7 +70,7 @@ import util.SOfficeFactory;
* @see ifc.sheet._XCellRangeReferrer
*/
public class ScDatabaseRangeObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
index f60cd16..eb1ce5f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java
@@ -55,7 +55,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScDatabaseRangesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java
index e444bf2..ef0ec4a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java
@@ -34,7 +34,7 @@ import util.SOfficeFactory;
public class ScDocumentConfiguration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
protected void initialize(TestParameters tParam, PrintWriter log) {
// get a soffice factory object
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
index 77692ad..48d8a0b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.XInterface;
public class ScDrawPageObj extends TestCase {
- static XSpreadsheetDocument xDoc = null;
+ private XSpreadsheetDocument xDoc = null;
/**
* Creates a new Draw document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
index f25557e..3b55e34 100644
--- a/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScDrawPagesObj.java
@@ -58,7 +58,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.drawing._XDrawPages
*/
public class ScDrawPagesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
index f4cfa85..01e2f0c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
@@ -56,7 +56,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScFilterDescriptorBase extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java
index 7fdf6c5..e68494c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java
@@ -35,7 +35,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScFunctionDescriptionObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
protected void initialize( TestParameters tParam, PrintWriter log ) {
SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) tParam.getMSF() );
diff --git a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java
index 6aa9555..9f25a78 100644
--- a/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java
@@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScFunctionListObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java
index 799088e..7b28aa4 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java
@@ -66,7 +66,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.text._TextContent
*/
public class ScHeaderFieldObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java
index 6d2c59a..b6d6500 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java
@@ -62,7 +62,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScHeaderFieldsObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
index 88e01a4..a6e48bb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java
@@ -52,7 +52,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XHeaderFooterContent
*/
public class ScHeaderFooterContentObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
index 007855f..193b944 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java
@@ -91,7 +91,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.style._CharacterPropertiesAsian
*/
public class ScHeaderFooterTextCursor extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
index a937ead..500a46e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java
@@ -80,7 +80,7 @@ import com.sun.star.uno.XInterface;
*/
public class ScHeaderFooterTextObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
index c01426e..f17a49d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java
@@ -42,7 +42,7 @@ import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_CellAnnotationsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
index 96df8bc..8ec3af2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java
@@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_CellAreaLinksEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
index 0abfc03..87fc4fc 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_DDELinksEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static XComponent oDoc = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
index dfdd517..b817c03 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java
@@ -44,7 +44,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_DataPilotFieldsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
index 59b9773..20d537d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java
@@ -67,7 +67,7 @@ import util.SOfficeFactory;
*/
public class ScIndexEnumeration_DataPilotItemsEnumeration
extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* A field is filled some values. This integer determines the size of the
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
index eedc7b1..fc4fa34 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java
@@ -44,7 +44,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_DataPilotTablesEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
index 900c520..445d0da 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DatabaseRangesEnumeration.java
@@ -40,7 +40,7 @@ import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_DatabaseRangesEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java
index b877bd7..d07a550 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java
@@ -34,7 +34,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_FunctionDescriptionEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
index ff9542e..c9f0cad 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java
@@ -37,7 +37,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_LabelRangesEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
index 9d9e2cd..13113ef 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java
@@ -38,7 +38,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_NamedRangesEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
index 4b4960e..61e433b 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_ScenariosEnumeration extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
index 191b45c..228d4f3 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java
@@ -40,7 +40,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SheetCellRangesEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
index 261739a..56fba51 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SheetLinksEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
index 162d677..3ee20b7 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java
@@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SpreadsheetViewPanesEnumeration extends TestCase {
- private static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
private static SOfficeFactory SOF;
private static XInterface oObj;
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
index 88d9d2c..274530e 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetsEnumeration.java
@@ -35,7 +35,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SpreadsheetsEnumeration extends TestCase {
- private static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
index dd7dd1b..719a42c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_SubTotalFieldsEnumeration extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
index ae1fea9..7ecb07a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java
@@ -34,7 +34,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_TableAutoFormatEnumeration extends TestCase{
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static SOfficeFactory SOF = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
index 3b7914f..accf5ec 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java
@@ -46,7 +46,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_TableChartsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
index ab649f7..3d374c6 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_TableColumnsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
index 3a0590d..071a43d 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java
@@ -45,7 +45,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_TableConditionalEntryEnumeration extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
index c5f3106..ae6760c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
public class ScIndexEnumeration_TableRowsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
index ad29b9b..636c53f 100644
--- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java
@@ -54,7 +54,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XEnumeration
*/
public class ScIndexEnumeration_TextFieldEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
index d6352d3..ab5eb30 100644
--- a/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java
@@ -50,7 +50,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XLabelRange
*/
public class ScLabelRangeObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
index 5b2a927..bd0a3b1 100644
--- a/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java
@@ -53,7 +53,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScLabelRangesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScModelObj.java b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
index acf60b4..3454ab2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScModelObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScModelObj.java
@@ -75,8 +75,8 @@ import util.utils;
* @see ifc.beans._XPropertySet
*/
public class ScModelObj extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
- public static XSpreadsheetDocument xSecondsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSecondsheetDoc;
/**
* Disposes Spreadsheet documents.
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
index 4de0b49..5c62bf5 100644
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java
@@ -56,7 +56,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XCellRangeReferrer
*/
public class ScNamedRangeObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
index f56e6f3..3edeab8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScNamedRangesObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java
index f8ebe1b..2d9dc25 100644
--- a/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java
@@ -45,7 +45,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XRecentFunctions
*/
public class ScRecentFunctionsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
index cb1d422..6c07364 100644
--- a/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScScenariosObj.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XScenarios
*/
public class ScScenariosObj extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
index 94cd1fc..7ffd6e3 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java
@@ -66,7 +66,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScSheetLinkObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
index d069c9f..eda9b1c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java
@@ -54,7 +54,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XElementAccess
*/
public class ScSheetLinksObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
index 128aba4..6fe0e42 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java
@@ -45,7 +45,7 @@ import com.sun.star.util.XSortable;
*/
public class ScSortDescriptorBase extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* in general this method creates a testdocument
diff --git a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
index 495f46a..32f2422 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettingsObj.java
@@ -46,7 +46,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScSpreadsheetSettingsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
index 28ae5ef..f0e175c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamiliesObj.java
@@ -51,7 +51,7 @@ import com.sun.star.uno.UnoRuntime;
* @see ifc.container._XIndexAccess
*/
public class ScStyleFamiliesObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
index 9e97bd7..65cd108 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java
@@ -62,7 +62,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XNameReplace
*/
public class ScStyleFamilyObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
index 9707e0e..bc478e2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScStyleObj.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.style._XStyle
*/
public class ScStyleObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
index 5139fa4..b331e70 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScSubTotalDescriptorBase extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
index c6af56c..2d605e2 100644
--- a/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java
@@ -54,7 +54,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XSubTotalField
*/
public class ScSubTotalFieldObj extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
index 05d2a2a..a23baf8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTabViewObj.java
@@ -84,8 +84,8 @@ import com.sun.star.uno.XInterface;
* @see ifc.view._XSelectionSupplier
*/
public class ScTabViewObj extends TestCase {
- public static XSpreadsheetDocument xSpreadsheetDoc;
- public static XSpreadsheetDocument xSpreadsheetDoc2;
+ private XSpreadsheetDocument xSpreadsheetDoc;
+ private XSpreadsheetDocument xSpreadsheetDoc2;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
index c8a4aa2..5c0f202 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java
@@ -60,7 +60,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScTableColumnObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
index 422d9f7..5690f6c 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java
@@ -61,7 +61,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.table._XTableColumns
*/
public class ScTableColumnsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
index d6210dd..68bed142 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java
@@ -59,7 +59,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XSheetCondition
*/
public class ScTableConditionalEntry extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
index f54792e..d100033 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.XInterface;
*/
public class ScTableConditionalFormat extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
index f6f5518..5cbb345 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableRowObj.java
@@ -57,7 +57,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.beans._XPropertySet
*/
public class ScTableRowObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
index 0983a26..a10d1e0 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java
@@ -121,7 +121,7 @@ import util.ValueComparer;
* @see ifc.table._XColumnRowRange
*/
public class ScTableSheetObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
index dcf0221..5cf9a0a 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java
@@ -61,7 +61,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.container._XNameContainer
*/
public class ScTableSheetsObj extends TestCase {
- private static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
index a3cc608..255eb34 100644
--- a/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java
@@ -55,7 +55,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.sheet._XSheetCondition
*/
public class ScTableValidationObj extends TestCase {
- static XSpreadsheetDocument xSpreadsheetDoc = null;
+ private XSpreadsheetDocument xSpreadsheetDoc = null;
/**
* Creates Spreadsheet document.
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
index 4206440..a6e2696 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
@@ -41,7 +41,7 @@ import util.SOfficeFactory;
public class ScUniqueCellFormatsEnumeration extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static XSpreadsheet oSheet = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
index 03e4671..db5b754 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
@@ -40,7 +40,7 @@ import util.SOfficeFactory;
public class ScUniqueCellFormatsObj extends TestCase {
- static XSpreadsheetDocument xSheetDoc = null;
+ private XSpreadsheetDocument xSheetDoc = null;
static XSpreadsheet oSheet = null;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java
index ce24562..184448e 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLContentImporter.java
@@ -61,7 +61,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.xml.sax._XDocumentHandler
*/
public class XMLContentImporter extends TestCase {
- static XSpreadsheetDocument xSheetDoc;
+ private XSpreadsheetDocument xSheetDoc;
static XComponent comp ;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java
index 5f3ecca..b35a5a7 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java
@@ -62,7 +62,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.xml.sax._XDocumentHandler
*/
public class XMLMetaImporter extends TestCase {
- static XSpreadsheetDocument xSheetDoc;
+ private XSpreadsheetDocument xSheetDoc;
static XComponent comp ;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java
index 5fadc74..cbde1ca 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java
@@ -63,7 +63,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.xml.sax._XDocumentHandler
*/
public class XMLSettingsImporter extends TestCase {
- static XSpreadsheetDocument xSheetDoc;
+ private XSpreadsheetDocument xSheetDoc;
static XComponent comp ;
/**
diff --git a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java
index 0d6ab7d..81c87c1 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java
@@ -62,7 +62,7 @@ import com.sun.star.uno.XInterface;
* @see ifc.xml.sax._XDocumentHandler
*/
public class XMLStylesImporter extends TestCase {
- static XSpreadsheetDocument xSheetDoc;
+ private XSpreadsheetDocument xSheetDoc;
static XComponent comp ;
/**
commit e485b16078efd3ca7d13fa8a4ea1a7d52da7daf3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 22 11:03:55 2013 +0200
Various desktop::Acceptor clean up
Change-Id: Idcb41f8b83863ac1d37ea47a8bb61901f3bc7e06
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 9266f56..194d32e 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
#include "acceptor.hxx"
#include <com/sun/star/bridge/BridgeFactory.hpp>
@@ -26,7 +27,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
-using namespace ::osl;
using namespace css::bridge;
using namespace css::connection;
using namespace css::container;
@@ -41,15 +41,10 @@ extern "C" void offacc_workerfunc (void * acc)
((Acceptor*)acc)->run();
}
-Mutex Acceptor::m_aMutex;
-
Acceptor::Acceptor( const Reference< XComponentContext >& rxContext )
: m_thread(NULL)
, m_rContext(rxContext)
- , m_aAcceptString()
- , m_aConnectString()
- , m_aProtocol()
- , m_bInit(sal_False)
+ , m_bInit(false)
, m_bDying(false)
{
m_rAcceptor = css::connection::Acceptor::create(m_rContext);
@@ -76,30 +71,29 @@ Acceptor::~Acceptor()
osl::MutexGuard g(m_aMutex);
}
for (;;) {
- com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > b(
- m_bridges.remove());
+ css::uno::Reference< css::bridge::XBridge > b(m_bridges.remove());
if (!b.is()) {
break;
}
- com::sun::star::uno::Reference< com::sun::star::lang::XComponent >(
- b, com::sun::star::uno::UNO_QUERY_THROW)->dispose();
+ css::uno::Reference< css::lang::XComponent >(
+ b, css::uno::UNO_QUERY_THROW)->dispose();
}
}
-void SAL_CALL Acceptor::run()
+void Acceptor::run()
{
- while ( m_rAcceptor.is() )
+ SAL_INFO( "desktop.offacc", "Acceptor::run" );
+ for (;;)
{
- SAL_INFO( "desktop.offacc", "desktop (lo119109) Acceptor::run" );
try
{
// wait until we get enabled
- SAL_INFO( "desktop.offacc", "desktop (lo119109)"\
+ SAL_INFO( "desktop.offacc",
"Acceptor::run waiting for office to come up");
m_cEnable.wait();
if (m_bDying) //see destructor
break;
- SAL_INFO( "desktop.offacc", "desktop (lo119109)"\
+ SAL_INFO( "desktop.offacc",
"Acceptor::run now enabled and continuing");
// accept connection
@@ -108,16 +102,16 @@ void SAL_CALL Acceptor::run()
// is destructed so we break out of the run method terminating the thread
if (! rConnection.is()) break;
OUString aDescription = rConnection->getDescription();
- SAL_INFO( "desktop.offacc", "desktop (lo119109) Acceptor::run connection " << aDescription );
+ SAL_INFO( "desktop.offacc", "Acceptor::run connection " << aDescription );
// create instanceprovider for this connection
Reference< XInstanceProvider > rInstanceProvider(
- (XInstanceProvider*)new AccInstanceProvider(m_rContext, rConnection));
+ new AccInstanceProvider(m_rContext, rConnection));
// create the bridge. The remote end will have a reference to this bridge
// thus preventing the bridge from being disposed. When the remote end releases
// the bridge, it will be destructed.
Reference< XBridge > rBridge = m_rBridgeFactory->createBridge(
- OUString() ,m_aProtocol ,rConnection ,rInstanceProvider );
+ "", m_aProtocol, rConnection, rInstanceProvider);
osl::MutexGuard g(m_aMutex);
m_bridges.add(rBridge);
} catch (const Exception& e) {
@@ -130,14 +124,14 @@ void SAL_CALL Acceptor::run()
}
// XInitialize
-void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
+void Acceptor::initialize( const Sequence<Any>& aArguments )
throw( Exception )
{
// prevent multiple initialization
- ClearableMutexGuard aGuard( m_aMutex );
- SAL_INFO( "desktop.offacc", "destop (lo119109) Acceptor::initialize()" );
+ osl::ClearableMutexGuard aGuard( m_aMutex );
+ SAL_INFO( "desktop.offacc", "Acceptor::initialize()" );
- sal_Bool bOk = sal_False;
+ bool bOk = false;
// arg count
int nArgs = aArguments.getLength();
@@ -145,33 +139,33 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
// not yet initialized and acceptstring
if (!m_bInit && nArgs > 0 && (aArguments[0] >>= m_aAcceptString))
{
- SAL_INFO( "desktop.offacc", "desktop (lo119109) Acceptor::initialize string=" << m_aAcceptString );
+ SAL_INFO( "desktop.offacc", "Acceptor::initialize string=" << m_aAcceptString );
// get connect string and protocol from accept string
// "<connectString>;<protocol>"
- sal_Int32 nIndex1 = m_aAcceptString.indexOf( (sal_Unicode) ';' );
+ sal_Int32 nIndex1 = m_aAcceptString.indexOf( ';' );
if (nIndex1 < 0) throw IllegalArgumentException(
OUString("Invalid accept-string format"), m_rContext, 1);
m_aConnectString = m_aAcceptString.copy( 0 , nIndex1 ).trim();
nIndex1++;
- sal_Int32 nIndex2 = m_aAcceptString.indexOf( (sal_Unicode) ';' , nIndex1 );
+ sal_Int32 nIndex2 = m_aAcceptString.indexOf( ';' , nIndex1 );
if (nIndex2 < 0) nIndex2 = m_aAcceptString.getLength();
m_aProtocol = m_aAcceptString.copy( nIndex1, nIndex2 - nIndex1 );
// start accepting in new thread...
m_thread = osl_createThread(offacc_workerfunc, this);
- m_bInit = sal_True;
- bOk = sal_True;
+ m_bInit = true;
+ bOk = true;
}
// do we want to enable accepting?
- sal_Bool bEnable = sal_False;
+ bool bEnable = false;
if (((nArgs == 1 && (aArguments[0] >>= bEnable)) ||
(nArgs == 2 && (aArguments[1] >>= bEnable))) &&
bEnable )
{
m_cEnable.set();
- bOk = sal_True;
+ bOk = true;
}
if (!bOk)
@@ -182,28 +176,22 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
}
// XServiceInfo
-const sal_Char *Acceptor::serviceName = "com.sun.star.office.Acceptor";
-const sal_Char *Acceptor::implementationName = "com.sun.star.office.comp.Acceptor";
-const sal_Char *Acceptor::supportedServiceNames[] = {"com.sun.star.office.Acceptor", NULL};
OUString Acceptor::impl_getImplementationName()
{
- return OUString::createFromAscii( implementationName );
+ return OUString("com.sun.star.office.comp.Acceptor");
}
-OUString SAL_CALL Acceptor::getImplementationName()
+OUString Acceptor::getImplementationName()
throw (RuntimeException)
{
return Acceptor::impl_getImplementationName();
}
Sequence<OUString> Acceptor::impl_getSupportedServiceNames()
{
- Sequence<OUString> aSequence;
- for (int i=0; supportedServiceNames[i]!=NULL; i++) {
- aSequence.realloc(i+1);
- aSequence[i]=(OUString::createFromAscii(supportedServiceNames[i]));
- }
+ Sequence<OUString> aSequence(1);
+ aSequence[0] = "com.sun.star.office.Acceptor";
return aSequence;
}
-Sequence<OUString> SAL_CALL Acceptor::getSupportedServiceNames()
+Sequence<OUString> Acceptor::getSupportedServiceNames()
throw (RuntimeException)
{
return Acceptor::impl_getSupportedServiceNames();
@@ -236,7 +224,7 @@ AccInstanceProvider::~AccInstanceProvider()
{
}
-Reference<XInterface> SAL_CALL AccInstanceProvider::getInstance (const OUString& aName )
+Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
throw ( NoSuchElementException )
{
@@ -275,7 +263,7 @@ extern "C"
{
using namespace desktop;
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *)
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL offacc_component_getFactory(char const *pImplementationName, void *pServiceManager, void *)
{
void* pReturn = NULL ;
if ( pImplementationName && pServiceManager )
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index a34d310..8556c9c 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.h>
@@ -43,11 +45,7 @@ class Acceptor
: public ::cppu::WeakImplHelper2<css::lang::XServiceInfo, css::lang::XInitialization>
{
private:
- static const sal_Char *serviceName;
- static const sal_Char *implementationName;
- static const sal_Char *supportedServiceNames[];
-
- static ::osl::Mutex m_aMutex;
+ osl::Mutex m_aMutex;
oslThread m_thread;
comphelper::WeakBag< com::sun::star::bridge::XBridge > m_bridges;
@@ -62,14 +60,14 @@ private:
OUString m_aConnectString;
OUString m_aProtocol;
- sal_Bool m_bInit;
+ bool m_bInit;
bool m_bDying;
public:
Acceptor( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~Acceptor();
- void SAL_CALL run();
+ void run();
// XService info
static OUString impl_getImplementationName();
commit f1b5c883cb00210055abb7ddccf94d9736089234
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 22 10:05:55 2013 +0200
No need currently for static oslThread m_Mozilla_UI_Thread
...though the real fix of course would be to keep the oslThread around to join
it later.
Change-Id: I604431cd59e623a7ec97734800136464fd272802
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index f432f33..7b04194 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -42,7 +42,6 @@ static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static oslThread m_Mozilla_UI_Thread;
static PRBool aLive=1;
static ::osl::Condition m_aUI_Thread_Condition;
@@ -286,9 +285,7 @@ sal_Bool MNS_Init(sal_Bool& aProfileExists)
args->bProfileExists = &aProfileExists;
m_aUI_Thread_Condition.reset();
- m_Mozilla_UI_Thread=osl_createThread(MNS_Mozilla_UI_Thread,
- (void*)args);
- if (!m_Mozilla_UI_Thread)
+ if (osl_createThread(MNS_Mozilla_UI_Thread, (void*)args) == 0)
{
return sal_False;
}
More information about the Libreoffice-commits
mailing list