[Libreoffice-commits] .: sd/source unusedcode.easy vcl/inc vcl/source

2011-11-20 Thread Thomas Arnhold 
 sd/source/filter/eppt/grouptable.hxx  |1 -
 sd/source/filter/eppt/pptx-grouptable.cxx |8 
 unusedcode.easy   |4 
 vcl/inc/salgdi.hxx|5 -
 vcl/inc/vcl/graph.h   |1 -
 vcl/inc/vcl/graph.hxx |7 ---
 vcl/source/gdi/graph.cxx  |   18 --
 vcl/source/gdi/impgraph.cxx   |   13 -
 vcl/source/gdi/salgdilayout.cxx   |8 
 9 files changed, 65 deletions(-)

New commits:
commit a84651f39d4afe662181f695a1a15c4dfe96e7e6
Author: Thomas Arnhold 
Date:   Sun Nov 20 04:06:00 2011 +0100

Remove some unused methods

diff --git a/sd/source/filter/eppt/grouptable.hxx 
b/sd/source/filter/eppt/grouptable.hxx
index d9e1166..23b2951 100644
--- a/sd/source/filter/eppt/grouptable.hxx
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -72,7 +72,6 @@ class GroupTable
 ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess > &
 GetCurrentGroupAccess() const { return 
mpGroupEntry[  mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
 sal_uInt32  GetGroupsClosed();
-voidSkipCurrentGroup();
 voidResetGroupTable( sal_uInt32 nCount );
 voidClearGroupTable();
 sal_BoolEnterGroup( ::com::sun::star::uno::Reference< 
::com::sun::star::container::XIndexAccess > & rIndex );
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx 
b/sd/source/filter/eppt/pptx-grouptable.cxx
index fed63ac..18f4019 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -131,12 +131,4 @@ sal_Bool GroupTable::GetNextGroupEntry()
 
 // 
-
 
-void GroupTable::SkipCurrentGroup()
-{
-if ( mnCurrentGroupEntry )
-delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-}
-
-// 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 46e92f4..40bb39a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -145,10 +145,6 @@ GDIMetaFile::Wind(unsigned long)
 GDIMetaFile::WindEnd()
 GDIMetaFile::WindNext()
 GraphCtrl::GraphCtrl(Window*, long)
-Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point 
const&, Size const&)
-Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
-GraphicReader::IsPreviewModeEnabled() const
-GroupTable::SkipCurrentGroup()
 GtkSalFrame::popIgnoreDamage()
 GtkSalFrame::pushIgnoreDamage()
 HTMLControls::Insert(HTMLControl const*&, unsigned short&)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 75559cb..1394c17 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -470,11 +470,6 @@ public:
  Rectangle &rNativeContentRegion,
  const OutputDevice *pOutDev );
 
-static void AddDevFontSubstitute( OutputDevice* pOutDev,
-  const String& rFontName,
-  const String& rReplaceFontName,
-  sal_uInt16 nFlags = 0 );
-
 bool DrawAlphaBitmap( const SalTwoRect&,
   const SalBitmap& rSourceBitmap,
   const SalBitmap& rAlphaBitmap,
diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index 1df2ee7..b926936 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.h
@@ -73,7 +73,6 @@ public:
 
 // TODO: when incompatible changes are possible again
 // the preview size hint should be redone
-sal_BoolIsPreviewModeEnabled() const;
 voidDisablePreviewMode();
 voidSetPreviewSize( const Size& );
 SizeGetPreviewSize() const;
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index d34a213..c5d57f4 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -155,19 +155,12 @@ public:
 voidDraw( OutputDevice* pOutDev,
   const Point& rDestPt,
   const Size& rDestSize ) const;
-static void Draw( OutputDevice* pOutDev, const String& rText,
-  Font& rFont, const Bitmap& rBitmap,
-  const Point& rDestPt, const Size& rDestSize );
 static void DrawEx( OutputDevice* pOutDev, const String& rText,
   Font& rFont, const BitmapEx& rBitmap,
   const Point& rDestPt, const Size& rDestSize );
 
 voidStartAnimation( OutputDevice* pOutDev,
 const Point& rDestPt,
-

[Libreoffice-commits] .: patches/dev300

2011-11-20 Thread Bjoern Michaelsen 
 patches/dev300/apply|5 -
 patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff |   47 
--
 2 files changed, 52 deletions(-)

New commits:
commit 6715e1c1572d6b8902d841389ba9fbf162174f66
Author: Bjoern Michaelsen 
Date:   Sun Nov 20 13:59:06 2011 +0100

fdo#43105 related: patch does not help for the supposed testcase

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee2f3d5..37041fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -189,11 +189,6 @@ svx-hacky-htmlselect-control-import.diff, n#523191, 
noelpwer
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 
-# temporary fix. does no harm and gets the job done but its not
-# beautiful. Since the whole section needs to be refactored anyway decided not
-# to waste for time with this fix but to focus on the refactoring
-sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
-
 # FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
 
 # FIXME: 2009-09-11: I wonder when this has been commented out, and
diff --git a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff 
b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
deleted file mode 100644
index 2fe086c..000
--- a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
+++ /dev/null
@@ -1,47 +0,0 @@

- sw/source/filter/ww8/ww8par.cxx |   10 --
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 1101227..e89e330 100644
 sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -2075,6 +2075,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
- nCellLevel = 0 != pPlcxMan->HasParaSprm(0x244B);
- }
- 
-+ mark:
-+
- WW8_TablePos *pTabPos=0;
- WW8_TablePos aTabPos;
- if (nCellLevel && !bVer67)
-@@ -2088,7 +2090,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
- if (const BYTE *pLevel = pPlcxMan->HasParaSprm(0x6649))
- nCellLevel = *pLevel;
- 
--bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
-+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablehttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/source

2011-11-20 Thread Jan Holesovsky 
 sc/inc/queryentry.hxx  |3 ++-
 sc/source/core/tool/queryentry.cxx |3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 840e2f3ef5b73807403084edf09b5e53a097dcb3
Author: Jan Holesovsky 
Date:   Sun Nov 20 15:12:50 2011 +0100

Inline ScQueryEntry::Item::Item() to fix Windows build.

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 835c84a..5c88730 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -52,7 +52,8 @@ struct SC_DLLPUBLIC ScQueryEntry
 doublemfVal;
 rtl::OUString maString;
 
-Item();
+Item() : meType(ByValue), mfVal(0.0) {}
+
 bool operator== (const Item& r) const;
 };
 typedef std::vector QueryItemsType;
