[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/openoffice.org/FC-4 openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.nostlport.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, NONE, 1.1
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/openoffice.org/FC-4 openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.nostlport.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, NONE, 1.1
- Date: Thu, 14 Jul 2005 04:16:17 -0400
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3142
Added Files:
openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
openoffice.org-1.9.114.oooXXXXX.nostlport.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
Log Message:
more new ones
openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch:
hsqldb_1_8_0 |21393 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 21393 insertions(+)
--- NEW FILE openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch ---
Index: hsqldb_1_8_0
===================================================================
RCS file: /cvs/external/hsqldb/hsqldb_1_8_0,v
retrieving revision 1.5
diff -u -p -r1.5 hsqldb_1_8_0
--- openoffice.org.orig/hsqldb/hsqldb_1_8_0 27 Jun 2005 08:26:33 -0000 1.5
+++ openoffice.org/hsqldb/hsqldb_1_8_0 30 Jun 2005 08:02:23 -0000
@@ -46,3 +46,21396 @@ Files misc/hsqldb/lib/hsqldb.jar and mis
}
properties.setProperty(HsqlDatabaseProperties.db_version,
+diff -cr misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java
+*** misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java 2005-06-30 03:53:38.000000000 -0400
+***************
+*** 83,91 ****
+ */
+ abstract class BaseMemoryNode extends Node {
+
+! protected Node nLeft;
+! protected Node nRight;
+! protected Node nParent;
+
+ void delete() {
+ iBalance = -2;
+--- 83,91 ----
+ */
+ abstract class BaseMemoryNode extends Node {
+
+! public Node nLeft;
+! public Node nRight;
+! public Node nParent;
+
+ void delete() {
+ iBalance = -2;
+diff -cr misc/hsqldb/src/org/hsqldb/CachedRow.java misc/build/hsqldb/src/org/hsqldb/CachedRow.java
+*** misc/hsqldb/src/org/hsqldb/CachedRow.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/CachedRow.java 2005-06-30 03:53:38.000000000 -0400
+***************
+*** 99,111 ****
+ static final int NO_POS = -1;
+
+ //
+! protected Table tTable;
+ int storageSize;
+
+ /**
+ * Flag indicating unwritten data.
+ */
+! protected boolean hasDataChanged;
+
+ /**
+ * Flag indicating Node data has changed.
+--- 99,111 ----
+ static final int NO_POS = -1;
+
+ //
+! public Table tTable;
+ int storageSize;
+
+ /**
+ * Flag indicating unwritten data.
+ */
+! public boolean hasDataChanged;
+
+ /**
+ * Flag indicating Node data has changed.
+***************
+*** 173,179 ****
+ oData = in.readData(tTable.getColumnTypes());
+ }
+
+! private void readRowInfo(RowInputInterface in)
+ throws IOException, HsqlException {
+
+ // for use when additional transaction info is attached to rows
+--- 173,179 ----
+ oData = in.readData(tTable.getColumnTypes());
+ }
+
+! public void readRowInfo(RowInputInterface in)
+ throws IOException, HsqlException {
+
+ // for use when additional transaction info is attached to rows
+***************
+*** 316,322 ****
+ } catch (IOException e) {}
+ }
+
+! private void writeRowInfo(RowOutputInterface out) {
+
+ // for use when additional transaction info is attached to rows
+ }
+--- 316,322 ----
+ } catch (IOException e) {}
+ }
+
+! public void writeRowInfo(RowOutputInterface out) {
+
+ // for use when additional transaction info is attached to rows
+ }
+***************
+*** 345,351 ****
+ * @throws IOException
+ * @throws HsqlException
+ */
+! private void writeNodes(RowOutputInterface out) throws IOException {
+
+ out.writeSize(storageSize);
+
+--- 345,351 ----
+ * @throws IOException
+ * @throws HsqlException
+ */
+! public void writeNodes(RowOutputInterface out) throws IOException {
+
+ out.writeSize(storageSize);
+
+diff -cr misc/hsqldb/src/org/hsqldb/Column.java misc/build/hsqldb/src/org/hsqldb/Column.java
+*** misc/hsqldb/src/org/hsqldb/Column.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/Column.java 2005-06-30 03:53:38.000000000 -0400
+***************
+*** 125,137 ****
+ // most variables are final but not declared so because of a bug in
+ // JDK 1.1.8 compiler
+ public HsqlName columnName;
+! private int colType;
+! private int colSize;
+! private int colScale;
+! private boolean isNullable;
+! private boolean isIdentity;
+! private boolean isPrimaryKey;
+! private Expression defaultExpression;
+ long identityStart;
+ long identityIncrement;
+ static final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
+--- 125,137 ----
+ // most variables are final but not declared so because of a bug in
+ // JDK 1.1.8 compiler
+ public HsqlName columnName;
+! public int colType;
+! public int colSize;
+! public int colScale;
+! public boolean isNullable;
+! public boolean isIdentity;
+! public boolean isPrimaryKey;
+! public Expression defaultExpression;
+ long identityStart;
+ long identityIncrement;
+ static final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
+***************
+*** 186,192 ****
+ }
+ }
+
+! private Column() {}
+
+ /**
+ * Used for primary key changes.
+--- 186,192 ----
+ }
+ }
+
+! public Column() {}
+
+ /**
+ * Used for primary key changes.
+***************
+*** 1206,1212 ****
+ * @return
+ * @throws HsqlException
+ */
+! private static Object convertString(String s,
+ int type) throws HsqlException {
+
+ switch (type) {
+--- 1206,1212 ----
+ * @return
+ * @throws HsqlException
+ */
+! public static Object convertString(String s,
+ int type) throws HsqlException {
+
+ switch (type) {
+diff -cr misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java
+*** misc/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/CompiledStatementExecutor.java 2005-06-30 03:53:38.000000000 -0400
+***************
+*** 54,62 ****
+ */
+ final class CompiledStatementExecutor {
+
+! private Session session;
+! private Result updateResult;
+! private Result emptyResult;
+
+ /**
+ * Creates a new instance of CompiledStatementExecutor.
+--- 54,62 ----
[...21005 lines suppressed...]
+ // answer -1, if the column is not part of any constraint
+! private int getConstraintIndex(int colIndex) {
+
+ for (int i = 0; i < imColIndex.length; i++) {
+ for (int j = 0; j < imColIndex[i].length; j++) {
+--- 864,870 ----
+
+ // answer the index of the constraint for the column index
+ // answer -1, if the column is not part of any constraint
+! public int getConstraintIndex(int colIndex) {
+
+ for (int i = 0; i < imColIndex.length; i++) {
+ for (int j = 0; j < imColIndex[i].length; j++) {
+***************
+*** 877,883 ****
+ return -1;
+ }
+
+! private void initGUI() {
+
+ Panel pEntry = new Panel();
+
+--- 877,883 ----
+ return -1;
+ }
+
+! public void initGUI() {
+
+ Panel pEntry = new Panel();
+
+***************
+*** 940,946 ****
+ }
+
+ // get and show the values of the actual row in the GUI
+! private void showAktRow() {
+
+ try {
+ pStmt.clearParameters();
+--- 940,946 ----
+ }
+
+ // get and show the values of the actual row in the GUI
+! public void showAktRow() {
+
+ try {
+ pStmt.clearParameters();
+diff -cr misc/hsqldb/src/org/hsqldb/View.java misc/build/hsqldb/src/org/hsqldb/View.java
+*** misc/hsqldb/src/org/hsqldb/View.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/View.java 2005-06-30 03:53:42.000000000 -0400
+***************
+*** 51,58 ****
+ Table workingTable;
+ Select viewSelect;
+ SubQuery viewSubQuery;
+! private String statement;
+! private HsqlName[] colList;
+
+ /** schema at the time of compilation */
+ HsqlName compileTimeSchema;
+--- 51,58 ----
+ Table workingTable;
+ Select viewSelect;
+ SubQuery viewSubQuery;
+! public String statement;
+! public HsqlName[] colList;
+
+ /** schema at the time of compilation */
+ HsqlName compileTimeSchema;
+diff -cr misc/hsqldb/src/org/hsqldb/WebServerConnection.java misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java
+*** misc/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-06-30 03:50:39.000000000 -0400
+--- misc/build/hsqldb/src/org/hsqldb/WebServerConnection.java 2005-06-30 03:53:42.000000000 -0400
+***************
+*** 76,95 ****
+ class WebServerConnection implements Runnable {
+
+ static final String ENCODING = "8859_1";
+! private Socket socket;
+! private WebServer server;
+! private static final int REQUEST_TYPE_BAD = 0;
+! private static final int REQUEST_TYPE_GET = 1;
+! private static final int REQUEST_TYPE_HEAD = 2;
+! private static final int REQUEST_TYPE_POST = 3;
+! private static final String HEADER_OK = "HTTP/1.0 200 OK";
+! private static final String HEADER_BAD_REQUEST =
+ "HTTP/1.0 400 Bad Request";
+! private static final String HEADER_NOT_FOUND = "HTTP/1.0 404 Not Found";
+! private static final String HEADER_FORBIDDEN = "HTTP/1.0 403 Forbidden";
+ static final int BUFFER_SIZE = 256;
+! private RowOutputBinary rowOut = new RowOutputBinary(BUFFER_SIZE);
+! private RowInputBinary rowIn = new RowInputBinary(rowOut);
+
+ //
+ static final byte[] BYTES_GET = "GET".getBytes();
+--- 76,95 ----
+ class WebServerConnection implements Runnable {
+
+ static final String ENCODING = "8859_1";
+! public Socket socket;
+! public WebServer server;
+! public static final int REQUEST_TYPE_BAD = 0;
+! public static final int REQUEST_TYPE_GET = 1;
+! public static final int REQUEST_TYPE_HEAD = 2;
+! public static final int REQUEST_TYPE_POST = 3;
+! public static final String HEADER_OK = "HTTP/1.0 200 OK";
+! public static final String HEADER_BAD_REQUEST =
+ "HTTP/1.0 400 Bad Request";
+! public static final String HEADER_NOT_FOUND = "HTTP/1.0 404 Not Found";
+! public static final String HEADER_FORBIDDEN = "HTTP/1.0 403 Forbidden";
+ static final int BUFFER_SIZE = 256;
+! public RowOutputBinary rowOut = new RowOutputBinary(BUFFER_SIZE);
+! public RowInputBinary rowIn = new RowInputBinary(rowOut);
+
+ //
+ static final byte[] BYTES_GET = "GET".getBytes();
+***************
+*** 101,107 ****
+ };
+
+ // default mime type mappings
+! private static final int hnd_content_types =
+ BundleHandler.getBundleHandle("content_types", null);
+
+ /**
+--- 101,107 ----
+ };
+
+ // default mime type mappings
+! public static final int hnd_content_types =
+ BundleHandler.getBundleHandle("content_types", null);
+
+ /**
+***************
+*** 125,131 ****
+ * @return a best-guess mime-type string using the file extention
+ * of the name argument.
+ */
+! private String getMimeTypeString(String name) {
+
+ int pos;
+ String key;
+--- 125,131 ----
+ * @return a best-guess mime-type string using the file extention
+ * of the name argument.
+ */
+! public String getMimeTypeString(String name) {
+
+ int pos;
+ String key;
+***************
+*** 240,246 ****
+ * POST is used only for database access. So we can assume the strings
+ * are those generated by HTTPClientConnection
+ */
+! private void processPost(InputStream inStream,
+ String name) throws HsqlException, IOException {
+
+ // fredt - parsing in this block is not actually necessary
+--- 240,246 ----
+ * POST is used only for database access. So we can assume the strings
+ * are those generated by HTTPClientConnection
+ */
+! public void processPost(InputStream inStream,
+ String name) throws HsqlException, IOException {
+
+ // fredt - parsing in this block is not actually necessary
+***************
+*** 350,356 ****
+ * @param name the name of the content to get
+ * @param send whether to send the content as well, or just the header
+ */
+! private void processGet(String name, boolean send) {
+
+ try {
+ String hdr;
+--- 350,356 ----
+ * @param name the name of the content to get
+ * @param send whether to send the content as well, or just the header
+ */
+! public void processGet(String name, boolean send) {
+
+ try {
+ String hdr;
+***************
+*** 452,458 ****
+ *
+ * @param code the error condition code
+ */
+! private void processError(int code) {
+
+ String msg;
+
+--- 452,458 ----
+ *
+ * @param code the error condition code
+ */
+! public void processError(int code) {
+
+ String msg;
+
openoffice.org-1.9.114.oooXXXXX.nostlport.patch:
dbaccess/source/core/api/RowSet.cxx | 17 ++-
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 24 ++---
dbaccess/source/core/api/RowSetCache.cxx | 14 +-
dbaccess/source/core/api/RowSetCacheIterator.cxx | 17 +--
dbaccess/source/core/api/RowSetCacheIterator.hxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 42 ++++----
dbaccess/source/ui/inc/indexcollection.hxx | 26 ++---
dbaccess/source/ui/misc/indexcollection.cxx | 40 ++++----
forms/source/xforms/propertysetbase.cxx | 2
forms/source/xforms/submission.cxx | 2
openoffice.org/stlport/systemstl/numeric | 80 +++++++++++++++++
scp2/source/ure/makefile.mk | 4
source/accessibility/AccessibleEmptyEditSource.cxx | 0
source/core/api/RowSet.cxx | 0
source/core/api/RowSet.hxx | 0
source/core/api/RowSetBase.cxx | 0
source/core/api/RowSetCache.cxx | 0
source/core/api/RowSetCacheIterator.cxx | 0
source/core/api/RowSetCacheIterator.hxx | 0
source/core/dataaccess/datasource.cxx | 0
source/filter/xml/xmlDataSource.cxx | 0
source/filter/xml/xmlTableFilterList.cxx | 0
source/ui/dlg/DbAdminImpl.cxx | 0
source/ui/dlg/indexdialog.cxx | 0
source/ui/inc/indexcollection.hxx | 0
source/ui/misc/indexcollection.cxx | 0
source/ure/makefile.mk | 0
source/xforms/propertysetbase.cxx | 0
source/xforms/submission.cxx | 0
stlport/makefile.mk | 1
stlport/systemstl/functional | 4
stlport/systemstl/rope | 2
stlport/systemstl/vector | 16 ---
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 4
systemstl/functional | 0
systemstl/rope | 0
systemstl/vector | 0
42 files changed, 198 insertions(+), 111 deletions(-)
--- NEW FILE openoffice.org-1.9.114.oooXXXXX.nostlport.patch ---
Index: source/core/api/RowSet.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSet.cxx,v
retrieving revision 1.133
diff -u -p -r1.133 RowSet.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSet.cxx 10 Mar 2005 16:30:55 -0000 1.133
+++ openoffice.org/dbaccess/source/core/api/RowSet.cxx 6 Jul 2005 14:09:56 -0000
@@ -370,6 +370,17 @@ ORowSet::ORowSet(const Reference< ::com:
m_aParameterRow.clear(); // because it was constructed with one element as default
}
+
+ORowSet::~ORowSet()
+{
+ if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
+ {
+ OSL_ENSURE(0, "Please check who doesn't dispose this component!");
+ osl_incrementInterlockedCount( &m_refCount );
+ dispose();
+ }
+}
+
// -----------------------------------------------------------------------------
Any ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
{
@@ -1152,7 +1163,7 @@ void SAL_CALL ORowSet::deleteRow( ) thr
notifyClonesRowDeleted(m_aBookmark);
m_aBookmark = Any();
- m_aCurrentRow = NULL;
+ m_aCurrentRow = ORowSetCacheIterator();
m_aCurrentRow.setBookmark(Any());
ORowSetNotifier aNotifier( this );
@@ -2511,7 +2522,7 @@ void ORowSet::checkUpdateIterator()
// -----------------------------------------------------------------------------
void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
{
- if(!m_pCache || columnIndex <= 0 || m_aCurrentRow == NULL || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
+ if(!m_pCache || columnIndex <= 0 || m_aCurrentRow.isNull() || m_aCurrentRow == m_pCache->getEnd() || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
throwFunctionSequenceException(*this);
}
// -----------------------------------------------------------------------------
@@ -2757,7 +2768,7 @@ void ORowSetClone::rowDeleted(const ::co
if(compareBookmarks(_rBookmark,m_aBookmark) == 0)
{
m_aBookmark = Any();
- m_aCurrentRow = NULL;
+ m_aCurrentRow = ORowSetCacheIterator();
m_aCurrentRow.setBookmark(Any());
}
}
Index: source/core/api/RowSet.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSet.hxx,v
retrieving revision 1.39
diff -u -p -r1.39 RowSet.hxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSet.hxx 10 Mar 2005 16:31:10 -0000 1.39
+++ openoffice.org/dbaccess/source/core/api/RowSet.hxx 6 Jul 2005 14:09:56 -0000
@@ -243,6 +243,8 @@ namespace dbaccess
virtual sal_Bool isModified( );
virtual sal_Bool isNew( );
+ virtual ~ORowSet();
+
public:
ORowSet(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
Index: source/core/api/RowSetBase.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetBase.cxx,v
retrieving revision 1.75
diff -u -p -r1.75 RowSetBase.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetBase.cxx 18 Mar 2005 10:05:00 -0000 1.75
+++ openoffice.org/dbaccess/source/core/api/RowSetBase.cxx 6 Jul 2005 14:09:56 -0000
@@ -264,7 +264,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- return ((m_nLastColumnIndex != -1) && m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True;
+ return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid()) ? (*(*m_aCurrentRow))[m_nLastColumnIndex].isNull() : sal_True;
}
// -----------------------------------------------------------------------------
const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
@@ -273,26 +273,26 @@ const ORowSetValue& ORowSetBase::getValu
checkCache();
OSL_ENSURE(!(m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
- if ( m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid() )
+ if ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && !m_aCurrentRow.isNull() && m_aCurrentRow->isValid() )
{
#if OSL_DEBUG_LEVEL > 0
ORowSetMatrix::iterator aCacheEnd = m_pCache->getEnd();
ORowSetMatrix::iterator aCurrentRow = m_aCurrentRow;
#endif
- OSL_ENSURE(m_aCurrentRow && m_aCurrentRow <= m_pCache->getEnd(),"Invalid iterator set for currentrow!");
+ OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow <= m_pCache->getEnd(),"Invalid iterator set for currentrow!");
return (*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex];
}
else
{ // currentrow is null when the clone move the window
- if(!m_aCurrentRow || m_aCurrentRow.isNull())
+ if ( m_aCurrentRow.isNull() )
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
return getValue(columnIndex);
}
- OSL_ENSURE(m_aCurrentRow && (m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
+ OSL_ENSURE(!m_aCurrentRow.isNull() && (m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
}
// we should normally never reach this here
return m_aEmptyValue;
@@ -363,18 +363,18 @@ Reference< ::com::sun::star::io::XInputS
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
- if(m_aCurrentRow && m_aCurrentRow != m_pCache->getEnd())
+ if( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd())
return new ::comphelper::SequenceInputStream((*(*m_aCurrentRow))[m_nLastColumnIndex = columnIndex].getSequence());
else
{
- if(m_aCurrentRow)
+ if(!m_aCurrentRow.isNull())
OSL_ENSURE((m_bBeforeFirst || m_bAfterLast),"ORowSetBase::getValue: we don't stand on a valid row! Row is equal to end of matrix");
else
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
return getBinaryStream(columnIndex);
}
}
@@ -1046,7 +1046,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
m_aBookmark = m_pCache->getBookmark();
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is null!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
OSL_ENSURE(m_aCurrentRow->isValid(),"Currentrow isn't valid");
@@ -1057,7 +1057,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
sal_Int32 nNewRow = m_pCache->getRow();
OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion");
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is nul after positionCache!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
else
{
@@ -1075,7 +1075,7 @@ void ORowSetBase::setCurrentRow(sal_Bool
{
positionCache();
m_aCurrentRow = m_pCache->m_aMatrixIter;
- OSL_ENSURE(m_aCurrentRow,"CurrentRow is nul after positionCache!");
+ OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
}
Index: source/core/api/RowSetCache.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCache.cxx,v
retrieving revision 1.75
diff -u -p -r1.75 RowSetCache.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCache.cxx 18 Mar 2005 10:05:15 -0000 1.75
+++ openoffice.org/dbaccess/source/core/api/RowSetCache.cxx 6 Jul 2005 14:09:58 -0000
@@ -431,7 +431,7 @@ void ORowSetCache::setMaxRowSize(sal_Int
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
aCacheIterToChange[aCacheIter->first] = sal_False;
- if(!aCacheIter->second.aIterator)
+ if ( aCacheIter->second.aIterator == m_pMatrix->end() )
continue;
if(aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
{
@@ -979,14 +979,14 @@ sal_Bool ORowSetCache::moveWindow()
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if ( aCacheIter->second.aIterator
+ if ( aCacheIter->second.aIterator != m_pMatrix->end()
&& aCacheIter->second.aIterator != m_aInsertRow
&& !m_bInserted && !m_bModified )
{
sal_Int16 nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
if ( nDist >= nNewDist )
{
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
else
{
@@ -1417,11 +1417,11 @@ void ORowSetCache::cancelRowModification
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if(aCacheIter->second.aIterator)
+ if ( aCacheIter->second.aIterator != m_pMatrix->end() )
{
ORowSetMatrix::iterator aOldIter = aCacheIter->second.aIterator;
if(aOldIter == m_aInsertRow)
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
}
}
@@ -1596,12 +1596,12 @@ void ORowSetCache::rotateCacheIterator(s
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
for(;aCacheIter != m_aCacheIterators.end();++aCacheIter)
{
- if(aCacheIter->second.aIterator && aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
+ if ( aCacheIter->second.aIterator != m_pMatrix->end() && aCacheIter->second.aIterator != m_aInsertRow && !m_bInserted && !m_bModified)
{
sal_Int16 nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
if(nDist < _nDist)
{
- aCacheIter->second.aIterator = NULL;
+ aCacheIter->second.aIterator = m_pMatrix->end();
}
else
{
Index: source/core/api/RowSetCacheIterator.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCacheIterator.cxx,v
retrieving revision 1.7
diff -u -p -r1.7 RowSetCacheIterator.cxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCacheIterator.cxx 13 Nov 2002 06:56:59 -0000 1.7
+++ openoffice.org/dbaccess/source/core/api/RowSetCacheIterator.cxx 6 Jul 2005 14:09:58 -0000
@@ -74,8 +74,7 @@ ORowSetCacheIterator::ORowSetCacheIterat
// -----------------------------------------------------------------------------
ORowSetCacheIterator::operator ORowSetMatrix::iterator()
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
// OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
// m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -108,8 +107,7 @@ ORowSetRow& ORowSetCacheIterator::operat
// -----------------------------------------------------------------------------
const ORowSetRow& ORowSetCacheIterator::operator *() const
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -125,8 +123,7 @@ ORowSetMatrix::iterator& ORowSetCacheIte
// -----------------------------------------------------------------------------
const ORowSetMatrix::iterator& ORowSetCacheIterator::operator ->() const
{
- if(m_aIter->second.aIterator == NULL ||
- m_aIter->second.aIterator == m_pCache->m_pMatrix->end())
+ if ( m_aIter->second.aIterator == m_pCache->m_pMatrix->end() )
{
OSL_ENSURE(m_aIter->second.aBookmark.hasValue(),"bookmark has no value!");
m_pCache->moveToBookmark(m_aIter->second.aBookmark);
@@ -155,7 +152,7 @@ void ORowSetCacheIterator::setBookmark(c
m_aIter->second.aBookmark = _rBookmark;
}
// -----------------------------------------------------------------------------
-
-
-
-
+sal_Bool ORowSetCacheIterator::isNull() const
+{
+ return !m_pCache || m_aIter == m_pCache->m_aCacheIterators.end() || m_aIter->second.aIterator == m_pCache->m_pMatrix->end();
+}
Index: source/core/api/RowSetCacheIterator.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/api/RowSetCacheIterator.hxx,v
retrieving revision 1.5
diff -u -p -r1.5 RowSetCacheIterator.hxx
--- openoffice.org.orig/dbaccess/source/core/api/RowSetCacheIterator.hxx 13 Nov 2002 06:56:59 -0000 1.5
+++ openoffice.org/dbaccess/source/core/api/RowSetCacheIterator.hxx 6 Jul 2005 14:09:58 -0000
@@ -95,7 +95,7 @@ namespace dbaccess
ORowSetCacheIterator(const ORowSetCacheIterator& _rRH);
ORowSetCacheIterator& operator =(const ORowSetCacheIterator&);
- sal_Bool isNull() const { return m_aIter->second.aIterator == NULL; }
+ sal_Bool isNull() const;
ORowSetCacheIterator& operator =(const ORowSetMatrix::iterator&);
operator ORowSetMatrix::iterator();
Index: source/core/dataaccess/datasource.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/core/dataaccess/datasource.cxx,v
retrieving revision 1.59
diff -u -p -r1.59 datasource.cxx
--- openoffice.org.orig/dbaccess/source/core/dataaccess/datasource.cxx 23 Mar 2005 09:46:37 -0000 1.59
+++ openoffice.org/dbaccess/source/core/dataaccess/datasource.cxx 6 Jul 2005 14:10:06 -0000
@@ -506,7 +506,7 @@ namespace dbaccess
}
}
- return Sequence< PropertyValue >(aRet.begin(),aRet.size());
+ return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size());
}
return Sequence< PropertyValue >();
}
Index: source/filter/xml/xmlDataSource.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/filter/xml/xmlDataSource.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 xmlDataSource.cxx
--- openoffice.org.orig/dbaccess/source/filter/xml/xmlDataSource.cxx 10 Mar 2005 16:39:17 -0000 1.3
+++ openoffice.org/dbaccess/source/filter/xml/xmlDataSource.cxx 6 Jul 2005 14:10:17 -0000
@@ -276,7 +276,7 @@ void OXMLDataSource::EndElement()
{
try
{
- xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(Sequence<PropertyValue>(m_aInfoSequence.begin(),m_aInfoSequence.size())));
+ xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(Sequence<PropertyValue>(&(*m_aInfoSequence.begin()),m_aInfoSequence.size())));
}
catch(Exception)
{
Index: source/filter/xml/xmlTableFilterList.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/filter/xml/xmlTableFilterList.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 xmlTableFilterList.cxx
--- openoffice.org.orig/dbaccess/source/filter/xml/xmlTableFilterList.cxx 10 Mar 2005 16:41:01 -0000 1.3
+++ openoffice.org/dbaccess/source/filter/xml/xmlTableFilterList.cxx 6 Jul 2005 14:10:17 -0000
@@ -148,9 +148,9 @@ void OXMLTableFilterList::EndElement()
if ( xDataSource.is() )
{
if ( !m_aPatterns.empty() )
- xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(m_aPatterns.begin(),m_aPatterns.size())));
+ xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aPatterns.begin()),m_aPatterns.size())));
if ( !m_aTypes.empty() )
- xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(m_aTypes.begin(),m_aTypes.size())));
+ xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(Sequence< ::rtl::OUString>(&(*m_aTypes.begin()),m_aTypes.size())));
}
}
//----------------------------------------------------------------------------
Index: source/ui/dlg/DbAdminImpl.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/DbAdminImpl.cxx,v
retrieving revision 1.8
diff -u -p -r1.8 DbAdminImpl.cxx
--- openoffice.org.orig/dbaccess/source/ui/dlg/DbAdminImpl.cxx 10 Mar 2005 16:48:20 -0000 1.8
+++ openoffice.org/dbaccess/source/ui/dlg/DbAdminImpl.cxx 6 Jul 2005 14:10:46 -0000
@@ -361,7 +361,7 @@ sal_Bool ODbDataSourceAdministrationHelp
makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE));
}
- _rDriverParam = Sequence< PropertyValue >(aReturn.begin(), aReturn.size());
+ _rDriverParam = Sequence< PropertyValue >(&(*aReturn.begin()), aReturn.size());
// append all the other stuff (charset etc.)
fillDatasourceInfo(*m_pItemSetHelper->getOutputSet(), _rDriverParam);
Index: source/ui/dlg/indexdialog.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/indexdialog.cxx,v
retrieving revision 1.19
diff -u -p -r1.19 indexdialog.cxx
--- openoffice.org.orig/dbaccess/source/ui/dlg/indexdialog.cxx 23 Mar 2005 09:48:55 -0000 1.19
+++ openoffice.org/dbaccess/source/ui/dlg/indexdialog.cxx 6 Jul 2005 14:10:54 -0000
@@ -301,7 +301,7 @@ namespace dbaui
// }
// if all of the indexes have an empty description, we're not interested in displaying it
- OIndexCollection::const_iterator aCheck;
+ Indexes::const_iterator aCheck;
for ( aCheck = m_pIndexes->begin();
aCheck != m_pIndexes->end();
@@ -352,7 +352,7 @@ namespace dbaui
if (pSelected)
{
// is the current entry modified?
- OIndexCollection::const_iterator aSelectedPos = reinterpret_cast<OIndexCollection::const_iterator>(pSelected->GetUserData());
+ Indexes::const_iterator aSelectedPos = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(pSelected->GetUserData());
m_aActions.EnableItem(ID_INDEX_SAVE, aSelectedPos->isModified() || aSelectedPos->isNew());
m_aActions.EnableItem(ID_INDEX_RESET, aSelectedPos->isModified() || aSelectedPos->isNew());
bSelectedAnything = bSelectedAnything && !aSelectedPos->bPrimaryKey;
@@ -373,8 +373,8 @@ namespace dbaui
Image aPKeyIcon(ModuleRes( bHiContrast ? IMG_PKEYICON_SCH : IMG_PKEYICON));
// fill the list with the index names
m_aIndexes.Clear();
- OIndexCollection::iterator aIndexLoop = m_pIndexes->begin();
- OIndexCollection::iterator aEnd = m_pIndexes->end();
+ Indexes::iterator aIndexLoop = m_pIndexes->begin();
+ Indexes::iterator aEnd = m_pIndexes->end();
for (; aIndexLoop != aEnd; ++aIndexLoop)
{
SvLBoxEntry* pNewEntry = NULL;
@@ -383,7 +383,7 @@ namespace dbaui
else
pNewEntry = m_aIndexes.InsertEntry(aIndexLoop->sName);
- pNewEntry->SetUserData(aIndexLoop);
+ pNewEntry->SetUserData(reinterpret_cast< void* >(sal_Int32(aIndexLoop - m_pIndexes->begin())));
}
OnIndexSelected(&m_aIndexes);
@@ -406,7 +406,7 @@ namespace dbaui
{
DBG_ASSERT(_pEntry, "DbaIndexDialog::implCommit: invalid entry!");
- OIndexCollection::iterator aCommitPos = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aCommitPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(_pEntry->GetUserData());
// if it's not a new index, remove it
// (we can't modify indexes, only drop'n'insert)
@@ -465,16 +465,16 @@ namespace dbaui
}
SvLBoxEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName);
- OIndexCollection::iterator aIndexDescriptor = m_pIndexes->insert(sNewIndexName);
+ Indexes::iterator aIndexDescriptor = m_pIndexes->insert(sNewIndexName);
// pNewEntry->SetUserData(aIndexDescriptor);
// update the user data on the entries in the list box:
// they're iterators of the index collection, and thus they have changed when removing the index
for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
- OIndexCollection::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
+ Indexes::iterator aAfterInsertPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
DBG_ASSERT(aAfterInsertPos != m_pIndexes->end(), "DbaIndexDialog::OnNewIndex: problems with on of the entries!");
- pAdjust->SetUserData(aAfterInsertPos);
+ pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterInsertPos - m_pIndexes->begin())));
}
// select the entry and start in-place editing
@@ -514,7 +514,7 @@ namespace dbaui
sal_Bool DbaIndexDialog::implDropIndex(SvLBoxEntry* _pEntry, sal_Bool _bRemoveFromCollection)
{
// do the drop
- OIndexCollection::iterator aDropPos = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aDropPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(_pEntry->GetUserData());
DBG_ASSERT(aDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: did not find the index in my collection!");
SQLExceptionInfo aExceptionInfo;
@@ -545,9 +545,9 @@ namespace dbaui
// they're iterators of the index collection, and thus they have changed when removing the index
for (SvLBoxEntry* pAdjust = m_aIndexes.First(); pAdjust; pAdjust = m_aIndexes.Next(pAdjust))
{
- OIndexCollection::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
+ Indexes::iterator aAfterDropPos = m_pIndexes->find(m_aIndexes.GetEntryText(pAdjust));
DBG_ASSERT(aAfterDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: problems with on of the remaining entries!");
- pAdjust->SetUserData(aAfterDropPos);
+ pAdjust->SetUserData(reinterpret_cast< void* >(sal_Int32(aAfterDropPos - m_pIndexes->begin())));
}
// if the remvoved entry was the selected on ...
@@ -596,7 +596,7 @@ namespace dbaui
SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
DBG_ASSERT(pSelected, "DbaIndexDialog::OnResetIndex: invalid call!");
- OIndexCollection::iterator aResetPos = static_cast< OIndexCollection::iterator >(pSelected->GetUserData());
+ Indexes::iterator aResetPos = m_pIndexes->begin() + reinterpret_cast< sal_Int32 >(pSelected->GetUserData());
if (aResetPos->isNew())
{
@@ -669,7 +669,8 @@ namespace dbaui
if (pSelected)
{
// the descriptor
- OIndexCollection::const_iterator aSelected = static_cast<OIndexCollection::iterator>(pSelected->GetUserData());
+ Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(pSelected->GetUserData());
+
if (aSelected->isModified() || aSelected->isNew())
{
QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX));
@@ -705,13 +706,14 @@ namespace dbaui
//------------------------------------------------------------------
IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry )
{
- OIndexCollection::iterator aPosition = static_cast< OIndexCollection::iterator >(_pEntry->GetUserData());
+ Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(_pEntry->GetUserData());
+
DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(),
"DbaIndexDialog::OnEntryEdited: invalid entry!");
String sNewName = m_aIndexes.GetEntryText(_pEntry);
- OIndexCollection::const_iterator aSameName = m_pIndexes->find(sNewName);
+ Indexes::const_iterator aSameName = m_pIndexes->find(sNewName);
if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName))
{
String sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED));
@@ -753,7 +755,7 @@ namespace dbaui
if (m_pFields->IsModified() && !m_pFields->SaveModified())
return sal_False;
- OIndexCollection::iterator aPreviouslySelected = static_cast<OIndexCollection::iterator>(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
// the unique flag
aPreviouslySelected->bUnique = m_aUnique.IsChecked();
@@ -814,7 +816,7 @@ namespace dbaui
{
if (m_pPreviousSelection)
{
- OIndexCollection::iterator aPreviouslySelected = static_cast<OIndexCollection::iterator>(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPreviouslySelected = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
if (!implSaveModified())
return sal_False;
@@ -831,7 +833,7 @@ namespace dbaui
IMPL_LINK( DbaIndexDialog, OnModified, void*, NOTINTERESTEDIN )
{
DBG_ASSERT(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
- OIndexCollection::iterator aPosition = static_cast< OIndexCollection::iterator >(m_pPreviousSelection->GetUserData());
+ Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(m_pPreviousSelection->GetUserData());
aPosition->setModified(sal_True);
updateToolbox();
@@ -845,7 +847,7 @@ namespace dbaui
if (_pEntry)
{
// the descriptor of the selected index
- OIndexCollection::const_iterator aSelectedIndex = static_cast<OIndexCollection::iterator>(_pEntry->GetUserData());
+ Indexes::const_iterator aSelectedIndex = m_pIndexes->begin() + reinterpret_cast<sal_Int32>(_pEntry->GetUserData());
// fill the controls
m_aUnique.Check(aSelectedIndex->bUnique);
Index: source/ui/inc/indexcollection.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/inc/indexcollection.hxx,v
retrieving revision 1.4
diff -u -p -r1.4 indexcollection.hxx
--- openoffice.org.orig/dbaccess/source/ui/inc/indexcollection.hxx 19 Mar 2003 17:52:40 -0000 1.4
+++ openoffice.org/dbaccess/source/ui/inc/indexcollection.hxx 6 Jul 2005 14:11:32 -0000
@@ -126,29 +126,29 @@ namespace dbaui
typedef OIndex const* const_iterator;
/// get access to the first element of the index collection
- const_iterator begin() const { return m_aIndexes.begin(); }
+ Indexes::const_iterator begin() const { return m_aIndexes.begin(); }
/// get access to the first element of the index collection
- iterator begin() { return m_aIndexes.begin(); }
+ Indexes::iterator begin() { return m_aIndexes.begin(); }
/// get access to the (last + 1st) element of the index collection
- const_iterator end() const { return m_aIndexes.end(); }
+ Indexes::const_iterator end() const { return m_aIndexes.end(); }
/// get access to the (last + 1st) element of the index collection
- iterator end() { return m_aIndexes.end(); }
+ Indexes::iterator end() { return m_aIndexes.end(); }
// searching
- const_iterator find(const String& _rName) const;
- iterator find(const String& _rName);
- const_iterator findOriginal(const String& _rName) const;
- iterator findOriginal(const String& _rName);
+ Indexes::const_iterator find(const String& _rName) const;
+ Indexes::iterator find(const String& _rName);
+ Indexes::const_iterator findOriginal(const String& _rName) const;
+ Indexes::iterator findOriginal(const String& _rName);
// inserting without committing
// the OriginalName of the newly inserted index will be empty, thus indicating that it's new
- iterator insert(const String& _rName);
+ Indexes::iterator insert(const String& _rName);
// commit a new index, which is already part if the collection, but does not have an equivalent in the
// data source, yet
- void commitNewIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ void commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
// reset the data for the given index
- void resetIndex(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ void resetIndex(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
// attach to a new key container
void attach(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
@@ -161,9 +161,9 @@ namespace dbaui
sal_Int32 size() const { return m_aIndexes.size(); }
/// drop an index, and remove it from the collection
- sal_Bool drop(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ sal_Bool drop(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
/// simply drop the index described by the name, but don't remove the descriptor from the collection
- sal_Bool dropNoRemove(const iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
+ sal_Bool dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((::com::sun::star::sdbc::SQLException));
protected:
void implConstructFrom(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes);
Index: source/ui/misc/indexcollection.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/misc/indexcollection.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 indexcollection.cxx
--- openoffice.org.orig/dbaccess/source/ui/misc/indexcollection.cxx 19 Mar 2003 17:52:53 -0000 1.5
+++ openoffice.org/dbaccess/source/ui/misc/indexcollection.cxx 6 Jul 2005 14:11:44 -0000
@@ -141,12 +141,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::const_iterator OIndexCollection::find(const String& _rName) const
+ Indexes::const_iterator OIndexCollection::find(const String& _rName) const
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- const_iterator aSearch = m_aIndexes.begin();
+ Indexes::const_iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->sName == sNameCompare)
break;
@@ -155,12 +155,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::find(const String& _rName)
+ Indexes::iterator OIndexCollection::find(const String& _rName)
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- iterator aSearch = m_aIndexes.begin();
+ Indexes::iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->sName == sNameCompare)
break;
@@ -169,12 +169,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::const_iterator OIndexCollection::findOriginal(const String& _rName) const
+ Indexes::const_iterator OIndexCollection::findOriginal(const String& _rName) const
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- const_iterator aSearch = m_aIndexes.begin();
+ Indexes::const_iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->getOriginalName() == sNameCompare)
break;
@@ -183,12 +183,12 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::findOriginal(const String& _rName)
+ Indexes::iterator OIndexCollection::findOriginal(const String& _rName)
{
::rtl::OUString sNameCompare(_rName);
// loop'n'compare
- iterator aSearch = m_aIndexes.begin();
+ Indexes::iterator aSearch = m_aIndexes.begin();
for (; aSearch != m_aIndexes.end(); ++aSearch)
if (aSearch->getOriginalName() == sNameCompare)
break;
@@ -197,7 +197,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- void OIndexCollection::commitNewIndex(const iterator& _rPos) SAL_THROW((SQLException))
+ void OIndexCollection::commitNewIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE(_rPos->isNew(), "OIndexCollection::commitNewIndex: index must be new!");
@@ -268,7 +268,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- sal_Bool OIndexCollection::dropNoRemove(const iterator& _rPos) SAL_THROW((SQLException))
+ sal_Bool OIndexCollection::dropNoRemove(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
try
{
@@ -294,7 +294,7 @@ namespace dbaui
}
// adjust the OIndex structure
- iterator aDropped = findOriginal(_rPos->getOriginalName());
+ Indexes::iterator aDropped = findOriginal(_rPos->getOriginalName());
OSL_ENSURE(aDropped != m_aIndexes.end(), "OIndexCollection::drop: invalid original name, but successfull commit?!");
aDropped->flagAsNew(GrantIndexAccess());
@@ -302,7 +302,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- sal_Bool OIndexCollection::drop(const iterator& _rPos) SAL_THROW((SQLException))
+ sal_Bool OIndexCollection::drop(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE((_rPos >= m_aIndexes.begin()) && (_rPos < m_aIndexes.end()),
"OIndexCollection::drop: invalid position (fasten your seatbelt .... this will crash)!");
@@ -355,10 +355,10 @@ namespace dbaui
const ::rtl::OUString* pFieldNames = aFieldNames.getConstArray();
const ::rtl::OUString* pFieldNamesEnd = pFieldNames + aFieldNames.getLength();
- OIndexField* pCopyTo = _rIndex.aFields.begin();
+ IndexFields::iterator aCopyTo = _rIndex.aFields.begin();
Reference< XPropertySet > xIndexColumn;
- for (;pFieldNames < pFieldNamesEnd; ++pFieldNames, ++pCopyTo)
+ for (;pFieldNames < pFieldNamesEnd; ++pFieldNames, ++aCopyTo)
{
// extract the column
xIndexColumn.clear();
@@ -366,22 +366,22 @@ namespace dbaui
if (!xIndexColumn.is())
{
OSL_ENSURE(sal_False, "OIndexCollection::implFillIndexInfo: invalid index column!");
- --pCopyTo;
+ --aCopyTo;
continue;
}
// get the relevant properties
- pCopyTo->sFieldName = *pFieldNames;
- pCopyTo->bSortAscending = ::cppu::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
+ aCopyTo->sFieldName = *pFieldNames;
+ aCopyTo->bSortAscending = ::cppu::any2bool(xIndexColumn->getPropertyValue(s_sSortPropertyName));
}
- _rIndex.aFields.resize(pCopyTo - _rIndex.aFields.begin());
+ _rIndex.aFields.resize(aCopyTo - _rIndex.aFields.begin());
// (just in case some fields were invalid ...)
}
}
//------------------------------------------------------------------
- void OIndexCollection::resetIndex(const iterator& _rPos) SAL_THROW((SQLException))
+ void OIndexCollection::resetIndex(const Indexes::iterator& _rPos) SAL_THROW((SQLException))
{
OSL_ENSURE(_rPos >= m_aIndexes.begin() && _rPos < m_aIndexes.end(),
"OIndexCollection::resetIndex: invalid position!");
@@ -405,7 +405,7 @@ namespace dbaui
}
//------------------------------------------------------------------
- OIndexCollection::iterator OIndexCollection::insert(const String& _rName)
+ Indexes::iterator OIndexCollection::insert(const String& _rName)
{
OSL_ENSURE(end() == find(_rName), "OIndexCollection::insert: invalid new name!");
String tmpName;
Index: source/xforms/propertysetbase.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/propertysetbase.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 propertysetbase.cxx
--- openoffice.org.orig/forms/source/xforms/propertysetbase.cxx 23 Mar 2005 11:38:13 -0000 1.3
+++ openoffice.org/forms/source/xforms/propertysetbase.cxx 6 Jul 2005 10:32:50 -0000
@@ -114,7 +114,7 @@ cppu::IPropertyArrayHelper& SAL_CALL Pro
if ( !m_pProperties )
{
DBG_ASSERT( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" );
- m_pProperties = new cppu::OPropertyArrayHelper( m_aProperties.begin(), m_aProperties.size(), sal_False );
+ m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False );
}
return *m_pProperties;
}
Index: source/xforms/submission.cxx
===================================================================
RCS file: /cvs/gsl/forms/source/xforms/submission.cxx,v
retrieving revision 1.5
diff -u -p -r1.5 submission.cxx
--- openoffice.org.orig/forms/source/xforms/submission.cxx 3 May 2005 14:41:36 -0000 1.5
+++ openoffice.org/forms/source/xforms/submission.cxx 6 Jul 2005 10:32:50 -0000
@@ -497,7 +497,7 @@ sal_Bool SAL_CALL Submission::convertFas
while ( p >= 0 )
aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) );
- Sequence< ::rtl::OUString > aConvertedPrefixes( aPrefixes.begin(), aPrefixes.size() );
+ Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() );
return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) );
}
}
? source/base/localize.sdf
Index: source/ure/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ure/makefile.mk,v
retrieving revision 1.2
diff -u -p -r1.2 makefile.mk
--- openoffice.org.orig/scp2/source/ure/makefile.mk 17 Jun 2005 10:18:23 -0000 1.2
+++ openoffice.org/scp2/source/ure/makefile.mk 6 Jul 2005 15:04:52 -0000
@@ -68,4 +68,8 @@ TARGET := ure
SCP_PRODUCT_TYPE = ure
PARFILES = ure.par
+.IF "$(USE_SYSTEM_STL)" == "YES"
+SCPDEFS+=-DUSE_SYSTEM_STL
+.ENDIF
+
.INCLUDE: target.mk
? systemstl/numeric
Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.30
diff -u -p -r1.30 makefile.mk
--- openoffice.org.orig/stlport/makefile.mk 31 May 2005 17:04:13 -0000 1.30
+++ openoffice.org/stlport/makefile.mk 6 Jul 2005 15:05:35 -0000
@@ -76,6 +76,7 @@ $(INCCOM)$/stlport$/hash_map : systemstl
+$(COPY) systemstl/functional $(INCCOM)$/stlport
+$(COPY) systemstl/hash_map $(INCCOM)$/stlport
+$(COPY) systemstl/hash_set $(INCCOM)$/stlport
+ +$(COPY) systemstl/numeric $(INCCOM)$/stlport
+$(COPY) systemstl/slist $(INCCOM)$/stlport
+$(COPY) systemstl/rope $(INCCOM)$/stlport
+$(COPY) systemstl/vector $(INCCOM)$/stlport
Index: systemstl/functional
===================================================================
RCS file: /cvs/external/stlport/systemstl/functional,v
retrieving revision 1.3
diff -u -p -r1.3 functional
--- openoffice.org.orig/stlport/systemstl/functional 24 Feb 2005 14:47:25 -0000 1.3
+++ openoffice.org/stlport/systemstl/functional 6 Jul 2005 15:11:37 -0000
@@ -63,9 +63,7 @@
#define SYSTEM_STL_FUNCTIONAL
#ifdef GCC
-#include <bits/c++config.h>
-#include <cstddef>
-#include <bits/stl_function.h>
+#include <ext/../functional>
#include <ext/functional>
namespace std
Index: systemstl/rope
===================================================================
RCS file: /cvs/external/stlport/systemstl/rope,v
retrieving revision 1.2
diff -u -p -r1.2 rope
--- openoffice.org.orig/stlport/systemstl/rope 24 Feb 2005 14:47:52 -0000 1.2
+++ openoffice.org/stlport/systemstl/rope 6 Jul 2005 15:11:37 -0000
@@ -63,7 +63,9 @@
#define SYSTEM_STL_ROPE
#include <functional>
+#include <numeric>
#include <ext/rope>
+
#ifdef GCC
namespace std
{
Index: systemstl/vector
===================================================================
RCS file: /cvs/external/stlport/systemstl/vector,v
retrieving revision 1.2
diff -u -p -r1.2 vector
--- openoffice.org.orig/stlport/systemstl/vector 24 Feb 2005 14:48:01 -0000 1.2
+++ openoffice.org/stlport/systemstl/vector 6 Jul 2005 15:11:37 -0000
@@ -64,21 +64,7 @@
#ifdef GCC
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_vector.h>
-#include <bits/stl_bvector.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/vector.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/vector>
-#endif
+#include <ext/../vector>
namespace std
{
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ openoffice.org/stlport/systemstl/numeric 2005-07-06 10:15:34.000000000 +0000
@@ -0,0 +1,80 @@
+/*************************************************************************
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (the "License"); You may not use this file
+ * except in compliance with the License. You may obtain a copy of the
+ * License at http://www.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef SYSTEM_STL_NUMERIC
+#define SYSTEM_STL_NUMERIC
+
+#ifdef GCC
+#include <functional>
+#include <ext/../numeric>
+#include <ext/numeric>
+
+namespace std
+{
+ using __gnu_cxx::iota;
+}
+
+#else
+#error UNSUPPORTED COMPILER
+#endif
+
+#endif
+/* vi:set tabstop=4 shiftwidth=4 expandtab: */
Index: source/accessibility/AccessibleEmptyEditSource.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/AccessibleEmptyEditSource.cxx,v
retrieving revision 1.2
diff -u -p -r1.2 AccessibleEmptyEditSource.cxx
--- openoffice.org.orig/svx/source/accessibility/AccessibleEmptyEditSource.cxx 1 Apr 2003 13:46:55 -0000 1.2
+++ openoffice.org/svx/source/accessibility/AccessibleEmptyEditSource.cxx 6 Jul 2005 10:02:37 -0000
@@ -316,8 +316,12 @@ namespace accessibility
if( mrObj.GetModel() )
EndListening( *mrObj.GetModel() );
+#if 1
+ mpEditSource = ::std::auto_ptr<SvxEditSource>(new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow));
+#else
::std::auto_ptr< SvxEditSource > pProxySource( new AccessibleProxyEditSource_Impl(mrObj, mrView, mrViewWindow) );
::std::swap(pProxySource, mpEditSource);
+#endif
// register as listener
StartListening( mpEditSource->GetBroadcaster() );
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0
com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0
desktop/source/app/langselect.cxx | 10 -
desktop/source/app/langselect.hxx | 2
desktop/source/app/userinstall.cxx | 15 -
desktop/source/migration/wizard.cxx | 19 --
framework/source/services/substitutepathvars.cxx | 93 ++++++++++
framework/util/makefile.mk | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8
registry/schema/org/openoffice/Office/Common.xcs | 0
sfx2/source/appl/sfxhelp.cxx | 59 +++++-
source/app/langselect.cxx | 0
source/app/langselect.hxx | 0
source/app/userinstall.cxx | 0
source/appl/sfxhelp.cxx | 0
source/formwizard/dbwizres.src | 0
source/migration/wizard.cxx | 0
source/services/substitutepathvars.cxx | 0
source/ui/misc/glosdoc.cxx | 0
sw/source/ui/misc/glosdoc.cxx | 14 -
util/makefile.mk | 0
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 28 ++-
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 20 +-
wizards/source/formwizard/dbwizres.src | 11 +
24 files changed, 207 insertions(+), 73 deletions(-)
--- NEW FILE openoffice.org-1.9.87.rh151357.setlangtolocale.patch ---
Index: source/app/langselect.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/langselect.cxx,v
retrieving revision 1.14
diff -u -p -r1.14 langselect.cxx
--- openoffice.org.orig/desktop/source/app/langselect.cxx 11 Mar 2005 10:47:45 -0000 1.14
+++ openoffice.org/desktop/source/app/langselect.cxx 29 Mar 2005 09:01:28 -0000
@@ -118,7 +118,7 @@ Locale LanguageSelection::IsoStringToLoc
bool LanguageSelection::prepareLanguage()
{
// get the selected UI language as string
- OUString aLocaleString = getLanguageString();
+ OUString aLocaleString = getLanguageString(true);
if ( aLocaleString.getLength() > 0 )
{
OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
@@ -199,7 +199,7 @@ void LanguageSelection::setDefaultLocale
}
}
-OUString LanguageSelection::getLanguageString()
+OUString LanguageSelection::getLanguageString(bool bAllowUnInstalled)
{
// did we already find a language?
if (bFoundLanguage)
@@ -208,7 +208,7 @@ OUString LanguageSelection::getLanguageS
OUString aUserLanguage = getUserLanguage();
if (aUserLanguage.getLength() > 0 )
{
- if (isInstalledLanguage(aUserLanguage))
+ if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage))
{
// all is well
bFoundLanguage = sal_True;
@@ -225,7 +225,7 @@ OUString LanguageSelection::getLanguageS
aUserLanguage = getSystemLanguage();
if (aUserLanguage.getLength() > 0 )
{
- if (isInstalledLanguage(aUserLanguage, sal_False))
+ if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage, sal_False))
{
// great, system default language is available
bFoundLanguage = sal_True;
@@ -235,7 +235,7 @@ OUString LanguageSelection::getLanguageS
}
// fallback 1: en-US
OUString usFB = usFallbackLanguage;
- if (isInstalledLanguage(usFB))
+ if (bAllowUnInstalled || isInstalledLanguage(usFB))
{
bFoundLanguage = sal_True;
aFoundLanguage = usFallbackLanguage;
Index: source/app/langselect.hxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/langselect.hxx,v
retrieving revision 1.8
diff -u -p -r1.8 langselect.hxx
--- openoffice.org.orig/desktop/source/app/langselect.hxx 11 Mar 2005 10:47:59 -0000 1.8
+++ openoffice.org/desktop/source/app/langselect.hxx 29 Mar 2005 09:01:28 -0000
@@ -96,7 +96,7 @@ private:
public:
static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
- static rtl::OUString getLanguageString();
+ static rtl::OUString getLanguageString(bool bAllowUnInstalled=false);
static bool prepareLanguage();
};
Index: source/migration/wizard.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/migration/wizard.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 wizard.cxx
--- openoffice.org.orig/desktop/source/migration/wizard.cxx 11 Mar 2005 10:50:09 -0000 1.3
+++ openoffice.org/desktop/source/migration/wizard.cxx 29 Mar 2005 09:01:44 -0000
@@ -590,25 +590,8 @@ OUString FirstStartWizard::getLicensePat
// yuck! no license :/
}
- // determine the filename of the license to show
- OUString aLangString;
- ::com::sun::star::lang::Locale aLocale;
- OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
- AllSettings aSettings(Application::GetSettings());
- aLocale = aSettings.GetUILocale();
- ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+ OUString aLangString(OUString::createFromAscii("en-US"));
- aLangString = aLocale.Language;
- if ( aLocale.Country.getLength() != 0 )
- {
- aLangString += OUString::createFromAscii("-");
- aLangString += aLocale.Country;
- if ( aLocale.Variant.getLength() != 0 )
- {
- aLangString += OUString::createFromAscii("-");
- aLangString += aLocale.Variant;
- }
- }
#ifdef WNT
aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
Index: source/appl/sfxhelp.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v
retrieving revision 1.64
diff -u -p -u -r1.64 sfxhelp.cxx
--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 9 Jun 2005 13:54:45 -0000 1.64
+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 10 Jun 2005 17:02:29 -0000
@@ -125,6 +125,9 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
+#ifndef _ISOLANG_HXX
+#include <tools/isolang.hxx>
+#endif
#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
#endif
@@ -135,6 +138,11 @@
#include <svtools/pathoptions.hxx>
#include <rtl/ustring.hxx>
#include <osl/process.h>
+#include <osl/file.hxx>
+#ifndef _UTL_BOOTSTRAP_HXX
+#include <unotools/bootstrap.hxx>
+#endif
+
#include <rtl/uri.hxx>
#include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx>
@@ -191,16 +199,50 @@ void NoHelpErrorBox::RequestHelp( const
#define STARTERLIST 0
+rtl::OUString HelpLocaleString()
+{
+ static rtl::OUString aLocaleStr;
+ if (!aLocaleStr.getLength())
+ {
+ // detect installed locale
+ Any aLocale =
+ ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty(
+ ::utl::ConfigManager::LOCALE );
+ bool bOk = (aLocale >>= aLocaleStr);
+ if ( bOk )
+ {
+ rtl::OUString aBaseInstallPath;
+ utl::Bootstrap::PathStatus aBaseLocateResult =
+ utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
+ static const char *szHelpPath = "/help/";
+
+ rtl::OUString sHelpPath = aBaseInstallPath +
+ rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
+ osl::DirectoryItem aDirItem;
+ if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+ {
+ String sLang(aLocaleStr);
+ xub_StrLen nSepPos = sLang.Search( '-' );
+ if (nSepPos != STRING_NOTFOUND)
+ {
+ sLang = sLang.Copy( 0, nSepPos );
+ sHelpPath = aBaseInstallPath +
+ rtl::OUString::createFromAscii(szHelpPath) + sLang;
+ if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+ bOk = false;
+ }
+ }
+ }
+ if (!bOk)
+ aLocaleStr = rtl::OUString( DEFINE_CONST_UNICODE("en") );
+ }
+ return aLocaleStr;
+}
+
+
void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
{
- // this completes a help url with the system parameters "Language" and "System"
- // detect installed locale
- Any aLocale =
- ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE );
- ::rtl::OUString aLocaleStr;
- if ( !( aLocale >>= aLocaleStr ) )
- // fallback is english
- aLocaleStr = ::rtl::OUString( DEFINE_CONST_UNICODE("en") );
+ ::rtl::OUString aLocaleStr(HelpLocaleString());
// query part exists?
if ( bQuestionMark )
@@ -215,6 +257,7 @@ void AppendConfigToken_Impl( String& rUR
rURL += String( aLocaleStr );
rURL += DEFINE_CONST_UNICODE("&System=");
rURL += SvtHelpOptions().GetSystem();
+
}
// -----------------------------------------------------------------------
Index: source/app/userinstall.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/userinstall.cxx,v
retrieving revision 1.16
diff -u -p -u -r1.16 userinstall.cxx
--- openoffice.org.orig/desktop/source/app/userinstall.cxx 11 Mar 2005 10:48:28 -0000 1.16
+++ openoffice.org/desktop/source/app/userinstall.cxx 9 Jun 2005 08:27:23 -0000
@@ -330,27 +330,20 @@ namespace desktop {
OUString aDefaultLocale( OUString::createFromAscii("DefaultLocale") );
OUString aDefaultLocale_CJK( OUString::createFromAscii("DefaultLocale_CJK") );
OUString aTmp;
- if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko")
- || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW"))
+ if (aLocale.Language.equalsAscii("ja") || aLocale.Language.equalsAscii("ko")
+ || aLocale.Language.equalsAscii("zh"))
{
// only set the locales if there is not already a value set
// (inititially there is no value set in the configuration)
pset->getPropertyValue(aDefaultLocale) >>= aTmp;
if (!aTmp.getLength())
pset->setPropertyValue(aDefaultLocale, makeAny(OUString::createFromAscii("en-US")));
- pset->getPropertyValue(aDefaultLocale_CJK) >>= aTmp;
- if (!aTmp.getLength())
- pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
+ pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
} else
{
- // only set the locales if there is not already a value set
- // (inititially there is no value set in the configuration)
- pset->getPropertyValue(aDefaultLocale) >>= aTmp;
- if (!aTmp.getLength())
- pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
+ pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
}
Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
-
v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
theArgs[0] <<= v;
Reference< XHierarchicalPropertySet> hpset(
Index: source/services/substitutepathvars.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
retrieving revision 1.10
diff -u -p -r1.10 substitutepathvars.cxx
--- openoffice.org.orig/framework/source/services/substitutepathvars.cxx 13 Jan 2005 19:14:36 -0000 1.10
+++ openoffice.org/framework/source/services/substitutepathvars.cxx 29 Jun 2005 10:45:59 -0000
@@ -151,6 +151,14 @@
#include <rtl/ustrbuf.hxx>
#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#include <com/sun/star/container/XNameAccess.hpp>
+#endif
+
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
@@ -1215,6 +1223,88 @@ throw ( NoSuchElementException, RuntimeE
return rtl::OUString();
}
+using rtl::OUString;
+using rtl::OString;
+
+Reference< XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
+{
+ Reference< XNameAccess > xNameAccess;
+ try{
+ OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
+ OUString sAccessSrvc;
+ if (bUpdate)
+ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+ else
+ sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+
+ OUString sConfigURL = OUString::createFromAscii(pPath);
+
+ // get configuration provider
+ Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
+ if (theMSF.is()) {
+ Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory > (
+ theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW );
+
+ // access the provider
+ Sequence< Any > theArgs(1);
+ theArgs[ 0 ] <<= sConfigURL;
+ xNameAccess = Reference< XNameAccess > (
+ theConfigProvider->createInstanceWithArguments(
+ sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+ }
+ } catch (com::sun::star::uno::Exception& e)
+ {
+ OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
+ OSL_ENSURE(sal_False, aMsg.getStr());
+ }
+ return xNameAccess;
+}
+
+void getInstallMapping(OUString& usLocale)
+{
+ Sequence< OUString > seqLanguages;
+ Reference< XNameAccess > xAccess =
+ getConfigAccess(
+ "org.openoffice.Setup/Office/InstalledLocales", sal_False);
+ if (xAccess.is())
+ seqLanguages = xAccess->getElementNames();
+
+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+ {
+ if (usLocale.equals(seqLanguages[i]))
+ return;
+ }
+
+ // try fallback locales
+ if (usLocale.equalsAscii("zh-HK"))
+ {
+ OUString sTemp = OUString::createFromAscii("zh-TW");
+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+ {
+ if (sTemp.equals(seqLanguages[i]))
+ {
+ usLocale = sTemp;
+ return;
+ }
+ }
+ }
+
+ // no exact match was found, well try to find a substitute
+ OUString aInstalledLocale;
+ for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+ {
+ if (usLocale.indexOf(seqLanguages[i]) == 0)
+ {
+ // requested locale starts with the installed locale
+ // (i.e. installed locale has index 0 in requested locale)
+ usLocale = seqLanguages[i];
+ return;
+ break;
+ }
+ }
+ usLocale = OUString::createFromAscii("en-US");
+}
+
void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
{
utl::ConfigManager* pCfgMgr = utl::ConfigManager::GetConfigManager();
@@ -1278,7 +1368,10 @@ void SubstitutePathVariables::SetPredefi
Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
rtl::OUString aLocaleStr;
if ( aLocale >>= aLocaleStr )
+ {
+ getInstallMapping(aLocaleStr);
aPreDefPathVariables.m_eLanguageType = ConvertIsoStringToLanguage( aLocaleStr );
+ }
else
{
LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Wrong Any type for language!" );
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
retrieving revision 1.96
diff -u -p -r1.96 makefile.mk
--- openoffice.org.orig/framework/util/makefile.mk 22 Apr 2005 11:36:59 -0000 1.96
+++ openoffice.org/framework/util/makefile.mk 29 Jun 2005 10:45:59 -0000
@@ -212,6 +212,7 @@ SHL3STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(VOSLIB) \
+ $(COMPHELPERLIB) \
$(SALLIB)
SHL3DEF= $(MISC)$/$(SHL3TARGET).def
Index: source/ui/misc/glosdoc.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/glosdoc.cxx,v
retrieving revision 1.19
diff -u -p -r1.19 glosdoc.cxx
--- openoffice.org.orig/sw/source/ui/misc/glosdoc.cxx 11 Jan 2005 12:42:19 -0000 1.19
+++ openoffice.org/sw/source/ui/misc/glosdoc.cxx 29 Jun 2005 11:02:03 -0000
@@ -577,19 +577,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bo
}
aDirArr.DeleteAndDestroy(0, aDirArr.Count());
- if(!nTokenCount ||
- sErrPath.Len() && (bPathChanged || sOldErrPath != sErrPath) )
- {
- sOldErrPath = sErrPath;
- // Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht
-
- ErrorHandler::HandleError( *new StringErrorInfo(
- ERR_AUTOPATH_ERROR, sErrPath,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR ));
- bError = sal_True;
- }
- else
- bError = sal_False;
+ bError = sal_False;
if(pGlosArr)
{
Index: registry/schema/org/openoffice/Office/Common.xcs
===================================================================
RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
retrieving revision 1.107
diff -u -p -u -r1.107 Common.xcs
--- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2 Feb 2005 16:41:38 -0000 1.107
+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs 29 Jun 2005 11:08:26 -0000
@@ -1288,7 +1288,7 @@ Dymamic border coloring means that when
<author>OS</author>
<desc>Contains the directory which contains the AutoText modules.</desc>
</info>
- <value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
+ <value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
</prop>
<prop oor:name="Backup" oor:type="xs:string">
<info>
@@ -1408,7 +1408,7 @@ Dymamic border coloring means that when
<author>MBA</author>
<desc>Specifies the templates originate from these folders and sub-folders.</desc>
</info>
- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+ <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
</prop>
<prop oor:name="UIConfig" oor:type="oor:string-list">
<info>
@@ -1460,7 +1460,7 @@ Dymamic border coloring means that when
<info>
<desc>Specifies the default directory where the AutoText modules are located.</desc>
</info>
- <value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
+ <value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
</prop>
<prop oor:name="Backup" oor:type="xs:string">
<info>
@@ -1556,7 +1556,7 @@ Dymamic border coloring means that when
<info>
<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
</info>
- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+ <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
</prop>
<prop oor:name="UIConfig" oor:type="oor:string-list">
<info>
Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java,v
retrieving revision 1.10
diff -u -p -u -r1.10 LetterWizardDialogImpl.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 20 May 2005 15:42:29 -0000 1.10
+++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 13 Jul 2005 11:22:44 -0000
@@ -754,18 +754,38 @@ public class LetterWizardDialogImpl exte
}
}
- private int getOfficeLinguistic() {
+ private int getOfficeLinguistic() {
+ boolean bMatch = false;
int oL = 0;
String OfficeLinguistic = Configuration.getOfficeLinguistic(xMSF);
+ if (
+ OfficeLinguistic.equalsIgnoreCase("en-IE") ||
+ OfficeLinguistic.equalsIgnoreCase("en-CA") ||
+ OfficeLinguistic.equalsIgnoreCase("en-NZ") ||
+ OfficeLinguistic.equalsIgnoreCase("en-AU")
+ )
+ {
+ OfficeLinguistic = "en-GB";
+ }
for (int i = 0; i < Norms.length; i++){
if (Norms[i].equalsIgnoreCase(OfficeLinguistic)) {
+ bMatch = true;
oL = i;
}
}
+ if (!bMatch) {
+ String[] portions = OfficeLinguistic.split("-");
+ OfficeLinguistic = portions[0];
+ for (int i = 0; i < Norms.length; i++){
+ if (Norms[i].equalsIgnoreCase(OfficeLinguistic)) {
+ oL = i;
+ }
+ }
+ }
return oL;
}
- private void setPossibleSenderData(boolean bState) {
+ private void setPossibleSenderData(boolean bState) {
setControlProperty("optSenderDefine", "Enabled", new Boolean(bState));
setControlProperty("optSenderPlaceholder", "Enabled", new Boolean(bState));
setControlProperty("lblSenderAddress", "Enabled", new Boolean(bState));
@@ -856,7 +881,7 @@ public class LetterWizardDialogImpl exte
if (ProdName.startsWith("Open")) {
//Add Languages for OpenOffice.org
- Norms = new String[16];
+ Norms = new String[18];
Norms[0] = "en-US";
Norms[1] = "de";
@@ -874,6 +899,8 @@ public class LetterWizardDialogImpl exte
Norms[13] = "da";
Norms[14] = "hu";
Norms[15] = "hr";
+ Norms[16] = "en-GB";
+ Norms[17] = "sk";
} else {
Norms = new String[11];
Index: com/sun/star/wizards/letter/LetterWizardDialogResources.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java,v
retrieving revision 1.5
diff -u -p -u -r1.5 LetterWizardDialogResources.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 3 May 2005 14:23:44 -0000 1.5
+++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 13 Jul 2005 11:22:44 -0000
@@ -14,10 +14,10 @@ public class LetterWizardDialogResources
final static int RID_LETTERWIZARDLANGUAGE_START = 3110;
final static int RID_RID_COMMON_START = 500;
- protected String[] RoadmapLabels = new String[7];
- protected String[] SalutationLabels = new String[3];
- protected String[] GreetingLabels = new String[3];
- protected String[] LanguageLabels = new String[16];
+ protected String[] RoadmapLabels = new String[7];
+ protected String[] SalutationLabels = new String[3];
+ protected String[] GreetingLabels = new String[3];
+ protected String[] LanguageLabels = new String[18];
String resOverwriteWarning;
String resTemplateDescription;
@@ -149,31 +149,31 @@ public class LetterWizardDialogResources
loadCommonResources();
}
- private void loadCommonResources() {
+ private void loadCommonResources() {
resOverwriteWarning = getResText(RID_RID_COMMON_START + 19);
resTemplateDescription = getResText(RID_RID_COMMON_START + 20);
}
- private void loadRoadmapResources() {
+ private void loadRoadmapResources() {
for (int i = 1; i < 7; i++) {
RoadmapLabels[i] = getResText(RID_LETTERWIZARDROADMAP_START + i);
}
}
- private void loadSalutationResources() {
+ private void loadSalutationResources() {
for (int i = 1; i < 4; i++) {
SalutationLabels[i-1] = getResText(RID_LETTERWIZARDSALUTATION_START + i);
}
}
- private void loadGreetingResources() {
+ private void loadGreetingResources() {
for (int i = 1; i < 4; i++) {
GreetingLabels[i-1] = getResText(RID_LETTERWIZARDGREETING_START + i);
}
}
- private void loadLanguageResources() {
- for (int i = 1; i < 17; i++) {
+ private void loadLanguageResources() {
+ for (int i = 1; i < 19; i++) {
LanguageLabels[i-1] = getResText(RID_LETTERWIZARDLANGUAGE_START + i);
}
Index: source/formwizard/dbwizres.src
===================================================================
RCS file: /cvs/installation/wizards/source/formwizard/dbwizres.src,v
retrieving revision 1.68
diff -u -p -u -r1.68 dbwizres.src
--- openoffice.org.orig/wizards/source/formwizard/dbwizres.src 3 May 2005 14:24:05 -0000 1.68
+++ openoffice.org/wizards/source/formwizard/dbwizres.src 13 Jul 2005 11:23:24 -0000
@@ -2515,6 +2515,17 @@ String RID_LETTERWIZARDLANGUAGE_START +
Text [ en-US] = "Croatian";
};
+String RID_LETTERWIZARDLANGUAGE_START + 17
+{
+ Text [ de ] = "International English";
+ Text [ en-US] = "International English";
+};
+
+String RID_LETTERWIZARDLANGUAGE_START + 18
+{
+ Text [ de ] = "Slovak";
+ Text [ en-US] = "Slovak";
+};
// ============================================================================
// ============================ ======================
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]