diff --git a/sc/source/core/tool/queryentry.cxx 
b/sc/source/core/tool/queryentry.cxx
index 47a88e7..be107e7 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -39,9 +39,6 @@
 #define SC_EMPTYFIELDS  ((double)0x0042)
 #define SC_NONEMPTYFIELDS   ((double)0x0043)
 
-ScQueryEntry::Item::Item() :
-meType(ByValue), mfVal(0.0) {}
-
 bool ScQueryEntry::Item::operator== (const Item& r) const
 {
 return meType == r.meType && mfVal == r.mfVal && 
maString.equals(r.maString);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sal/osl

2011-11-20 Thread Tor Lillqvist 
 sal/osl/android/src/fi/iki/tml/CommandLine.java|  176 +
 sal/osl/android/src/org/libreoffice/android/Bootstrap.java |   10 
 2 files changed, 179 insertions(+), 7 deletions(-)

New commits:
commit 8ec713573073baa3bb90e6a4051938d700480c03
Author: Tor Lillqvist 
Date:   Sun Nov 20 18:07:32 2011 +0200

Use proper command line parsing for the lo-main-cmdline extra string

diff --git a/sal/osl/android/src/org/libreoffice/android/Bootstrap.java 
b/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
index 505b72e..5df072d 100644
--- a/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
+++ b/sal/osl/android/src/org/libreoffice/android/Bootstrap.java
@@ -34,6 +34,8 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 
+import fi.iki.tml.CommandLine;
+
 // We override NativeActivity so that we can get at the intent of the
 // activity and its extra parameters, that we use to tell us what
 // actual LibreOffice "program" to run. I.e. something that on desktop
@@ -111,13 +113,7 @@ public class Bootstrap extends NativeActivity
 
 Log.i(TAG, String.format("cmdLine=%s", cmdLine));
 
-String[] argv = cmdLine.split(" ");
-
-// As we don't do any shell style quote handling, to enable
-// having spaces in argv elements, they need to be entered as
-// '~' characters which we here change into spaces...
-for (int i = 0; i < argv.length; i++)
-argv[i] = argv[i].replace('~', ' ');
+String[] argv = CommandLine.split(cmdLine);
 
 // Load the LO "program" here and look up lo_main
 int loLib = dlopen(mainLibrary);
commit 5d01d4e37c9e0aa5f1139eed3ea159fa5217e031
Author: Tor Lillqvist 
Date:   Sun Nov 20 18:06:37 2011 +0200

Unix style command line parser

diff --git a/sal/osl/android/src/fi/iki/tml/CommandLine.java 
b/sal/osl/android/src/fi/iki/tml/CommandLine.java
new file mode 100644
index 000..fb5adec
--- /dev/null
+++ b/sal/osl/android/src/fi/iki/tml/CommandLine.java
@@ -0,0 +1,176 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
+// Copyright (C) 2011 Tor Lillqvist 
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+package fi.iki.tml;
+
+import java.util.*;
+
+public class CommandLine
+implements Iterable
+{
+private String commandLine;
+
+public class Tokenizer
+implements Iterator
+{
+private int index = 0;
+private String savedNext = null;
+
+public Tokenizer()
+{
+}
+
+public boolean hasNext()
+{
+if (savedNext != null)
+return true;
+try {
+savedNext = next();
+return true;
+}
+catch (NoSuchElementException e) {
+}
+return false;
+}
+
+public String next()
+{
+if (savedNext != null) {
+String result = savedNext;
+savedNext = null;
+return result;
+}
+
+StringBuffer sb = new StringBuffer(commandLine.length());
+
+while (index < commandLine.length() &&
+   commandLine.charAt(index) == ' ')
+index++;
+
+if (index == commandLine.length())
+throw new NoSuchElementException();
+
+while (index < commandLine.length() &&
+   commandLine.charAt(index) != ' ') {
+char c = commandLine.charAt(index);
+if (c == '\'') {
+index++;
+while (index < commandLine.length() &&
+   commandLine.charAt(index) != '\'') {
+sb.append(commandLine.charAt(index));
+index++;
+}
+} else if (c == '"') {
+index++;

[Libreoffice-commits] .: connectivity/source

2011-11-20 Thread Lionel Elie Mamane 
 connectivity/source/drivers/ado/Aservices.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e9473eca6f559bc83eb061384b0db936e4ed8e1
Author: Lionel Elie Mamane 
Date:   Sun Nov 20 17:38:23 2011 +0100

fdo#36555: pImplementationName is not a compile-time constant

diff --git a/connectivity/source/drivers/ado/Aservices.cxx 
b/connectivity/source/drivers/ado/Aservices.cxx
index 5fd7231..38876d8 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -59,7 +59,7 @@ struct ProviderRequest
 sal_Char const* pImplementationName
 )
 : xServiceManager(reinterpret_cast(pServiceManager))
-, 
sImplementationName(OUString(RTL_CONSTASCII_USTRINGPARAM(pImplementationName)))
+, sImplementationName(OUString::createFromAscii(pImplementationName))
 {
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/Library_sb.mk basic/source

2011-11-20 Thread August Sodora 
 basic/Library_sb.mk   |1 
 basic/source/comp/scanner.cxx |  110 +++---
 basic/source/comp/token.cxx   |4 -
 basic/source/inc/scanner.hxx  |   40 ---
 4 files changed, 13 insertions(+), 142 deletions(-)

New commits:
commit 7cc258f35b5b2eef542827ddf03323c5c2b6c794
Author: August Sodora 
Date:   Sun Nov 20 17:15:33 2011 -0500

Refactor BasicCharClass out from scanner and make it a singleton

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 8b2e152..50608d4 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/classes/sbintern \
basic/source/classes/sbunoobj \
basic/source/classes/sbxmod \
+   basic/source/comp/basiccharclass \
basic/source/comp/buffer \
basic/source/comp/codegen \
basic/source/comp/dim \
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 3336f0d..8c0d10c 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
 
+#include "basiccharclass.hxx"
 #include "sbcomp.hxx"
 
 #include 
@@ -151,20 +152,10 @@ static SbxDataType GetSuffixType( sal_Unicode c )
 // return value is sal_False at EOF or errors
 #define BUF_SIZE 80
 
-namespace {
-
-/** Returns true, if the passed character is a white space character. */
-inline bool lclIsWhitespace( sal_Unicode cChar )
-{
-return (cChar == ' ') || (cChar == '\t') || (cChar == '\f');
-}
-
-} // namespace
-
 void SbiScanner::scanGoto()
 {
 short nTestCol = nCol;
-while(nTestCol < aLine.getLength() && lclIsWhitespace(aLine[nTestCol]))
+while(nTestCol < aLine.getLength() && 
theBasicCharClass::get().isWhitespace(aLine[nTestCol]))
 nTestCol++;
 
 if(nTestCol + 1 < aLine.getLength())
@@ -206,7 +197,7 @@ bool SbiScanner::NextSym()
 p2++, n++;
 // #163944# ignore trailing whitespace
 sal_Int32 nCopyEndPos = n;
-while( (nBufPos < nCopyEndPos) && lclIsWhitespace( aBuf[ nCopyEndPos - 
1 ] ) )
+while( (nBufPos < nCopyEndPos) && 
theBasicCharClass::get().isWhitespace( aBuf[ nCopyEndPos - 1 ] ) )
 --nCopyEndPos;
 aLine = aBuf.copy( nBufPos, nCopyEndPos - nBufPos );
 if( n < nLen )
@@ -224,7 +215,7 @@ bool SbiScanner::NextSym()
 }
 
 
-while( lclIsWhitespace( *pLine ) )
+while( theBasicCharClass::get().isWhitespace( *pLine ) )
 pLine++, nCol++, bSpaces = true;
 
 nCol1 = nCol;
@@ -244,7 +235,7 @@ bool SbiScanner::NextSym()
 }
 
 // copy character if symbol
-if( BasicSimpleCharClass::isAlpha( *pLine, bCompatible ) || *pLine == '_' )
+if( theBasicCharClass::get().isAlpha( *pLine, bCompatible ) || *pLine == 
'_' )
 {
 // if there's nothing behind '_' , it's the end of a line!
 if( *pLine == '_' && !*(pLine+1) )
@@ -252,7 +243,7 @@ bool SbiScanner::NextSym()
 goto eoln;  }
 bSymbol = true;
 short n = nCol;
-for ( ; (BasicSimpleCharClass::isAlphaNumeric( *pLine, bCompatible ) 
|| ( *pLine == '_' ) ); pLine++ )
+for ( ; (theBasicCharClass::get().isAlphaNumeric( *pLine, bCompatible 
) || ( *pLine == '_' ) ); pLine++ )
 nCol++;
 aSym = aLine.copy( n, nCol - n );
 
@@ -275,7 +266,7 @@ bool SbiScanner::NextSym()
 // type recognition?
 // don't test the exclamation mark
 // if there's a symbol behind it
-else if( *pLine != '!' || !BasicSimpleCharClass::isAlpha( pLine[ 1 ], 
bCompatible ) )
+else if( *pLine != '!' || !theBasicCharClass::get().isAlpha( pLine[ 1 
], bCompatible ) )
 {
 SbxDataType t = GetSuffixType( *pLine );
 if( t != SbxVARIANT )
@@ -288,8 +279,8 @@ bool SbiScanner::NextSym()
 }
 
 // read in and convert if number
-else if( BasicSimpleCharClass::isDigit( *pLine & 0xFF )
-|| ( *pLine == '.' && BasicSimpleCharClass::isDigit( *(pLine+1) & 0xFF 
) ) )
+else if( theBasicCharClass::get().isDigit( *pLine & 0xFF )
+ || ( *pLine == '.' && theBasicCharClass::get().isDigit( 
*(pLine+1) & 0xFF ) ) )
 {
 short exp = 0;
 short comma = 0;
@@ -394,7 +385,7 @@ bool SbiScanner::NextSym()
 long l = 0;
 int i;
 bool bBufOverflow = false;
-while( BasicSimpleCharClass::isAlphaNumeric( *pLine & 0xFF, 
bCompatible ) )
+while( theBasicCharClass::get().isAlphaNumeric( *pLine & 0xFF, 
bCompatible ) )
 {
 sal_Unicode ch = sal::static_int_cast< sal_Unicode >(
 toupper( *pLine & 0xFF ) );
@@ -527,85 +518,4 @@ eoln:
 }
 }
 
-LetterTable BasicSimpleCharClass::aLetterTable;
-
-LetterTable::LetterTable( void )
-{
-for( int i = 0 ; i < 256 ; ++i )
-IsLetterTab[i] = false;
-
-

[Libreoffice-commits] .: basic/source

2011-11-20 Thread August Sodora 
 basic/source/comp/basiccharclass.cxx |  139 +++
 basic/source/inc/basiccharclass.hxx  |   51 
 2 files changed, 190 insertions(+)

New commits:
commit 25ade2f357f1cedf76919f61ae8d81fda7bdf88d
Author: August Sodora 
Date:   Sun Nov 20 17:15:33 2011 -0500

Refactor BasicCharClass out from scanner and make it a singleton

diff --git a/basic/source/comp/basiccharclass.cxx 
b/basic/source/comp/basiccharclass.cxx
new file mode 100644
index 000..eb11a39
--- /dev/null
+++ b/basic/source/comp/basiccharclass.cxx
@@ -0,0 +1,139 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#include "basiccharclass.hxx"
+
+#include 
+#include 
+
+BasicCharClass::BasicCharClass()
+{
+  for( sal_uInt16 i = 0; i < 256; ++i )
+IsLetterTab[i] = false;
+
+  IsLetterTab[0xC0] = true;   // À , CAPITAL LETTER A WITH GRAVE ACCENT
+  IsLetterTab[0xC1] = true;   // Á , CAPITAL LETTER A WITH ACUTE ACCENT
+  IsLetterTab[0xC2] = true;   // Â , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xC3] = true;   // Ã , CAPITAL LETTER A WITH TILDE
+  IsLetterTab[0xC4] = true;   // Ä , CAPITAL LETTER A WITH DIAERESIS
+  IsLetterTab[0xC5] = true;   // Å , CAPITAL LETTER A WITH RING ABOVE
+  IsLetterTab[0xC6] = true;   // Æ , CAPITAL LIGATURE AE
+  IsLetterTab[0xC7] = true;   // Ç , CAPITAL LETTER C WITH CEDILLA
+  IsLetterTab[0xC8] = true;   // È , CAPITAL LETTER E WITH GRAVE ACCENT
+  IsLetterTab[0xC9] = true;   // É , CAPITAL LETTER E WITH ACUTE ACCENT
+  IsLetterTab[0xCA] = true;   // Ê , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xCB] = true;   // Ë , CAPITAL LETTER E WITH DIAERESIS
+  IsLetterTab[0xCC] = true;   // Ì , CAPITAL LETTER I WITH GRAVE ACCENT
+  IsLetterTab[0xCD] = true;   // Í , CAPITAL LETTER I WITH ACUTE ACCENT
+  IsLetterTab[0xCE] = true;   // Î , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xCF] = true;   // Ï , CAPITAL LETTER I WITH DIAERESIS
+  IsLetterTab[0xD0] = true;   // Ð , CAPITAL LETTER ETH
+  IsLetterTab[0xD1] = true;   // Ñ , CAPITAL LETTER N WITH TILDE
+  IsLetterTab[0xD2] = true;   // Ò , CAPITAL LETTER O WITH GRAVE ACCENT
+  IsLetterTab[0xD3] = true;   // Ó , CAPITAL LETTER O WITH ACUTE ACCENT
+  IsLetterTab[0xD4] = true;   // Ô , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xD5] = true;   // Õ , CAPITAL LETTER O WITH TILDE
+  IsLetterTab[0xD6] = true;   // Ö , CAPITAL LETTER O WITH DIAERESIS
+  IsLetterTab[0xD8] = true;   // Ø , CAPITAL LETTER O WITH STROKE
+  IsLetterTab[0xD9] = true;   // Ù , CAPITAL LETTER U WITH GRAVE ACCENT
+  IsLetterTab[0xDA] = true;   // Ú , CAPITAL LETTER U WITH ACUTE ACCENT
+  IsLetterTab[0xDB] = true;   // Û , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xDC] = true;   // Ü , CAPITAL LETTER U WITH DIAERESIS
+  IsLetterTab[0xDD] = true;   // Ý , CAPITAL LETTER Y WITH ACUTE ACCENT
+  IsLetterTab[0xDE] = true;   // Þ , CAPITAL LETTER THORN
+  IsLetterTab[0xDF] = true;   // ß , SMALL LETTER SHARP S
+  IsLetterTab[0xE0] = true;   // à , SMALL LETTER A WITH GRAVE ACCENT
+  IsLetterTab[0xE1] = true;   // á , SMALL LETTER A WITH ACUTE ACCENT
+  IsLetterTab[0xE2] = true;   // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xE3] = true;   // ã , SMALL LETTER A WITH TILDE
+  IsLetterTab[0xE4] = true;   // ä , SMALL LETTER A WITH DIAERESIS
+  IsLetterTab[0xE5] = true;   // å , SMALL LETTER A WITH RING ABOVE
+  IsLetterTab[0xE6] = true;   // æ , SMALL LIGATURE AE
+  IsLetterTab[0xE7] = true;   // ç , SMALL LETTER C WITH CEDILLA
+  IsLetterTab[0xE8] = true;   // è , SMALL LETTER E WITH GRAVE ACCENT
+  IsLetterTab[0xE9] = true;   // é , SMALL LETTER E WITH ACUTE ACCENT
+  IsLetterTab[0xEA] = true;   // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT
+  IsLetterTab[0xEB]

[Libreoffice-commits] .: 3 commits - writerfilter/source

2011-11-20 Thread Miklos Vajna 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 8731f2554918fe7572f78a21d4b0521d6f27efe4
Author: Miklos Vajna 
Date:   Mon Nov 21 00:13:41 2011 +0100

Related: i#83069 fix crash in DomainMapper_Impl::FindOrCreateFieldMaster

The next line would deference a NULL pointer otherwise, so use 
UNO_QUERY_THROW.

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2d87819..a77d838 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1697,7 +1697,7 @@ uno::Reference< beans::XPropertySet > 
DomainMapper_Impl::FindOrCreateFieldMaster
 throw(::com::sun::star::uno::Exception)
 {
 // query master, create if not available
-uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( 
GetTextDocument(), uno::UNO_QUERY );
+uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( 
GetTextDocument(), uno::UNO_QUERY_THROW );
 uno::Reference< container::XNameAccess > xFieldMasterAccess = 
xFieldsSupplier->getTextFieldMasters();
 uno::Reference< beans::XPropertySet > xMaster;
 ::rtl::OUString sFieldMasterService( 
::rtl::OUString::createFromAscii(pFieldMasterService) );
commit 9b78fe962114cffc0d744767bbb3f6a0e8904739
Author: Miklos Vajna 
Date:   Mon Nov 21 00:07:54 2011 +0100

Related: i#60831 fix RTF import of DOCPROPERTY fields

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1c99ce2..2d87819 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2150,7 +2150,8 @@ void DomainMapper_Impl::handleAuthor
 {
 sServiceName += sFieldServiceName;
 }
-xFieldInterface = m_xTextFactory->createInstance(sServiceName);
+if (m_xTextFactory.is())
+xFieldInterface = m_xTextFactory->createInstance(sServiceName);
 xFieldProperties =
 uno::Reference< beans::XPropertySet >( xFieldInterface,
 uno::UNO_QUERY_THROW);
commit 3ece03f3d4b139bbe8e153111a0ff38781d27922
Author: Miklos Vajna 
Date:   Mon Nov 21 00:03:42 2011 +0100

Related: i#93039 fix RTF import of MACROBUTTON fields

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index df47858..1c99ce2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2678,11 +2678,12 @@ void DomainMapper_Impl::CloseFieldCommand()
 //extract macro name
 sal_Int32 nIndex = sizeof(" MACROBUTTON ");
 ::rtl::OUString sMacro = 
pContext->GetCommand().getToken( 0, ' ', nIndex);
-xFieldProperties->setPropertyValue(
-rPropNameSupplier.GetName(PROP_MACRO_NAME), 
uno::makeAny( sMacro ));
+if (xFieldProperties.is())
+xFieldProperties->setPropertyValue(
+
rPropNameSupplier.GetName(PROP_MACRO_NAME), uno::makeAny( sMacro ));
 
 //extract quick help text
-if( pContext->GetCommand().getLength() > nIndex + 1)
+if(xFieldProperties.is() && 
pContext->GetCommand().getLength() > nIndex + 1)
 {
 xFieldProperties->setPropertyValue(
 rPropNameSupplier.GetName(PROP_HINT),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - icu/icu4c-android.patch icu/makefile.mk sal/osl solenv/gbuild

2011-11-20 Thread Tor Lillqvist 
 icu/icu4c-android.patch   |   11 +
 icu/makefile.mk   |5 
 sal/osl/android/Makefile  |   35 ++
 sal/osl/unx/file.cxx  |   21 ++
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk |   13 +++
 5 files changed, 67 insertions(+), 18 deletions(-)

New commits:
commit c249a509424f8fdce781ad359da6c407e54b9cad
Author: Tor Lillqvist 
Date:   Mon Nov 21 01:44:24 2011 +0200

Enforce lib prefix for UNO components here, too

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 7fc6a51..cbcd3e6 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -65,4 +65,17 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1))
 endef
 
+# Prefix UNO library filenames with "lib"
+gb_Library_FILENAMES := \
+   $(foreach 
lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT))
 \
+   $(foreach 
lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+   $(foreach 
lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+   $(foreach 
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+   $(foreach 
lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+   $(foreach 
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
 \
+   $(foreach 
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
+   $(foreach 
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
 \
+   $(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
+
+
 # vim: set noet sw=4:
commit 789bbd9219201644420b4fb7f53e830810b83148
Author: Tor Lillqvist 
Date:   Mon Nov 21 01:38:26 2011 +0200

Include more stuff in the .apk needed by test_i18npool_test_breakiterator

Now it runs until a crash caused by ICU library mixup between our ones
and the system ones, they have the same names but aren't
compatible... (see 7ee03666d7cfc27453315e1682e3c32d39a031b6).

diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index a607d93..f772b84 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -43,11 +43,11 @@ ndk-build:
 # and ones from other modules. Note that depending on when you try
 # this, these might not have been built yet.
 #
-   -for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
+   for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \
$(call CONDCOPY,$${F},`basename $${F}`); \
done
 #
-   -for F in i18npool_test_breakiterator; do \
+   for F in i18npool_test_breakiterator; do \
$(call 
CONDCOPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
done
 
@@ -57,28 +57,45 @@ ndk-build:
 #
 # Libs and UNO components that the tests from other modules need.
 #
-   -for F in gcc3_uno \
+   for F in $(strip \
+ comphelpgcc3 \
+ gcc3_uno \
+ i18nisolang1gcc3 \
+ i18nutilgcc3 \
+ icudata \
+ icui18n \
+ icuuc \
  reg \
  store \
+ ucbhelper4gcc3 \
  uno_cppu \
  uno_salhelpergcc3 \
  uno_cppuhelpergcc3 \
  unoexceptionprotector \
  xml2 \
  xmlreader \
- bootstrap.uno; do \
+ bootstrap.uno \
+ i18npool.uno); do \
$(call CONDCOPY,$(OUTDIR)/lib/lib$${F}.so); \
done
 #
 # Then the shared GNU C++ library
$(call 
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
+#
+# Then other "assets". Let the directory structure under assets mimic
+# that under solver for now.
+   mkdir -p assets/bin assets/xml/ure assets/ComponentTarget/i18npool/util
+   cp $(OUTDIR)/bin/udkapi.rdb assets/bin
+   cp $(OUTDIR)/bin/types.rdb assets/bin
+   cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
+   cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component 
assets/ComponentTarget/i18npool/util
 
 install: ndk-build
unset JAVA_HOME && ant debug install
 
 run: install
-# Note: this is of course just an example. The full path the the test
-# .so needs to be supplied, unfortunately, I guess cppunittester
-# checks its existance using the pathname instead of just
-# osl_loadModule'ing it.
-   adb shell am start -n org.libreoffice.android/.Bootstrap -e 
lo-main-library libcppunittester -e lo-main-cmdline 
"/data/data/org.libreoffice.android/lib/libqa_sal_types.so"
+# Note: these are just examples. The full path the t

[Libreoffice-commits] .: sal/osl

2011-11-20 Thread Tor Lillqvist 
 sal/osl/android/.gitignore |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0218f14776d14a67f8524a798d0defbda042d4d1
Author: Tor Lillqvist 
Date:   Mon Nov 21 01:53:28 2011 +0200

Ignore also "assets"

diff --git a/sal/osl/android/.gitignore b/sal/osl/android/.gitignore
index bc4ef79..9034b98 100644
--- a/sal/osl/android/.gitignore
+++ b/sal/osl/android/.gitignore
@@ -1,3 +1,4 @@
+assets
 bin
 gen
 libs
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
commit db23e2f62d1755c177b5a4828766bd40775849e2
Author: Andras Timar 
Date:   Mon Nov 21 00:07:07 2011 +0100

in perl there are no barewords for true/false

commit 94d29a3e5195789047476debb90e5059f559887b
Author: Andras Timar 
Date:   Mon Nov 21 00:04:29 2011 +0100

only one launcher icon for silent MSI

commit 9185c3fc9b2a094780f3365e97c76da8f184b17b
Author: Andras Timar 
Date:   Sun Nov 20 21:41:53 2011 +0100

add --enable-silent-msi configure switch

On Windows it is now configurable to create an MSI installer
which installs LibreOffice without user interaction.

commit fab39e8f8d882a243d4b61b6ab3d8cac8b8f4c70
Author: Andras Timar 
Date:   Sun Nov 20 21:33:20 2011 +0100

merge transforms to msi as substorages and update summary information

commit 878a2c45b2f9787894eb1aee2f2ea6908a55be36
Author: Andras Timar 
Date:   Sun Nov 20 21:28:07 2011 +0100

remove setup.exe and setup.ini from Windows installdir

commit 5a0f538158b47aa5d4aa9d35c9b6b15c661a3ea9
Author: Jan Holesovsky 
Date:   Sun Nov 20 16:59:08 2011 +0100

x64 merge modules are not mandatory, only warn when they are missing.

commit a61712b97f54e92c2d001fe90fe1fff0e6fa5107
Author: Andras Timar 
Date:   Sun Nov 20 14:48:02 2011 +0100

copy msvcrt merge modules into the tree

commit b812ed2e203c26a2d5a06d34c9e1243b6d5db9f6
Author: Andras Timar 
Date:   Sun Nov 20 13:42:46 2011 +0100

leave out redist and readmes from win installdir

and make x64 merge modules optional

commit f6f5542ceea3650d770b0505faa658d021f7d6cf
Author: Andras Timar 
Date:   Sun Nov 20 13:37:52 2011 +0100

include cab in msi

commit bee4f50018f1c53f1f245501b06a5d07eb424fe0
Author: Andras Timar 
Date:   Thu Nov 17 15:59:17 2011 +0100

don't create download (nsis) install sets on Windows

commit 96c0f1b3f7775cf071588d99043452fddccacd80
Author: Andras Timar 
Date:   Fri Oct 21 10:36:45 2011 +0200

add merge modules to scp2

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2011-11-20 Thread Miklos Vajna 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fcae5e4103bb16bd44a48c2b63dcbafa9b438a9e
Author: Miklos Vajna 
Date:   Mon Nov 21 01:24:07 2011 +0100

Related: i#86517 avoid crash on invalid LEVELTEXT

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ffc3846..3b79937 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2794,7 +2794,11 @@ int RTFDocumentImpl::popState()
 
 // The first character is the length of the string (the rest should be 
ignored).
 sal_Int32 nLength(aStr.toChar());
-OUString aValue = aStr.copy(1, nLength);
+OUString aValue;
+if (nLength <= aStr.getLength())
+aValue = aStr.copy(1, nLength);
+else
+aValue = aStr;
 RTFValue::Pointer_t pValue(new RTFValue(aValue, true));
 
m_aStates.top().aTableAttributes->push_back(make_pair(NS_ooxml::LN_CT_LevelText_val,
 pValue));
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/onemsi'

2011-11-20 Thread Andras Timar 
New branch 'feature/onemsi' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-20 Thread August Sodora 
 sw/source/filter/html/parcss1.hxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 58b1a6ccc64d08a8a2c63071c0081883648cd6cb
Author: August Sodora 
Date:   Sun Nov 20 22:48:30 2011 -0500

cppcheck: Unused private function 'CSS1Parser::SetLineNr'

diff --git a/sw/source/filter/html/parcss1.hxx 
b/sw/source/filter/html/parcss1.hxx
index 1bbcfae..f4a0474 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -233,7 +233,6 @@ class CSS1Parser
 
 sal_uInt32 IncLineNr() { return ++nlLineNr; }
 sal_uInt32 IncLinePos() { return ++nlLinePos; }
-inline sal_uInt32 SetLineNr( sal_uInt32 nlNum );// inline unten
 inline sal_uInt32 SetLinePos( sal_uInt32 nlPos );   // inline unten
 
 // Parsen von Teilen der Grammatik
@@ -276,13 +275,6 @@ public:
 inline sal_uInt32   GetLinePos() const  { return nlLinePos; }
 };
 
-inline sal_uInt32 CSS1Parser::SetLineNr( sal_uInt32 nlNum )
-{
-sal_uInt32 nlOld = nlLineNr;
-nlLineNr = nlNum;
-return nlOld;
-}
-
 inline sal_uInt32 CSS1Parser::SetLinePos( sal_uInt32 nlPos )
 {
 sal_uInt32 nlOld = nlLinePos;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/source

2011-11-20 Thread August Sodora 
 connectivity/source/drivers/dbase/dindexnode.cxx |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit d46118d174c98fe24995c137e3db1bb9b0cfc09c
Author: August Sodora 
Date:   Sun Nov 20 22:55:43 2011 -0500

cppcheck: struct or union member 'NodeData::aDbl' is never used

diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx 
b/connectivity/source/drivers/dbase/dindexnode.cxx
index 83026f7..bccca3f 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -685,11 +685,8 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
 rStream >> aChild;
 }
 
-union NodeData
-{
-double aDbl;
-char   aData[128];
-} aNodeData;
+char aData[128];
+
 //--
 void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
 {
@@ -703,22 +700,22 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& 
rPage) const
 {
 if (aKey.getValue().isNull())
 {
-memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-
rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
+memset(aData,0,rIndex.getHeader().db_keylen);
+rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen);
 }
 else
 rStream << (double) aKey.getValue();
 }
 else
 {
-memset(aNodeData.aData,0x20,rIndex.getHeader().db_keylen);
+memset(aData,0x20,rIndex.getHeader().db_keylen);
 if (!aKey.getValue().isNull())
 {
 ::rtl::OUString sValue = aKey.getValue();
 ByteString aText(sValue.getStr(), 
rIndex.m_pTable->getConnection()->getTextEncoding());
-
strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen,
 aText.Len()));
+
strncpy(aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, 
aText.Len()));
 }
-
rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
+rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen);
 }
 rStream << aChild;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-20 Thread August Sodora 
 sw/source/filter/html/parcss1.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 9d84030a5f9d859a9915c13ca429beb5bbc0ac6f
Author: August Sodora 
Date:   Sun Nov 20 23:06:15 2011 -0500

Remove unnecessary includes

diff --git a/sw/source/filter/html/parcss1.hxx 
b/sw/source/filter/html/parcss1.hxx
index f4a0474..f0a6255 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -29,10 +29,6 @@
 #ifndef _PARCSS1_HXX
 #define _PARCSS1_HXX
 
-#include 
-
-class Color;
-
 // Die Tokens des CSS1-Parsers
 enum CSS1Token
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-11-20 Thread August Sodora 
 basic/source/comp/buffer.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d71ffc855f02e186118c7e9ec59054e7aa0e4ecb
Author: August Sodora 
Date:   Sun Nov 20 23:26:31 2011 -0500

Remove unnecessary includes

diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index 2e0fb54..218ce4f 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -29,9 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basic.hxx"
 
-#include "sbcomp.hxx"
 #include "buffer.hxx"
-#include 
+#include "sbcomp.hxx"
 
 const static sal_uInt32 UP_LIMIT=0xFF00L;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-11-20 Thread August Sodora 
 basic/source/inc/symtbl.hxx |   15 +++
 1 file changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 7fc462044e6579aed96934d782e80d7a9e56f873
Author: August Sodora 
Date:   Sun Nov 20 23:32:13 2011 -0500

Remove unnecessary includes

diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 60223ba..8e4540e 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -29,23 +29,14 @@
 #ifndef _SYMTBL_HXX
 #define _SYMTBL_HXX
 
-#include 
-#include 
-#include 
-#include 
-
-class SbiSymDef;// base class
-class SbiProcDef;
 class SbiConstDef;
-class SbiSymPool;
-class SbiStringPool;
-
-class SvStream;
 class SbiParser;
+class SbiProcDef;
+class SbiStringPool;
+class SbiSymDef;// base class
 
 enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, SbRTL };
 
-
 // The string-pool collects string entries and
 // makes sure that they don't exist twice.
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-11-20 Thread August Sodora 
 basic/source/comp/symtbl.cxx |   32 ++--
 basic/source/inc/symtbl.hxx  |   14 +++---
 2 files changed, 21 insertions(+), 25 deletions(-)

New commits:
commit ee3ad385fb3ca476e57e80d7b77c1e184e52e1d8
Author: August Sodora 
Date:   Sun Nov 20 23:44:21 2011 -0500

Convert to boost::ptr_vector

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 4e6e932..22b31ea 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -34,7 +34,6 @@
 #include 
 #include 
 
-SV_IMPL_PTRARR(SbiStrings,String*)
 SV_IMPL_PTRARR(SbiSymbols,SbiSymDef*)
 
 // All symbol names are laid down int the symbol-pool's stringpool, so that
@@ -57,30 +56,27 @@ SbiStringPool::SbiStringPool( SbiParser* p )
 SbiStringPool::~SbiStringPool()
 {}
 
-
-const String& SbiStringPool::Find( sal_uInt16 n ) const
+const rtl::OUString& SbiStringPool::Find( sal_uInt32 n ) const
 {
-if( !n || n > aData.Count() )
-return aEmpty;
+if( n == 0 || n > aData.size() )
+return aEmpty; //hack, returning a reference to a simulation of null
 else
-return *aData.GetObject( n-1 );
+return aData[n - 1];
 }
 
-
-
-short SbiStringPool::Add( const String& rVal, sal_Bool bNoCase )
+short SbiStringPool::Add( const rtl::OUString& rVal, sal_Bool bNoCase )
 {
-sal_uInt16 n = aData.Count();
-for( sal_uInt16 i = 0; i < n; i++ )
+sal_uInt32 n = aData.size();
+for( sal_uInt32 i = 0; i < n; ++i )
 {
-String* p = aData.GetObject( i );
-if( (  bNoCase && p->Equals( rVal ) )
- || ( !bNoCase && p->EqualsIgnoreCaseAscii( rVal ) ) )
+rtl::OUString& p = aData[i];
+if( (  bNoCase && p == rVal )
+|| ( !bNoCase && p.equalsIgnoreAsciiCase( rVal ) ) )
 return i+1;
 }
-const String* pNew = new String( rVal );
-aData.Insert( pNew, n++ );
-return (short) n;
+
+aData.push_back(new rtl::OUString(rVal));
+return (short) ++n;
 }
 
 short SbiStringPool::Add( double n, SbxDataType t )
@@ -94,7 +90,7 @@ short SbiStringPool::Add( double n, SbxDataType t )
 case SbxDOUBLE:  snprintf( buf, sizeof(buf), "%.16g", n ); break;
 default: break;
 }
-return Add( String::CreateFromAscii( buf ) );
+return Add( rtl::OUString::createFromAscii( buf ) );
 }
 
 /***
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 8e4540e..33da527 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -29,6 +29,8 @@
 #ifndef _SYMTBL_HXX
 #define _SYMTBL_HXX
 
+#include 
+
 class SbiConstDef;
 class SbiParser;
 class SbiProcDef;
@@ -40,21 +42,19 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, 
SbRTL };
 // The string-pool collects string entries and
 // makes sure that they don't exist twice.
 
-SV_DECL_PTRARR_DEL(SbiStrings,String*,5,5)
-
 class SbiStringPool {
-SbiStrings aData;
-String aEmpty;  // for convenience
+const rtl::OUString aEmpty;
+boost::ptr_vector aData;
 SbiParser* pParser;
 public:
 SbiStringPool( SbiParser* );
~SbiStringPool();
-sal_uInt16 GetSize() const { return aData.Count(); }
+sal_uInt32 GetSize() const { return aData.size(); }
 // From 8.4.1999: default changed to sal_True because of #64236 -
 // change it back to sal_False when the bug is cleanly removed.
-short Add( const String&, sal_Bool=sal_True );
+short Add( const rtl::OUString&, sal_Bool=sal_True );
 short Add( double, SbxDataType );
-const String& Find( sal_uInt16 ) const;
+const rtl::OUString& Find( sal_uInt32 ) const;
 SbiParser* GetParser() { return pParser; }
 };
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits