[Libreoffice-commits] .: sc/inc

[Kohei Yoshida]

 sc/inc/dpobject.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit ba80af89a78b49954fd4a47ce95450d7f9247796
Author: Kohei Yoshida 
Date:   Thu Apr 5 00:58:20 2012 -0400

The real cleanup I meant to commit earlier...

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index af50eb6..4f97b40 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -64,8 +64,6 @@ class Rectangle;
 class SvStream;
 class ScDPSaveData;
 class ScDPOutput;
-class ScPivot;
-class ScPivotCollection;
 struct ScPivotParam;
 struct ScImportSourceDesc;
 class ScSheetSourceDesc;
@@ -210,7 +208,6 @@ public:
 boolFillOldParam(ScPivotParam& rParam) const;
 boolFillLabelData(sal_Int32 nDim, ScDPLabelData& Labels);
 boolFillLabelData(ScPivotParam& rParam);
-voidInitFromOldPivot(const ScPivot& rOld, ScDocument* 
pDoc, sal_Bool bSetSource);
 
 boolGetHierarchiesNA( sal_Int32 nDim, 
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& 
xHiers );
 boolGetHierarchies( sal_Int32 nDim, 
com::sun::star::uno::Sequence< rtl::OUString >& rHiers );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/core/data/sortparam.cxx |3 ---
 sc/source/core/data/table3.cxx|3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 08ee936f3d1cd0d0424dd50bc96da19faf424a86
Author: Markus Mohrhard 
Date:   Thu Apr 5 05:31:13 2012 +0200

small memory leak in table3.cxx

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 97b948b..7e766a3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -217,7 +217,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo )
 class ScSortInfoArray
 {
 private:
-ScSortInfo***pppInfo;
+ScSortInfo***   pppInfo;
 SCSIZE  nCount;
 SCCOLROWnStart;
 sal_uInt16  nUsedSorts;
@@ -245,6 +245,7 @@ public:
 delete ppInfo[j];
 delete [] ppInfo;
 }
+delete[] pppInfo;
 }
 ScSortInfo* Get( sal_uInt16 nSort, SCCOLROW nInd )
 { return (pppInfo[nSort])[ nInd - nStart ]; }
commit 9646685f3ead54fc67bc457a4804defce8a88e05
Author: Markus Mohrhard 
Date:   Thu Apr 5 05:29:01 2012 +0200

this does hopefully no longer result in a crash

diff --git a/sc/source/core/data/sortparam.cxx 
b/sc/source/core/data/sortparam.cxx
index 21bf327..1cafc92 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -182,14 +182,11 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, 
const ScSortParam& rOld )
 for (i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/ui/unoobj/scdetect.cxx |   39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

New commits:
commit a5eadc6aaafec92df23c57e258882a2c98ece0ad
Author: Eike Rathke 
Date:   Thu Apr 5 02:01:26 2012 +0200

resolved fdo#40021 don't let CSV import get confused by erroneous HTML 
detection

HTMLParser::IsHTMLFormat() is convinced that anything containing a valid 
HTML
tag would indeed be HTML, which is a rather idiotic assumption for us in the
case of "foo  bar" with a preselected CSV filter. So keep this 
detection to
the end.

The original order where preselected CSV had precedence over others was 
changed
with 9f1cc58c20ee365ff2a158ad69c1091e6ad11ac6

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 1fb1a84..0efb037 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -734,6 +734,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 // further checks for filters only if they are 
preselected: ASCII, HTML, RTF, DBase
 // without the preselection other filters (Writer) 
take precedence
 // DBase can't be detected reliably, so it also 
needs preselection
+
 bool bMaybeText = lcl_MayBeAscii( rStr );
 
 // get file header
@@ -741,21 +742,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 const sal_Size nTrySize = 80;
 rtl::OString aHeader = read_uInt8s_ToOString(rStr, 
nTrySize);
 
-if ( HTMLParser::IsHTMLFormat(aHeader.getStr()) )
-{
-// test for HTML
-if ( 
pPreselectedFilter->GetName().EqualsAscii(pFilterHtml) )
-{
-pFilter = pPreselectedFilter;
-}
-else
-{
-pFilter = aMatcher.GetFilter4FilterName( 
String::CreateFromAscii(pFilterHtmlWeb) );
-if ( bIsXLS )
-bFakeXLS = true;
-}
-}
-else if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) )
+if ( aHeader.copy(0, 5).equalsL("{\\rtf", 5) )
 {
 // test for RTF
 pFilter = aMatcher.GetFilter4FilterName( 
String::CreateFromAscii(pFilterRtf) );
@@ -774,6 +761,28 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 pFilter = pPreselectedFilter;
 else if ( 
pPreselectedFilter->GetFilterName().EqualsAscii(pFilterAscii) && bMaybeText )
 pFilter = pPreselectedFilter;
+else if ( 
HTMLParser::IsHTMLFormat(aHeader.getStr()) )
+{
+// test for HTML
+
+// HTMLParser::IsHTMLFormat() is convinced that
+// anything containing a valid HTML tag would
+// indeed be HTML, which is a rather idiotic
+// assumption for us in the case of
+// "foo  bar" with a preselected CSV
+// filter. So keep this detection to the end.
+
+if ( 
pPreselectedFilter->GetName().EqualsAscii(pFilterHtml) )
+{
+pFilter = pPreselectedFilter;
+}
+else
+{
+pFilter = aMatcher.GetFilter4FilterName( 
String::CreateFromAscii(pFilterHtmlWeb) );
+if ( bIsXLS )
+bFakeXLS = true;
+}
+}
 }
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/ui/unoobj/scdetect.cxx |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 09d98dfe89a651c1b33a07c3d23e20b266d163e7
Author: Eike Rathke 
Date:   Wed Apr 4 23:39:17 2012 +0200

resolved fdo#46699 do not write compound document header when reading 
0-length file

Creating an SotStorage with a 0-length stream has the side-effect of 
creating
the compound document (aka OLE storage) header on the stream and effectively
writing that to disk, thus garbling the empty file.

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 55ae121..1fb1a84 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -450,8 +450,17 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 pFilter = 0;
 if ( pStream )
 {
-SotStorageRef aStorage = new SotStorage ( pStream, false );
-if ( !aStorage->GetError() )
+pStream->Seek( STREAM_SEEK_TO_END);
+sal_Size nSize = pStream->Tell();
+pStream->Seek( 0);
+// Do not attempt to create an SotStorage on a
+// 0-length stream as that would create the compound
+// document header on the stream and effectively write to
+// disk!
+SotStorageRef aStorage;
+if (nSize > 0)
+aStorage = new SotStorage ( pStream, false );
+if ( aStorage.Is() && !aStorage->GetError() )
 {
 // Excel-5: detect through contained streams
 // there are some "excel" formats from 3rd party 
vendors that need to be distinguished
@@ -522,7 +531,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 }
 }
 }
-else
+else if (nSize > 0)
 {
 SvStream &rStr = *pStream;
 
@@ -767,6 +776,13 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
 pFilter = pPreselectedFilter;
 }
 }
+else
+{
+// 0-length stream, preselected Text/CSV is ok, user
+// may want to write to that file later.
+if ( 
pPreselectedFilter->GetFilterName().EqualsAscii(pFilterAscii) )
+pFilter = pPreselectedFilter;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source

[Kohei Yoshida]

 editeng/source/editeng/impedit.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c770d2c8472402eecbb88ec72885cd9d6447d370
Author: Kohei Yoshida 
Date:   Wed Apr 4 16:40:54 2012 -0400

Method declared but not implemented.  Removing...

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 438abee..28e1d0b 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -546,7 +546,6 @@ private:
 voidGetCharAttribs( sal_uInt16 nPara, 
std::vector& rLst ) const;
 
 EditTextObject* CreateBinTextObject( EditSelection aSelection, 
SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 
0 );
-voidStoreBinTextObject( SvStream& rOStream, BinTextObject& 
rTextObject );
 EditSelection   InsertBinTextObject( BinTextObject&, EditPaM aPaM );
 EditSelection   InsertText( ::com::sun::star::uno::Reference< 
::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& 
rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source

[Kohei Yoshida]

 editeng/source/editeng/editdbg.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e0fd2c61e47c994d050d9afcb9578e096e1489b6
Author: Kohei Yoshida 
Date:   Wed Apr 4 16:22:32 2012 -0400

dbgutil fix.

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 9142ec1..c1ef702 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -334,13 +334,14 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, 
sal_Bool bInfoBox )
 fprintf( fp, 
"\n"
 );
 for ( sal_uInt16 nPortion = 0; nPortion < 
pEE->pImpEditEngine->GetParaPortions(). Count(); nPortion++)
 {
-
 ParaPortion* pPPortion = 
pEE->pImpEditEngine->GetParaPortions()[nPortion];
-fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'", 
nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(), 
rtl::OUStringToOString( *pPPortion->GetNode(), RTL_TEXTENCODING_ASCII_US 
).getStr() );
+fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'",
+ nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(),
+ rtl::OUStringToOString(pPPortion->GetNode()->GetString(), 
RTL_TEXTENCODING_UTF8).getStr() );
 fprintf( fp, "\nVorlage:" );
 SfxStyleSheet* pStyle = pPPortion->GetNode()->GetStyleSheet();
 if ( pStyle )
-fprintf( fp, " %s", rtl::OUStringToOString( pStyle->GetName(), 
RTL_TEXTENCODING_ASCII_US ).getStr() );
+fprintf( fp, " %s", rtl::OUStringToOString( pStyle->GetName(), 
RTL_TEXTENCODING_UTF8).getStr() );
 fprintf( fp, "\nParagraph attribute:" );
 DbgOutItemSet( fp, 
pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

[Lubos Lunak]

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |3 +++
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx|5 -
 bridges/source/cpp_uno/gcc3_linux_intel/share.hxx |4 
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit e2b7e28c12bb836fd7ab1dcbfc2460f807dd27f6
Author: Luboš Luňák 
Date:   Wed Apr 4 21:41:49 2012 +0200

adjust gcc3_linux_intel bridge to work with clang

Otherwise exception throwing seems to be broken.
This is a partial revert of b0515ea5fa6c29faebed616ae3e0213c72d24904.

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 4c6370f..34f261a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -36,6 +36,7 @@
 #include "typelib/typedescription.h"
 
 #include "callvirtualmethod.hxx"
+#include "share.hxx"
 
 // The call instruction within the asm block of callVirtualMethod may throw
 // exceptions.  At least GCC 4.7.0 with -O0 would create (unnecessary)
@@ -66,6 +67,8 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
 // unexpected size of int
 assert(nStackLongs && pStackLongs); // no stack
 
+if (! pAdjustedThisPtr) 
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
+
 volatile long edx = 0, eax = 0; // for register returns
 void * stackptr;
 asm volatile (
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 6515b8f..e7e6e94 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -46,7 +46,6 @@
 #include 
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include 
-#include 
 
 #include "share.hxx"
 
@@ -60,6 +59,10 @@ using namespace ::__cxxabiv1;
 namespace CPPU_CURRENT_NAMESPACE
 {
 
+void dummy_can_throw_anything( char const * )
+{
+}
+
 
//==
 static OUString toUNOname( char const * p ) SAL_THROW(())
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index 2eff557..dfa1bf9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
@@ -32,9 +32,13 @@
 #include 
 #include 
 
+#include 
+
 namespace CPPU_CURRENT_NAMESPACE
 {
 
+void dummy_can_throw_anything( char const * );
+
 // - following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
 
 struct _Unwind_Exception
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 7 commits - android/experiments distro-configs/LibreOfficeAndroid.conf fontconfig/makefile.mk sysui/README vcl/android vcl/source

[Tor Lillqvist]

 android/experiments/DocumentLoader/Makefile   |   23 ---
 android/experiments/DocumentLoader/fonts.conf |   13 ++---
 distro-configs/LibreOfficeAndroid.conf|1 -
 fontconfig/makefile.mk|4 
 sysui/README  |2 +-
 vcl/android/androidinst.cxx   |   13 +
 vcl/source/window/dialog.cxx  |   12 +++-
 7 files changed, 51 insertions(+), 17 deletions(-)

New commits:
commit bc21df051670cc78094779d9b4cd1d6cc78e9509
Author: Tor Lillqvist 
Date:   Wed Apr 4 22:21:07 2012 +0300

No dialogs to be shown from vcl in a non-NativeActivity Android app

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 6e10da6..1353c6c 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -46,7 +46,9 @@
 #include 
 #include 
 
-
+#ifdef ANDROID
+#include 
+#endif
 
 // ===
 
@@ -592,6 +594,14 @@ sal_Bool Dialog::Close()
 
 sal_Bool Dialog::ImplStartExecuteModal()
 {
+#ifdef ANDROID
+// If a non-NativeActivity app, we shouldn't be showing any dialogs
+if (lo_get_app() == NULL) {
+fprintf(stderr, "%s: Should not do anything, returning false\n", 
__FUNCTION__);
+return sal_False;
+}
+#endif
+
 if ( mbInExecute )
 {
 #ifdef DBG_UTIL
commit a5aa747d59dd67731d46c7f023bf15f2b431cdb3
Author: Tor Lillqvist 
Date:   Wed Apr 4 22:20:29 2012 +0300

Use -g in CFLAGS when debugging requested

diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
index 55c561a..a866c4c 100644
--- a/fontconfig/makefile.mk
+++ b/fontconfig/makefile.mk
@@ -43,6 +43,10 @@ PATCH_FILES=$(TARFILE_NAME).patch
 
 CONFIGURE_ACTION=./configure
 
+.IF "$(debug)" != ""
+CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION)
+.ENDIF
+
 CONFIGURE_FLAGS=\
 --disable-static \
 --with-arch=arm \
commit cdc92518c53a15945f6fc4aaad4fbc40172d257c
Author: Tor Lillqvist 
Date:   Wed Apr 4 22:18:53 2012 +0300

Do unpack fonts and include them in the experimental Android app

diff --git a/android/experiments/DocumentLoader/Makefile 
b/android/experiments/DocumentLoader/Makefile
index f818d73..0c1e666 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -176,17 +176,19 @@ copy-stuff:
echo 
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> 
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb 
file:///assets/bin/types.rdb' >> assets/program/fundamentalrc
echo 'URE_MORE_SERVICES=file:///assets/xml/ure/services.rdb 
file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> 
assets/program/fundamentalrc
+#
 # Set up unorc
echo '[Bootstrap]' > assets/program/unorc
echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/unorc
echo 'UNO_TYPES=file:///assets/bin/ure/types.rdb 
file:///assets/bin/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb 
file:///assets/xml/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc
+#
 # Set up bootstraprc
echo '[Bootstrap]' > assets/program/bootstraprc
echo 'InstallMode=' >> assets/program/bootstraprc
echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc
-   echo "UserInstallation=file://$(APP_DATA_PATH)/cache/.libreoffice" >> 
assets/program/bootstraprc
-
+   echo "UserInstallation=file://$(APP_DATA_PATH)" >> 
assets/program/bootstraprc
+#
 # Set up versionrc
echo '[Version]' > assets/program/versionrc
echo 'AllLanguages=en-US' >> assets/program/versionrc
@@ -197,12 +199,23 @@ copy-stuff:
echo 'ProductMinor=1' >> assets/program/versionrc
echo 'ProductSource=OOO350' >> assets/program/versionrc
echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
+#
 # .res files
mkdir -p assets/program/resource
cp $(OUTDIR)/bin/*en-US.res assets/program/resource
-# Assets that are unpacked at run-time into the app's data directory.
+#
+# Assets that are unpacked at run-time into the app's data directory. These
+# are files read by non-LO code, fontconfig and freetype for now, that doesn't
+# understand "/assets" paths.
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
+   mkdir -p assets/unpack/user/fonts
+# $UserInstallation/user/fonts is added to the fontconfig path in
+# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
+# set to the app's data dir above.
+   cp $(OUTDIR)/pck/Liberation*.ttf assets/unpack/user/fonts
+   cp $(OUTDIR)/pck/Gen*.ttf assets/unpack/user/fonts
+   cp $(OUTDIR)/pck/opens___.ttf assets/unpack/user/fonts
 #
 # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
 #
diff --git a

[Libreoffice-commits] .: sc/source

[Eike Rathke]

 sc/source/ui/dbgui/scuiasciiopt.cxx |1 -
 sc/source/ui/inc/scuiasciiopt.hxx   |1 -
 2 files changed, 2 deletions(-)

New commits:
commit fe753d02207829282d2f40f72090988922fa9594
Author: Eike Rathke 
Date:   Wed Apr 4 21:16:52 2012 +0200

removed unused member variable

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 2a3a2b9..fefb255 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -248,7 +248,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String 
aDatName,
 
 aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
 aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
-aFldSepList ( ScResId( SCSTR_FIELDSEP ) ),
 aTextSepList( ScResId( SCSTR_TEXTSEP ) ),
 mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
 maStrTextToColumns( ScResId( STR_TEXTTOCOLUMNS ) ),
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx 
b/sc/source/ui/inc/scuiasciiopt.hxx
index e638230..c07f6f4 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -87,7 +87,6 @@ class ScImportAsciiDlg : public ModalDialog
 
 String  aCharSetUser;
 String  aColumnUser;
-String  aFldSepList;
 String  aTextSepList;
 String  maFieldSeparators;  // selected field 
separators
 sal_Unicode mcTextSep;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - editeng/source

[Kohei Yoshida]

 editeng/source/editeng/editattr.cxx |   21 +++--
 editeng/source/editeng/editattr.hxx |   29 ++---
 editeng/source/editeng/editdoc.cxx  |   77 +---
 editeng/source/editeng/editdoc.hxx  |   22 --
 editeng/source/editeng/editview.cxx |2 
 editeng/source/editeng/edtspell.cxx |6 +-
 editeng/source/editeng/impedit2.cxx |   58 ++-
 editeng/source/editeng/impedit3.cxx |   20 +
 editeng/source/editeng/impedit4.cxx |   55 +
 9 files changed, 184 insertions(+), 106 deletions(-)

New commits:
commit 0e355da592008257ec02bd68d37ff67b32eaa8c6
Author: Kohei Yoshida 
Date:   Tue Apr 3 17:10:10 2012 -0400

De-coupled ContentNode from XubString inheritance.

diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 373e608..c444950 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1154,6 +1154,16 @@ void EditPaM::SetNode(ContentNode* p)
 pNode = p;
 }
 
+bool EditPaM::IsParaStart() const
+{
+return nIndex == 0;
+}
+
+bool EditPaM::IsParaEnd() const
+{
+return nIndex == pNode->Len();
+}
+
 sal_Bool EditPaM::DbgIsBuggy( EditDoc& rDoc )
 {
 if ( !pNode )
@@ -1275,7 +1285,7 @@ ContentNode::ContentNode( SfxItemPool& rPool ) : 
aContentAttribs( rPool )
 }
 
 ContentNode::ContentNode( const XubString& rStr, const ContentAttribs& 
rContentAttribs ) :
-XubString( rStr ), aContentAttribs( rContentAttribs )
+maString(rStr), aContentAttribs(rContentAttribs)
 {
 DBG_CTOR( EE_ContentNode, 0 );
 pWrongList = NULL;
@@ -1414,7 +1424,7 @@ void ContentNode::ExpandAttribs( sal_uInt16 nIndex, 
sal_uInt16 nNew, SfxItemPool
 
 if ( pWrongList )
 {
-sal_Bool bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex );
+bool bSep = ( maString.GetChar( nIndex ) == ' ' ) || IsFeature( nIndex 
);
 pWrongList->TextInserted( nIndex, nNew, bSep );
 }
 
@@ -1515,7 +1525,7 @@ void ContentNode::CopyAndCutAttribs( ContentNode* 
pPrevNode, SfxItemPool& rPool,
 {
 DBG_ASSERT( pPrevNode, "Copy of attributes to a null pointer?" );
 
-xub_StrLen nCut = pPrevNode->Len();
+sal_uInt16 nCut = pPrevNode->Len();
 
 size_t nAttr = 0;
 CharAttribList::AttribsType& rPrevAttribs = 
pPrevNode->GetCharAttribs().GetAttribs();
@@ -1567,7 +1577,7 @@ void ContentNode::AppendAttribs( ContentNode* pNextNode )
 {
 DBG_ASSERT( pNextNode, "Copy of attributes to a null pointer?" );
 
-sal_uInt16 nNewStart = Len();
+sal_uInt16 nNewStart = maString.Len();
 
 #if OSL_DEBUG_LEVEL > 2
 OSL_ENSURE( aCharAttribList.DbgCheckAttribs(), "Attribute before 
AppendAttribs broken" );
@@ -1658,6 +1668,61 @@ void ContentNode::DestroyWrongList()
 pWrongList = NULL;
 }
 
+bool ContentNode::IsFeature( sal_uInt16 nPos ) const
+{
+return maString.GetChar(nPos) == CH_FEATURE;
+}
+
+sal_uInt16 ContentNode::Len() const
+{
+return maString.Len();
+}
+
+const XubString& ContentNode::GetString() const
+{
+return maString;
+}
+
+void ContentNode::SetChar(sal_uInt16 nPos, sal_Unicode c)
+{
+maString.SetChar(nPos, c);
+}
+
+void ContentNode::Insert(const XubString& rStr, sal_uInt16 nPos)
+{
+maString.Insert(rStr, nPos);
+}
+
+void ContentNode::Append(const XubString& rStr)
+{
+maString.Append(rStr);
+}
+
+void ContentNode::Erase(sal_uInt16 nPos)
+{
+maString.Erase(nPos);
+}
+
+void ContentNode::Erase(sal_uInt16 nPos, sal_uInt16 nCount)
+{
+maString.Erase(nPos, nCount);
+}
+
+XubString ContentNode::Copy(sal_uInt16 nPos) const
+{
+return maString.Copy(nPos);
+}
+
+XubString ContentNode::Copy(sal_uInt16 nPos, sal_uInt16 nCount) const
+{
+return maString.Copy(nPos, nCount);
+}
+
+sal_Unicode ContentNode::GetChar(sal_uInt16 nPos) const
+{
+return maString.GetChar(nPos);
+}
+
 void ContentNode::CreateWrongList()
 {
 DBG_ASSERT( !pWrongList, "WrongList already exist!" );
@@ -2050,7 +2115,7 @@ XubString EditDoc::GetParaAsString(
 //!! beware of sub string length  of -1 which is also defined as 
STRING_LEN and
 //!! thus would result in adding the whole sub string up to the end of 
the node !!
 if (nEnd > nIndex)
-aStr += XubString( *pNode, nIndex, nEnd - nIndex );
+aStr += XubString(pNode->GetString(), nIndex, nEnd - nIndex);
 
 if ( pNextFeature )
 {
@@ -2240,7 +2305,7 @@ EditPaM EditDoc::ConnectParagraphs( ContentNode* pLeft, 
ContentNode* pRight )
 // First the attributes, otherwise nLen will not be correct!
 pLeft->AppendAttribs( pRight );
 // then the Text...
-*pLeft += *pRight;
+pLeft->Append(pRight->GetString());
 
 // the one to the right disappears.
 RemoveItemsFromPool(*pRight);
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index bd05ae1..8b70806 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@

[Libreoffice-commits] .: officecfg/registry sc/source

[Eike Rathke]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +-
 sc/source/ui/dbgui/scuiasciiopt.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 58e562e730485e860dfe484cdc09c67f1d73dc5a
Author: Eike Rathke 
Date:   Wed Apr 4 20:57:22 2012 +0200

fdo#33088 better CSV import default separators

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 700d716..0cd2ff3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1098,7 +1098,7 @@
 List of Separators - as a String
 Separators
 
-;
+,;	
 
 
 
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 93d5cfc..2a3a2b9 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -268,7 +268,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String 
aDatName,
 SetText( aName );
 
 // Default options
-OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM("\t"));
+OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t"));
 OUString sTextSeparators(mcTextSep);
 bool bMergeDelimiters = false;
 bool bFixedWidth = false;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Michael Stahl]

 sc/source/core/data/sortparam.cxx  |   40 +
 sc/source/ui/docshell/dbdocfun.cxx |5 ++--
 2 files changed, 18 insertions(+), 27 deletions(-)

New commits:
commit 61af0e1c3c1c9003c741d64840f9b6f39ea87ead
Author: Michael Stahl 
Date:   Wed Apr 4 20:37:04 2012 +0200

ScDBDocFunc::Sort: work around STL assertion in sc_unoapi

from dbdocfun.cxx:588:
error: attempt to subscript container with out-of-bounds index 0,
but container only holds 0 elements.

The code in sortparam.cxx still looks quite wrong, and
in table3.cxx there are various arrays hard-coded to size 3...

(regression from a02b445c39d969fedc554fc2c500b88a27a13906)

diff --git a/sc/source/core/data/sortparam.cxx 
b/sc/source/core/data/sortparam.cxx
index 069e410..21bf327 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -175,8 +175,6 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, 
const ScSortParam& rOld )
 aCollatorLocale( rOld.aCollatorLocale ), aCollatorAlgorithm( 
rOld.aCollatorAlgorithm ),
 nCompatHeader( rOld.nCompatHeader )
 {
-sal_uInt16 nNewCount = 0;
-sal_uInt16 nSortSize = GetSortKeyCount();
 sal_uInt16 i;
 
 //  zuerst die Gruppen aus den Teilergebnissen
@@ -184,42 +182,34 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, 
const ScSortParam& rOld )
 for (i=0; iSort( nTab, aLocalParam, bRepeatQuery );
 
 sal_Bool bSave = sal_True;
@@ -593,7 +593,8 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& 
rSortParam,
 {
 ScSortParam aOldSortParam;
 pDBData->GetSortParam( aOldSortParam );
-if ( aOldSortParam.maKeyState[0].bDoSort && aOldSortParam.bInplace )   
// Inplace-Sortierung gemerkt?
+if (aOldSortParam.GetSortKeyCount() &&
+aOldSortParam.maKeyState[0].bDoSort && aOldSortParam.bInplace)
 {
 bSave = false;
 aOldSortParam.nDestCol = rSortParam.nDestCol;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Philipp Weissenbacher]

 sw/source/core/text/atrhndl.hxx  |2 
 sw/source/core/text/itrform2.cxx |  227 ++-
 sw/source/core/text/pordrop.hxx  |2 
 sw/source/core/text/porrst.hxx   |2 
 sw/source/core/text/txtcache.cxx |4 
 sw/source/core/text/txtpaint.cxx |6 -
 6 files changed, 118 insertions(+), 125 deletions(-)

New commits:
commit a64475a0ac7f9be2e599e0b2bbc643fcb55a4c1f
Author: Philipp Weissenbacher 
Date:   Wed Apr 4 19:22:16 2012 +0200

Translate German comments

diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 1befde4..33f71c3 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -142,7 +142,7 @@ public:
 void Pop( const SwTxtAttr& rAttr );
 
 // apply script dependent attributes
-//void ChangeScript( SwFont& rFnt, const sal_uInt8 nScr );
+// void ChangeScript( SwFont& rFnt, const sal_uInt8 nScr );
 
 // returns the default value for stack nStack
 inline const SfxPoolItem& GetDefault( const sal_uInt16 nAttribID ) const;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index a4233da..e33666a 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -49,15 +49,15 @@
 #include// CalcFlyWidth
 #include// WhichTxtPortion
 #include// WhichTxtPortion
-#include// SwNumberPortion fuer CalcAscent()
+#include// SwNumberPortion for CalcAscent()
 #include// SwFtnPortion
 #include 
 #include 
 #include // pBlink
-#include// WhichFirstPortion() -> mal Verlagern.
+#include// WhichFirstPortion() -> move it
 #include  // SwRedlineItr
 #include 
-#include  // SwPageDesc
+#include  // SwPageDesc
 #include 
 #include   // SwDoc
 #include  // SwMultiPortion
@@ -66,7 +66,7 @@
 #include 
 
 #if OSL_DEBUG_LEVEL > 1
-#include // pSwpHints, Ausgabeoperator
+#include // pSwpHints, output operator
 #endif
 
 using namespace ::com::sun::star;
@@ -126,8 +126,8 @@ void SwTxtFormatter::CtorInitTxtFormatter( SwTxtFrm 
*pNewFrm, SwTxtFormatInfo *p
 
 SwTxtFormatter::~SwTxtFormatter()
 {
-// Auesserst unwahrscheinlich aber denkbar.
-// z.B.: Feld spaltet sich auf, Widows schlagen zu
+// Extremly unlikely, but still possible
+// e.g.: field splits up, widows start to matter
 if( GetInfo().GetRest() )
 {
 delete GetInfo().GetRest();
@@ -141,7 +141,7 @@ SwTxtFormatter::~SwTxtFormatter()
 
 void SwTxtFormatter::Insert( SwLineLayout *pLay )
 {
-// Einfuegen heute mal ausnahmsweise hinter dem aktuellen Element.
+// Insert BEHIND the current element
 if ( pCurr )
 {
 pLay->SetNext( pCurr->GetNext() );
@@ -157,11 +157,11 @@ void SwTxtFormatter::Insert( SwLineLayout *pLay )
 
 KSHORT SwTxtFormatter::GetFrmRstHeight() const
 {
-// 8725: Uns interessiert die Resthoehe bezogen auf die Seite.
-// Wenn wir in einer Tabelle stehen, dann ist pFrm->GetUpper() nicht
-// die Seite. GetFrmRstHeight() wird im Zusammenhang mit den Ftn
-// gerufen.
-// Falsch: const SwFrm *pUpper = pFrm->GetUpper();
+// We want the rest height relative to the page.
+// If we're in a table, then pFrm->GetUpper() is not the page.
+//
+// GetFrmRstHeight() is being called with Ftn.
+// Wrong: const SwFrm *pUpper = pFrm->GetUpper();
 const SwFrm *pPage = (const SwFrm*)pFrm->FindPageFrm();
 const SwTwips nHeight = pPage->Frm().Top()
   + pPage->Prt().Top()
@@ -178,40 +178,40 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const
 
 SwLinePortion *SwTxtFormatter::UnderFlow( SwTxtFormatInfo &rInf )
 {
-// Werte sichern und rInf initialisieren.
+// Save values and initialize rInf
 SwLinePortion *pUnderFlow = rInf.GetUnderFlow();
 if( !pUnderFlow )
 return 0;
 
-// Wir formatieren rueckwaerts, d.h. dass Attributwechsel in der
-// naechsten Zeile durchaus noch einmal drankommen koennen.
-// Zu beobachten in 8081.sdw, wenn man in der ersten Zeile Text eingibt.
+// We format backwards, i.e. attribute changes can happen the next
+// line again.
+// Can be seen in 8081.sdw, if you enter text in the first line
 
 const xub_StrLen nSoftHyphPos = rInf.GetSoftHyphPos();
 const xub_StrLen nUnderScorePos = rInf.GetUnderScorePos();
 
-// 8358, 8359: Flys sichern und auf 0 setzen, sonst GPF
-// 3983: Nicht ClearFly(rInf) !
+// Save flys and set to 0, or else segmentation fault
+// Not ClearFly(rInf) !
 SwFlyPortion *pFly = rInf.GetFly();
 rInf.SetFly( 0 );
 
 FeedInf( rInf );
 rInf.SetLast( pCurr );
-// pUnderFlow braucht nicht deletet werden, weil es im folgenden
-// Truncate() untergehen wird.
+// pUnderFlow does not need to be deleted, because it will drown in the 
following
+// Truncate()
 rInf.SetUnderFlow(0);
 rInf.SetSoftHyphPos( nSoftHyphPos );
 rInf.SetUnderSco

[Libreoffice-commits] .: wizards/com wizards/util

[Jan Holesovsky]

 wizards/com/sun/star/wizards/common/HelpIds.java |8 
 wizards/com/sun/star/wizards/common/HelpIds.py   |8 
 wizards/com/sun/star/wizards/web/WWHID.java  |6 +-
 wizards/com/sun/star/wizards/web/WWHID.py|6 +-
 wizards/util/helpids.h   |4 
 wizards/util/hidother.src|8 
 6 files changed, 10 insertions(+), 30 deletions(-)

New commits:
commit 2ba78d1ed9fca82156eebb460b398829b5a3b6db
Author: Victor Lee 
Date:   Sun Dec 25 01:33:07 2011 +0900

Remove duplicated and unused IDs.

diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java 
b/wizards/com/sun/star/wizards/common/HelpIds.java
index 12af48a..4c9971b 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -139,10 +139,10 @@ public class HelpIds
 "HID:WIZARDS_HID_BG_BTN_IMG10",// HID:34306
 "HID:WIZARDS_HID_BG_BTN_IMG11",// HID:34307
 "HID:WIZARDS_HID_BG_BTN_IMG12",// HID:34308
-"HID:WIZARDS_HID_BG_BTN_IMG13",// HID:34309
-"HID:WIZARDS_HID_BG_BTN_IMG14",// HID:34300
-"HID:WIZARDS_HID_BG_BTN_IMG15",// HID:34311
-"HID:WIZARDS_HID_BG_BTN_IMG16",// HID:34312
+PropertyNames.EMPTY_STRING,
+PropertyNames.EMPTY_STRING,
+PropertyNames.EMPTY_STRING,
+PropertyNames.EMPTY_STRING,
 PropertyNames.EMPTY_STRING,
 PropertyNames.EMPTY_STRING,
 PropertyNames.EMPTY_STRING,
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py 
b/wizards/com/sun/star/wizards/common/HelpIds.py
index c6bd1b7..38a8bf7 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.py
+++ b/wizards/com/sun/star/wizards/common/HelpIds.py
@@ -109,10 +109,10 @@ class HelpIds:
 "HID:WIZARDS_HID_BG_BTN_IMG10", # HID:34306
 "HID:WIZARDS_HID_BG_BTN_IMG11", # HID:34307
 "HID:WIZARDS_HID_BG_BTN_IMG12", # HID:34308
-"HID:WIZARDS_HID_BG_BTN_IMG13", # HID:34309
-"HID:WIZARDS_HID_BG_BTN_IMG14", # HID:34300
-"HID:WIZARDS_HID_BG_BTN_IMG15", # HID:34311
-"HID:WIZARDS_HID_BG_BTN_IMG16", # HID:34312
+"",
+"",
+"",
+"",
 "",
 "",
 "",
diff --git a/wizards/com/sun/star/wizards/web/WWHID.java 
b/wizards/com/sun/star/wizards/web/WWHID.java
index 8baa372..9cc7670 100644
--- a/wizards/com/sun/star/wizards/web/WWHID.java
+++ b/wizards/com/sun/star/wizards/web/WWHID.java
@@ -132,11 +132,7 @@ public interface WWHID
 public static final int HID_BG_BTN_IMG9 = 34200 + 105;
 public static final int HID_BG_BTN_IMG10 = 34200 + 106;
 public static final int HID_BG_BTN_IMG11 = 34200 + 107;
-public static final int HID_BG_BTN_IMG12 = 34200 + 108;
-public static final int HID_BG_BTN_IMG13 = 34200 + 109;
-public static final int HID_BG_BTN_IMG14 = 34200 + 100;
-public static final int HID_BG_BTN_IMG15 = 34200 + 111;
-public static final int HID_BG_BTN_IMG16 = 34200 + 112;//   web wizard 
icons sets dialog
+public static final int HID_BG_BTN_IMG12 = 34200 + 108;//   web wizard 
icons sets dialog
 public static final int HID_IS = 41000 + 0;
 public static final int HID_IS_ICONSETS = 41000 + 1;
 public static final int HID_IS_BTN_NONE = 41000 + 2;
diff --git a/wizards/com/sun/star/wizards/web/WWHID.py 
b/wizards/com/sun/star/wizards/web/WWHID.py
index 28b3aaa..c71fda8 100644
--- a/wizards/com/sun/star/wizards/web/WWHID.py
+++ b/wizards/com/sun/star/wizards/web/WWHID.py
@@ -86,11 +86,7 @@ HID_BG_BTN_IMG8 = 34200 + 104
 HID_BG_BTN_IMG9 = 34200 + 105
 HID_BG_BTN_IMG10 = 34200 + 106
 HID_BG_BTN_IMG11 = 34200 + 107
-HID_BG_BTN_IMG12 = 34200 + 108
-HID_BG_BTN_IMG13 = 34200 + 109
-HID_BG_BTN_IMG14 = 34200 + 100
-HID_BG_BTN_IMG15 = 34200 + 111
-HID_BG_BTN_IMG16 = 34200 + 112  #web wizard icons sets dialog
+HID_BG_BTN_IMG12 = 34200 + 108  #web wizard icons sets dialog
 HID_IS = 41000 + 0
 HID_IS_ICONSETS = 41000 + 1
 HID_IS_BTN_NONE = 41000 + 2
diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h
index 6dca194..6e8fec6 100644
--- a/wizards/util/helpids.h
+++ b/wizards/util/helpids.h
@@ -152,10 +152,6 @@
 #define HID_BG_BTN_IMG10   
"WIZARDS_HID_BG_BTN_IMG10"
 #define HID_BG_BTN_IMG11   
"WIZARDS_HID_BG_BTN_IMG11"
 #define HID_BG_BTN_IMG12   
"WIZARDS_HID_BG_BTN_IMG12"
-#define HID_BG_BTN_IMG13   
"WIZARDS_HID_BG_BTN_IMG13"
-#define HID_BG_BTN_IMG14   
"WIZARDS_HID_BG_BTN_IMG14"
-#define HID_BG_BTN_IMG15   
"WIZARDS_HID_BG_BTN_IMG15"
-#define HID_BG_BTN_IMG16   
"WIZARDS_HID_BG_BTN_IMG16"
 
 // ++
 // Note: Web Wizard continues on 41000 later in this file.
diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src
index bf1953e..004b

[Libreoffice-commits] .: framework/source

[Lubos Lunak]

 framework/source/classes/menumanager.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit ef9620df989cd1e3ab9cf2e289b035231cca4d39
Author: Luboš Luňák 
Date:   Wed Apr 4 17:59:46 2012 +0200

remove an assert from an attempt to silence clang's false warning

http://llvm.org/bugs/show_bug.cgi?id=12459
It is not clear to me why the explicit cast was there in the first
place, but removing it probably can't make the situation worse
than aborting incorrectly.

diff --git a/framework/source/classes/menumanager.cxx 
b/framework/source/classes/menumanager.cxx
index 202b7eb..40f329c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -146,14 +146,7 @@ MenuManager::MenuManager(
 m_xFrame= rFrame;
 m_bInitialized  = sal_False;
 m_bIsBookmarkMenu   = sal_False;
-#ifdef LIBO_WERROR
-// Wtf? Clang says: call to pure virtual member function
-// 'acquire'; overrides of 'acquire' in subclasses are not
-// available in the constructor of 'XInterface'
-assert(!"Call to pure virtual member function");
-#else
-SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)this 
)->acquire();
-#endif
+acquire();
 const StyleSettings& rSettings = 
Application::GetSettings().GetStyleSettings();
 m_bShowMenuImages   = rSettings.GetUseImagesInMenus();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/source

[Ivan Timofeev]

 sw/source/ui/index/cnttab.cxx |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 33619919036457e3a37c4c47a8cef274d55253a8
Author: Ivan Timofeev 
Date:   Wed Apr 4 19:22:52 2012 +0400

reuse existent function

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index bdcf6da..63248e7 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3430,18 +3430,10 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
 if(nMove)
 {
 // move the complete list
+MoveControls(nMove);
 
 Control *pCtrl = 0;
 
-for (ctrl_iterator it = aControlList.begin(); it != 
aControlList.end(); ++it)
-{
-pCtrl = *it;
-
-Point aPos = pCtrl->GetPosPixel();
-aPos.X() += nMove;
-pCtrl->SetPosPixel(aPos);
-}
-
 pCtrl = *(aControlList.begin());
 aLeftScrollWin.Enable(pCtrl->GetPosPixel().X() < 0);
 
commit b49f69aee6f48fb9367a2a9548182dcd84eb5296
Author: Ivan Timofeev 
Date:   Wed Apr 4 18:38:07 2012 +0400

fdo#40948: TOC dialog, Entries tab: the right arrow button does not work

regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cd.

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 0d41a0b..bdcf6da 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3415,7 +3415,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
 {
 //move the right neighbor  to the right edge right aligned
 ctrl_reverse_iterator itRight = it;
---it;
+--itRight;
 Control *pRight = *itRight;
 nMove = nSpace - pRight->GetPosPixel().X() - 
pRight->GetSizePixel().Width();
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source editeng/source sfx2/source

[Takeshi Abe]

 dbaccess/source/ui/browser/sbagrid.cxx  |7 ---
 dbaccess/source/ui/control/FieldDescControl.cxx |6 --
 dbaccess/source/ui/misc/UITools.cxx |6 --
 editeng/source/outliner/outlvw.cxx  |9 -
 editeng/source/uno/unonrule.cxx |3 ---
 sfx2/source/doc/guisaveas.cxx   |2 --
 6 files changed, 33 deletions(-)

New commits:
commit b905ac19da5d4168c06f42c21418ccdb2a5d9290
Author: Takeshi Abe 
Date:   Wed Apr 4 08:55:31 2012 +0900

removed unused defines

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 926f53d..534a1a8 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -31,13 +31,6 @@
 
 #include 
 
-#define ITEMID_HORJUSTIFY   SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY   SID_ATTR_ALIGN_VER_JUSTIFY
-#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN   SID_ATTR_ALIGN_MARGIN
-#define ITEMID_NUMBERINFO   SID_ATTR_NUMBERFORMAT_INFO
-
-
 #include 
 #include 
 #include 
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 30a0bad..fc77e3f 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -26,12 +26,6 @@
  *
  /
 
-
-#define ITEMID_HORJUSTIFY   SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY   SID_ATTR_ALIGN_VER_JUSTIFY
-#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN   SID_ATTR_ALIGN_MARGIN
-
 #include "FieldDescControl.hxx"
 #include "FieldControls.hxx"
 #include 
diff --git a/dbaccess/source/ui/misc/UITools.cxx 
b/dbaccess/source/ui/misc/UITools.cxx
index 2deb607..431f142 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -82,12 +82,6 @@
 
 #include 
 
-#define ITEMID_HORJUSTIFY   SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY   SID_ATTR_ALIGN_VER_JUSTIFY
-#define ITEMID_LINEBREAKSID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN   SID_ATTR_ALIGN_MARGIN
-#define ITEMID_NUMBERINFO   SID_ATTR_NUMBERFORMAT_INFO
-
 #include 
 #include 
 #include "dbaccess_helpid.hrc"
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index a61ec1a..85b1b26 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -54,15 +54,6 @@
 #include 
 #include 
 
-
-// Width of the border zones within which is scrolled during Drag and Drop
-#define OL_SCROLL_LRBORDERWIDTHPIX  10
-#define OL_SCROLL_TBBORDERWIDTHPIX  10
-
-// Value to the window content when scrolling during Drag and Drop
-#define OL_SCROLL_HOROFFSET 20  /* in % of VisibleSize.Width */
-#define OL_SCROLL_VEROFFSET 20  /* in % of VisibleSize.Height */
-
 using namespace ::com::sun::star;
 
 DBG_NAME(OutlinerView)
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index e39bb60..45983f6 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -26,9 +26,6 @@
  *
  /
 
-
-#define PROPERTY_NONE 0
-
 #include 
 #include 
 
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 5795c8d..2a34c89 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -89,8 +89,6 @@
 
 #include "../appl/app.hrc"
 
-#define DOCPROPSNUM 17
-
 // flags that specify requested operation
 #define EXPORT_REQUESTED1
 #define PDFEXPORT_REQUESTED 2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/inc i18npool/Library_localedata_en.mk i18npool/source svtools/source

[Eike Rathke]

 i18npool/Library_localedata_en.mk |1 
 i18npool/inc/i18npool/lang.h  |1 
 i18npool/source/isolang/isolang.cxx   |1 
 i18npool/source/localedata/data/en_MW.xml |   33 ++
 i18npool/source/localedata/localedata.cxx |1 
 svtools/source/misc/langtab.src   |1 
 6 files changed, 38 insertions(+)

New commits:
commit 9dce646fbc187a0ca0ef0b22a0a2bdd8845689d0
Author: Eike Rathke 
Date:   Wed Apr 4 16:58:40 2012 +0200

fdo#48111 added English_Malawi [en-MW] locale data

diff --git a/i18npool/Library_localedata_en.mk 
b/i18npool/Library_localedata_en.mk
index c91c408..f44fab2 100644
--- a/i18npool/Library_localedata_en.mk
+++ b/i18npool/Library_localedata_en.mk
@@ -40,6 +40,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_en,\
CustomTarget/i18npool/localedata/localedata_en_GH \
CustomTarget/i18npool/localedata/localedata_en_IE \
CustomTarget/i18npool/localedata/localedata_en_JM \
+   CustomTarget/i18npool/localedata/localedata_en_MW \
CustomTarget/i18npool/localedata/localedata_en_NA \
CustomTarget/i18npool/localedata/localedata_en_NZ \
CustomTarget/i18npool/localedata/localedata_en_PH \
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 6fa05a8..4fb9eca 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -541,6 +541,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_KOMI_ZYRIAN   0x0669
 #define LANGUAGE_USER_KOMI_PERMYAK  0x066A
 #define LANGUAGE_USER_PITJANTJATJARA0x066B
+#define LANGUAGE_USER_ENGLISH_MALAWI0x8809  /* makeLangID( 0x22, 
getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx 
b/i18npool/source/isolang/isolang.cxx
index 35a9250..f27cd88 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -439,6 +439,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_LINGALA_DRCONGO,"ln", "CD" },
 { LANGUAGE_USER_LOW_GERMAN,"nds", "DE" },
 { LANGUAGE_USER_HILIGAYNON,"hil", "PH" },
+{ LANGUAGE_USER_ENGLISH_MALAWI, "en", "MW" },   /* en default for 
MW */
 { LANGUAGE_USER_NYANJA, "ny", "MW" },
 { LANGUAGE_USER_KASHUBIAN, "csb", "PL" },
 { LANGUAGE_USER_SPANISH_CUBA,   "es", "CU" },
diff --git a/i18npool/source/localedata/data/en_MW.xml 
b/i18npool/source/localedata/data/en_MW.xml
new file mode 100644
index 000..bc2f108
--- /dev/null
+++ b/i18npool/source/localedata/data/en_MW.xml
@@ -0,0 +1,33 @@
+
+
+
+  
+
+  en
+  English
+
+
+  MW
+  Malawi
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  MWK
+  MK
+  MWK
+  Malawian kwacha
+  2
+
+  
+  
+  
+  
+  
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index b6605b5..dd3f7cf 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -73,6 +73,7 @@ static const struct {
 { "en_ZW",  lcl_DATA_EN },
 { "en_NA",  lcl_DATA_EN },
 { "en_GH",  lcl_DATA_EN },
+{ "en_MW",  lcl_DATA_EN },
 
 { "es_ES",  lcl_DATA_ES },
 { "es_AR",  lcl_DATA_ES },
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index c07b5b7..d279475 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -347,6 +347,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
 < "Komi-Zyrian" ; LANGUAGE_USER_KOMI_ZYRIAN ; > ;
 < "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ;
 < "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ;
+< "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ;
 };
 };
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

[Lubos Lunak]

 sc/qa/unit/helper/debughelper.hxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 34f4cc01241c916c7d2a39360bc98af6d67dbb6a
Author: Luboš Luňák 
Date:   Wed Apr 4 16:42:01 2012 +0200

remove unused code

The operator is now automatically provided by ustring.hxx, and I think
this one would not be found with C++11-compliant namespace lookup anyway.

diff --git a/sc/qa/unit/helper/debughelper.hxx 
b/sc/qa/unit/helper/debughelper.hxx
index 6a01f52..1312e04 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -56,19 +56,6 @@ using ::std::endl;
 using ::std::vector;
 
 
-
-namespace {
-
-#ifdef __GNUC__
-__attribute__((used))
-#endif
-::std::ostream& operator<< (::std::ostream& os, const rtl::OUString& str)
-{
-return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
-}
-
-}
-
 class SheetPrinter
 {
 typedef ::mdds::mixed_type_matrix MatrixType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'features/base-preview'

[Lionel Elie Mamane]

New branch 'features/base-preview' available with the following commits:
commit 8455648f5562a749784746ad7d349e2182de5a06
Author: Lionel Elie Mamane 
Date:   Wed Apr 4 16:00:52 2012 +0200

ORowSetCache::moveWindow m_nEndPos == m_nStartPos == 0 is OK

commit dc8c4e0c2afa499c129a9816758b99fc131e2071
Author: Lionel Elie Mamane 
Date:   Mon Feb 27 13:47:24 2012 +0100

fdo#46675: fixup

commit 05bc8ff10ad2911c21481337e0c422bb9e8d551c
Author: Lionel Elie Mamane 
Date:   Mon Feb 27 13:10:40 2012 +0100

fdo#46675: expand group memberships in get*Privileges

commit 6b50e94b3e167f5b39ca30c125338ee2552089f7
Author: Lionel Elie Mamane 
Date:   Thu Feb 16 09:29:54 2012 +0100

correct indentation

commit 99d326e936693719f755f5c09eded393409f5d19
Author: Lionel Elie Mamane 
Date:   Thu Feb 16 09:11:08 2012 +0100

typo & copy/paste error in error message

commit ccea02db5578a4de26dcfed7408bd5be43375f4b
Author: Kate Goss 
Date:   Mon Feb 13 21:53:08 2012 +

Remove unused code from connectivity::odbc::OPreparedStatement

Remove methods getDataBuf(int), getParamLength(int), getPrecision(int).

commit e8849d59728fb44d41852b6d94579057d7281dd3
Author: Lionel Elie Mamane 
Date:   Tue Feb 14 19:41:08 2012 +0100

ODBC: align *all* the handling of SQLULEN properties with maximal ODBC size

commit c70092fda8efbb3406157eb3605453fe69c5a4a2
Author: Lionel Elie Mamane 
Date:   Tue Feb 14 19:39:01 2012 +0100

comphelper: add getINT64

commit e0e027f32bba7806e3cec6f6dff0742776b0a917
Author: Lionel Elie Mamane 
Date:   Tue Feb 14 18:34:52 2012 +0100

improve OTools::binParameter/bindData interaction

Don't duplicate the decision point for "data at execution or copied data"

commit 7d02be52d1673a3eac7f7b814d6f07623888036b
Author: Lionel Elie Mamane 
Date:   Tue Feb 14 09:49:19 2012 +0100

new[] already allocates each element of the array

And calls the default constructor, naturally.

commit 2b3edb088bdd0cec8b334ca46c6d5965cd927f52
Author: Lionel Elie Mamane 
Date:   Tue Feb 14 06:27:51 2012 +0100

odbc getTableTypes: ask the driver instead of guessing

commit 84e71fa301d77f960eb6d3379e039e3383592fa6
Author: Lionel Elie Mamane 
Date:   Mon Feb 13 17:53:19 2012 +0100

ResMgr::TestStack more robust

commit 8ed323467d1f25f23f0ba4f392ce9609a1a9380b
Author: Lionel Elie Mamane 
Date:   Thu Feb 9 13:06:27 2012 +0100

reorganise code for better readability

No behaviour change intended. However, if behaviour changed, probably the 
*old* behaviour is buggy, not new one.

commit d65c15553d48d153526380c709dfeab21a656d06
Author: Lionel Elie Mamane 
Date:   Thu Feb 9 13:04:34 2012 +0100

typo in comment

commit 65c2f35133fd62a438249d16002e931798240db2
Author: Lionel Elie Mamane 
Date:   Thu Feb 9 13:03:24 2012 +0100

ORowSetCache::moveWindow: yet another off-by-one error

commit d56b318e0e53757d0a567986762bb077e5f4ff3c
Author: Lionel Elie Mamane 
Date:   Wed Feb 8 19:08:20 2012 +0100

ORowSetCache::moveWindow fix variable inversion; fixes subsequentcheck

commit 6cbb1225934a7941a09fa97df466817090e708a1
Author: Lionel Elie Mamane 
Date:   Wed Feb 8 12:41:54 2012 +0100

ORowSetCache: handle case total data < m_nFetchSize

As a drive-by: fillMatrix update m_nEndSize

commit 7a591eceddeaf1f166f25723a157ad395af15ccd
Author: Lionel Elie Mamane 
Date:   Tue Jan 31 11:39:47 2012 +0100

pgsql: simpler / safer check for system column

commit 57e6b7a2e8c467f2ac394d7617dfca8bf305afec
Author: Lionel Elie Mamane 
Date:   Wed Feb 1 18:28:59 2012 +0100

pgsql: implement getColumnPrivileges, generate statement only once

commit cf43119f2f260c2042899cad6b98c6edbfb3e944
Author: Lionel Elie Mamane 
Date:   Wed Feb 1 18:03:40 2012 +0100

pgsql: clean comments

commit d7df4d223bab7d24bd571d9fe5960b7179ebbf64
Author: Lionel Elie Mamane 
Date:   Tue Jan 31 22:53:31 2012 +0100

ORowSetCache: keep m_nEndPos better up-to-date

commit e745fdb8215669959a6c5f39b311f796365cd5df
Author: Lionel Elie Mamane 
Date:   Tue Jan 24 22:20:31 2012 +0100

make OTools::getValue insanely safe, factorise get{Int,Long,Byte,...}

commit e2d12ef81b781a8d1ec07e59cb31cb90eaada71d
Author: Lionel Elie Mamane 
Date:   Mon Jan 23 10:19:55 2012 +0100

ORowSetCache::fillMatrix(): fix case m_nFetchsize > table size

When lowering m_nStartPos, do not duplicate rows above its old value

commit 040394fa3e416086c062abd95fe1b664a965a18e
Author: Lionel Elie Mamane 
Date:   Sun Jan 22 01:35:58 2012 +0100

ORowSetCache::fillMatrix(): correct off-by-one error

Symptom: segfault.
Thanks to Julien Nabet for precise pointer to problematic code.

commit 41ee45c325db4cde61cd379b10125c8e98586f99
Author: Lionel Elie Mamane 
Date:   Thu Jan 19 20:20:06 2012 +0100

ORowSetCache: overhaul internals

commit 0c988a4636863badf9c408220afa98a1e1e24206
Author: Lionel Elie Mamane 
Date:   Thu Jan 19 17:54:10 2012 +0100

janitorial: don't rely on detail of current OSL_ENSU

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

[Lionel Elie Mamane]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'features/base-preview' - boost/makefile.mk

[Fridrich Strba]

 boost/makefile.mk |   49 +++--
 1 file changed, 47 insertions(+), 2 deletions(-)

New commits:
commit d34b86cd91654199724c400e43822619c7d70576
Author: Fridrich Sch Strba 
Date:   Wed Apr 4 16:18:09 2012 +0200

Be sure all boost headers are copied to output directory

diff --git a/boost/makefile.mk b/boost/makefile.mk
index 3ba21d8..fa11589 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -94,36 +94,81 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : 
$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
 -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/accumulators 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/algorithm 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/archive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/asio 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/assign 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bimap 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/circular_buffer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/compatibility 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/concept_check 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/date_time 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/dynamic_bitset 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/filesystem 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/flyweight 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/format 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/functional 
$(INCCOM)$/$(PRJNAME)
-@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function_types 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/fusion 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/gil 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/graph 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/integer 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/interprocess 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/intrusive 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/io 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iostreams 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_array 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/multi_index 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/parameter 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending 
$(INCCOM)$/$(PRJNAME)
+@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/polygon 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool 
$(INCCOM)$/$(PRJNAME)
 @$(GNUCOPY) -r $(PACKA

[Libreoffice-commits] .: 2 commits - desktop/source sal/inc sal/osl

[Stephan Bergmann]

 desktop/source/app/app.cxx |3 +--
 sal/inc/sal/detail/log.h   |3 +--
 sal/inc/sal/log.hxx|   23 +++
 sal/osl/all/log.cxx|5 +++--
 4 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit 7d96faeacd284ca30a04f6a5af06f06c5cc02c36
Author: Stephan Bergmann 
Date:   Wed Apr 4 15:25:06 2012 +0200

Improved error reporting

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 01d1c7d..156e8b5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -702,8 +702,7 @@ void Desktop::ensureProcessServiceFactory()
 }
 catch (const css::uno::Exception& e)
 {
-(void)e;
-OSL_FAIL(rtl::OUStringToOString(e.Message, 
osl_getThreadTextEncoding()).getStr());
+SAL_WARN("desktop", "UNO Exception: " << e.Message);
 // let exceptions escape and tear down the process, it is
 // completely broken anyway
 throw;
commit 09be30729e081a636886ffadc3179469098c5512
Author: Stephan Bergmann 
Date:   Wed Apr 4 15:24:16 2012 +0200

Minor tweakings

diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h
index bb3d4c6..3787ada 100644
--- a/sal/inc/sal/detail/log.h
+++ b/sal/inc/sal/detail/log.h
@@ -72,8 +72,7 @@ extern "C" {
 
 enum sal_detail_LogLevel {
 SAL_DETAIL_LOG_LEVEL_INFO, SAL_DETAIL_LOG_LEVEL_WARN,
-SAL_DETAIL_LOG_LEVEL_DEBUG,
-SAL_DETAIL_MAKE_FIXED_SIZE = SAL_MAX_ENUM
+SAL_DETAIL_LOG_LEVEL_DEBUG = SAL_MAX_ENUM
 };
 
 SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat(
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index bb41a6f..033edb9 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -188,25 +188,24 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER 
StreamIgnore const &) {
 SAL_INFO(char const * area, expr),
 SAL_INFO_IF(bool condition, char const * area, expr),
 SAL_WARN(char const * area, expr),
-SAL_WARN_IF(bool condition, char const * area, expr), and
-SAL_DEBUG(expr) produce an info resp.
-warning log entry with a message produced by piping items into a C++
-std::ostringstream.  The given expr must be so that the full expression
-"stream << expr" is valid, where stream is a variable of type
-std::ostringstream.
+SAL_WARN_IF(bool condition, char const * area, expr), and SAL_DEBUG(expr)
+produce an info, warning, or debug log entry with a message produced by
+piping items into a C++ std::ostringstream.  The given expr must be so that
+the full expression "stream << expr" is valid, where stream is a variable 
of
+type std::ostringstream.
 
   SAL_INFO("foo", "string " << s << " of length " << n)
 
 would be an example of such a call.
 
-In the composed message should be in UTF-8 and it should
-contain no vertical formatting characters and no null characters
+The composed message should be in UTF-8 and it should contain no vertical
+formatting characters and no null characters
 
 For the _IF variants, log output is only generated if the given condition 
is
 true (in addition to the other conditions that have to be met).
 
 The SAL_DEBUG macro is for temporary debug statements that are used while
-working on code. It is never meant to remain in the code. It will always
+working on code.  It is never meant to remain in the code.  It will always
 simply output the given expression in debug builds.
 
 For all the other macros, the given area argument must be non-null and must
@@ -314,14 +313,14 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER 
StreamIgnore const &) {
 ::SAL_DETAIL_LOG_LEVEL_WARN, area, SAL_WHERE, stream)
 
 /**
-  Produce temporary debugging output from stream. This macro is meant
-  to be used only while working on code and should never exist in production 
code.
+  Produce temporary debugging output from stream.  This macro is meant to be
+  used only while working on code and should never exist in production code.
 
   See @ref sal_log "basic logging functionality" for details.
 */
 #define SAL_DEBUG(stream) \
 SAL_DETAIL_LOG_STREAM( \
-SAL_LOG_TRUE, ::SAL_DETAIL_LOG_LEVEL_DEBUG, NULL, SAL_WHERE, stream)
+SAL_LOG_TRUE, ::SAL_DETAIL_LOG_LEVEL_DEBUG, 0, 0, stream)
 
 #endif
 
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 43d7045..bac0e93 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -156,12 +156,13 @@ void log(
 char const * message)
 {
 std::ostringstream s;
-if (level == SAL_DETAIL_LOG_LEVEL_DEBUG)
+if (level == SAL_DETAIL_LOG_LEVEL_DEBUG) {
 s << toString(level) << ':' << /*no where*/' ' << message << '\n';
-else
+} else {
 s << toString(level) << ':' << area << ':' << OSL_DETAIL_GETPID << ':'
 << osl::Thread::getCurrentIdentifier() << ':' << where << message
 << '\n';
+}
 std::fputs(s.str().c_str(), stderr);
 }
 
__

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sfx2/source vcl/unx

[Bjoern Michaelsen]

 sfx2/source/dialog/filedlghelper.cxx |   23 +++
 sfx2/source/dialog/filedlgimpl.hxx   |2 ++
 vcl/unx/gtk/gdi/salprn-gtk.cxx   |2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit d347e443e2c847d50f45ac810c5f78de3b892e3a
Author: David Tardon 
Date:   Wed Mar 28 13:25:25 2012 +0200

bypass GtkSalPrinter when it is not enabled

Signed-off-by: Bjoern Michaelsen 

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index fb25aec..b8c182f 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -236,7 +236,7 @@ GtkSalPrinter::StartJob(
 vcl::PrinterController& io_rController)
 {
 if (!lcl_useSystemPrintDialog())
-return impl_doJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, 
1, false, io_rController);
+return PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName, 
io_pSetupData, io_rController);
 
 assert(!m_pImpl);
 
commit 2890ca399dd23abd9b8b507d80f7242fce735278
Author: Andrzej J. R. Hunt 
Date:   Tue Mar 27 10:32:52 2012 +0200

fdo#43895 lp#905355: Never let users save in /tmp by default
(cherry picked from commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e)

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 141b389..79c1e4e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -100,6 +100,9 @@
 #include 
 #include 
 #include 
+#ifdef UNX
+#include 
+#endif
 
 //-
 
@@ -1648,6 +1651,24 @@ void FileDialogHelper_Impl::getRealFilter( String& 
_rFilter ) const
 }
 }
 
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName, 
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), &aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+//  the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL("file:///tmp",11) == 0 &&
+( aFileStat.st_mode & (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg->setDisplayDirectory( maPath );
+}
+#endif
+}
+
 // 
 void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
 {
@@ -1661,6 +1682,7 @@ void FileDialogHelper_Impl::displayFolder( const 
::rtl::OUString& _rPath )
 try
 {
 mxFileDlg->setDisplayDirectory( maPath );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
@@ -1678,6 +1700,7 @@ void FileDialogHelper_Impl::setFileName( const 
::rtl::OUString& _rFile )
 try
 {
 mxFileDlg->setDefaultName( maFileName );
+verifyPath();
 }
 catch( const IllegalArgumentException& )
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx 
b/sfx2/source/dialog/filedlgimpl.hxx
index 6770bb7..3433883 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -155,6 +155,8 @@ namespace sfx2
 
 voidimplInitializeFileName( );
 
+voidverifyPath( );
+
 voidimplGetAndCacheFiles( const 
::com::sun::star::uno::Reference< XInterface >& xPicker  ,
 SvStringsDtor*&
   rpURLList,
   const SfxFilter* 
   pFilter  );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 932f5a4b1f001c11bab8fb10d3be324ded13193f
Author: Stephan Bergmann 
Date:   Wed Apr 4 15:02:51 2012 +0200

Fixed include guard copy/paste error

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
index de498a3..5159f94 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx
@@ -26,8 +26,8 @@
  *
  /
 
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_X86_64_CALLVIRTUALMETHOD_HXX
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX
 
 #include "sal/config.h"
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sal/qa

[Tomáš Chvátal]

 sal/qa/osl/security/osl_Security.cxx |   93 +--
 sal/qa/osl/security/osl_Security_Const.h |   19 +-
 2 files changed, 54 insertions(+), 58 deletions(-)

New commits:
commit 0c1b92a79929fe2b25dc3a95cf94413a713d99db
Author: Luboš Luňák 
Date:   Tue Apr 3 14:01:30 2012 +0200

don't skip first cmdline argument

It looks like this one is also meant to be called manually or something,
and the original version didn't skip the first argument either.

Signed-off-by: Tomas Chvatal 

diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index 637c378..4deb7af 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -637,8 +637,7 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 rtl::OUString args[ 3 ];
 int argsCount = 0;
 sal_uInt32 n = rtl_getAppCommandArgCount();
-// skip first, that's the module name
-for (sal_uInt32 i = 1; i < n; ++i)
+for (sal_uInt32 i = 0; i < n; ++i)
 {
 rtl::OUString arg;
 rtl_getAppCommandArg(i, &arg.pData);
commit 23be7b5d793a44ab53a996a1eba6b571bd311339
Author: Luboš Luňák 
Date:   Mon Apr 2 18:59:53 2012 +0200

fix crude command line arguments handling

Signed-off-by: Tomas Chvatal 

diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index 751f09b..637c378 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -38,6 +38,7 @@
 #endif
 #include 
 #include 
+#include 
 #include 
 
 using namespace osl;
@@ -353,7 +354,7 @@ class MyTestPlugInImpl: public 
CPPUNIT_NS::TestPlugInDefaultImpl
 
 
 void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
-   const CPPUNIT_NS::PlugInParameters & parameters)
+   const CPPUNIT_NS::PlugInParameters & )
 {
 /// start message
 t_print("#Initializing ...\n" );
@@ -633,44 +634,53 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 t_print("Administrator.\n" );
 
 /// get and display forwarded text if available.
-aStringForward = ::rtl::OUString::createFromAscii( 
parameters.getCommandLine().c_str() );
-if ( !aStringForward.isEmpty() && aStringForward.indexOf( (sal_Unicode)' ' 
) != -1 )
+rtl::OUString args[ 3 ];
+int argsCount = 0;
+sal_uInt32 n = rtl_getAppCommandArgCount();
+// skip first, that's the module name
+for (sal_uInt32 i = 1; i < n; ++i)
 {
-sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' ' 
);;
-sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)' 
' );;
-if ( nFirstSpacePoint == nLastSpacePoint )
-/// only forwarded two parameters, username and password.
+rtl::OUString arg;
+rtl_getAppCommandArg(i, &arg.pData);
+if( !arg.isEmpty() && arg[ 0 ] == '-' )
+continue;
+if( argsCount >= 3 )
 {
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print("\n#Forwarded username: ");
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, 
aStringForward.getLength( ) - 1 );
-t_print("#Forwarded password: ");
-for (int i = nFirstSpacePoint+1; i <= 
aStringForward.getLength()-1; ++i)
-t_print("*");
-t_print("\n" );
-}
-else
-/// forwarded three parameters, username, password and fileserver.
-{
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print("#Forwarded username: ");
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, 
nLastSpacePoint );
-t_print("#Forwarded password: ");
-for (int i = nFirstSpacePoint+1; i <= nLastSpacePoint; ++i)
-t_print("*");
-t_print("\n" );
-
-aFileServer = aStringForward.copy( nLastSpacePoint +1, 
aStringForward.getLength( ) - 1 );
-t_print("#Forwarded FileServer: ");
-printUString( aFileServer );
-
+SAL_WARN( "sal", "Too many test arguments" );
+continue;
 }
+args[ argsCount++ ] = arg;
+}
+/// only forwarded two parameters, username and password.
+if( argsCount == 2 )
+{
+aLogonUser = args[ 0 ];
+t_print("\n#Forwarded username: ");
+printUString( aLogonUser);
+
+aLogonPasswd = args[ 1 ];
+t_print("#Forwarded password: ");
+for (int i = 0; i < aLogonPasswd.getLength(); ++i)
+t_print("*");
+t_print("\n" );
+}
+else if( argsCount == 3 )
+/// forwarded three parameters, username, password and fileserver.
+{
+aLogonUser = args[ 0 ];
+t_print("#Forwarded username: ");
+printUString( aLo

[Libreoffice-commits] .: 2 commits - sw/source

[Michael Stahl]

 sw/source/core/layout/flowfrm.cxx |   49 +++
 sw/source/core/text/txtfly.cxx|  118 ++
 2 files changed, 81 insertions(+), 86 deletions(-)

New commits:
commit 3fd17063706df98b1606f7a5426019ce8f1db201
Author: Michael Stahl 
Date:   Wed Apr 4 14:46:35 2012 +0200

flowfrm.cxx: tweak comment translation

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index ed88edc..51fa1be 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -313,28 +313,26 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm 
*pPage, const SwRect &rRe
 // it's reasonable to relocate and test-format (2).
 //
 // Bit 1 in this case means that there are objects anchored to myself,
-// bit 2 means that I have to avoid other objects.
+// bit 2 means that I have to evade other objects.
 
-// If a SurroundObj that desires to be wrapped around overlaps with the 
Rect,
-// it's required to float (because we can't guess the relationships).
+// If a SurroundObj that desires to be wrapped around overlaps with the
+// Rect, it's required to flow (because we can't guess the relationships).
 // However it's possible for a test formatting to happen.
-//
-// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a lower of
+// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a Lower of
 // mine, then it doesn't matter.
-//
 // If the SurroundObj is anchored in a character bound Fly, and I'm not
 // a Lower of that character bound Fly myself, then the Fly doesn't matter.
 
-//#32639# If the object is anchored with me, i can neglect it, because
-//it's likely that it will follow the flow. A test formatting is not
-//allowed in that case, however!
+// #32639# If the object is anchored with me, i can ignore it, because
+// it's likely that it will follow me with the flow. A test formatting is
+// not allowed in that case, however!
 sal_uInt8 nRet = 0;
 SwFlowFrm *pTmp = this;
 do
 {   // If there are objects hanging either on me or on a follow, we can't
 // do a test formatting, because paragraph bound objects wouldn't
 // be properly considered, and character bound objects shouldn't
-// be test formatted either.
+// be test formatted at all.
 if( pTmp->GetFrm()->GetDrawObjs() )
 nRet = 1;
 pTmp = pTmp->GetFollow();
@@ -372,7 +370,7 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm 
*pPage, const SwRect &rRe
 }
 
 // Don't do this if the object is anchored behind me in the 
text
-// flow, because then I wouldn't avoid it.
+// flow, because then I wouldn't evade it.
 if ( ::IsFrmInSameKontext( pAnchor, &rThis ) )
 {
 if ( rFmt.GetAnchor().GetAnchorId() == FLY_AT_PARA )
@@ -381,7 +379,7 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm 
*pPage, const SwRect &rRe
 sal_uLong nTmpIndex = 
rFmt.GetAnchor().GetCntntAnchor()->nNode.GetIndex();
 // Now we're going to check whether the current 
paragraph before
 // the anchor of the displacing object sits in the 
text. If this
-// is the case, we don't try to avoid it.
+// is the case, we don't try to evade it.
 // The index is being determined via SwFmtAnchor, 
because it's
 // getting quite expensive otherwise.
 if( ULONG_MAX == nIndex )
@@ -473,7 +471,7 @@ SwLayoutFrm *SwFlowFrm::CutTree( SwFrm *pStart )
 while ( pCnt && pLay->IsAnLower( pCnt ) )
 {
 // It's possible for the CntFrm to be locked, and we don't want
-// to end up in an endless sideways movement, so we're not even
+// to end up in an endless page migration, so we're not even
 // going to call Calc!
 OSL_ENSURE( pCnt->IsTxtFrm(), "The Graphic has landed." );
 if ( ((SwTxtFrm*)pCnt)->IsLocked() ||
@@ -498,7 +496,7 @@ sal_Bool SwFlowFrm::PasteTree( SwFrm *pStart, SwLayoutFrm 
*pParent, SwFrm *pSibl
 //returns sal_True if there's a LayoutFrm in the chain.
 sal_Bool bRet = sal_False;
 
-// The chain beginning with pStart is being hanged before the sibling
+// The chain beginning with pStart is inserted before pSibling
 // under the parent. We take care to invalidate as required.
 
 // I'm receiving a finished chain. We need to update the pointers for
@@ -790,8 +788,8 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
 |*
 |*  SwFrm::GetLeaf()
 |*
-|*  DescriptionReturns the next/previous Layout leave that's NOT
-|*  below this (or even is this itself). Also, that leave 

[Libreoffice-commits] .: sw/source

[Jan Holesovsky]

 sw/source/core/layout/flowfrm.cxx |  455 ++
 1 file changed, 225 insertions(+), 230 deletions(-)

New commits:
commit c3b72f69e093d79a1b263964633fe2ddfaef2e45
Author: David Vogt 
Date:   Wed Apr 4 09:42:32 2012 +0200

Translated source comments from german

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 1aacdbc..ed88edc 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -145,9 +145,9 @@ sal_Bool SwFlowFrm::HasLockedFollow() const
 
 sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
 {
-//Wenn der Vorgaenger das KeepAttribut traegt und auch dessen
-//Vorgaenger usw. bis zum ersten der Kette und fuer diesen das
-//IsFwdMoveAllowed ein sal_False liefert, so ist das Moven eben nicht 
erlaubt.
+// If all the predecessors up to the first of the chain have
+// the 'keep' attribute set, and the first of the chain's
+// IsFwdMoveAllowed returns sal_False, then we're not allowed to move.
 SwFrm *pFrm = &rThis;
 if ( !pFrm->IsInFtn() )
 do
@@ -157,7 +157,7 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
 return sal_True;
 } while ( pFrm );
 
-  //Siehe IsFwdMoveAllowed()
+  //See IsFwdMoveAllowed()
 sal_Bool bRet = sal_False;
 if ( pFrm && pFrm->GetIndPrev() )
 bRet = sal_True;
@@ -173,8 +173,8 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
 
 void SwFlowFrm::CheckKeep()
 {
-//Den 'letzten' Vorgaenger mit KeepAttribut anstossen, denn
-//die ganze Truppe koennte zuruckrutschen.
+// Kick off the "last" predecessor with a 'keep' attribute, because
+// it's possible for the whole troop to move back.
 SwFrm *pPre = rThis.GetIndPrev();
 if( pPre->IsSctFrm() )
 {
@@ -308,31 +308,33 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool 
bCheckIfLastRowShouldK
 
 sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect 
&rRect )
 {
-// Der return-Wert entscheidet mit,
-// ob auf Zurueckgeflossen werden muss, (3)
-// ob das gute alte WouldFit gerufen werden kann (0, 1)
-// oder ob ein Umhaengen und eine Probeformatierung sinnvoll ist (2)
-// dabei bedeutet Bit 1, dass Objekte an mir selbst verankert sind
-// und Bit 2, dass ich anderen Objekten ausweichen muss.
-
-//Wenn ein SurroundObj, dass einen Umfluss wuenscht mit dem Rect ueberlappt
-//ist der Fluss notwendig (weil die Verhaeltnisse nicht geschaetzt werden
-//koennen), es kann allerdings ggf. eine TestFormatierung stattfinden.
-//Wenn das SurroundObj ein Fly ist und ich selbst ein Lower bin oder der 
Fly
-//Lower von mir ist, so spielt er keine Rolle.
-//Wenn das SurroundObj in einem zeichengebunden Fly verankert ist, und ich
-//selbst nicht Lower dieses Zeichengebundenen Flys bin, so spielt der Fly
-//keine Rolle.
-//#32639# Wenn das Objekt bei mir verankert ist kann ich es
-//vernachlaessigen, weil es hoechstwahrscheinlich (!?) mitfliesst,
-//eine TestFormatierung ist dann allerdings nicht erlaubt!
+// The return value helps deciding whether we need to flow back (3),
+// or whether we can use the good old WouldFit (0, 1), or if
+// it's reasonable to relocate and test-format (2).
+//
+// Bit 1 in this case means that there are objects anchored to myself,
+// bit 2 means that I have to avoid other objects.
+
+// If a SurroundObj that desires to be wrapped around overlaps with the 
Rect,
+// it's required to float (because we can't guess the relationships).
+// However it's possible for a test formatting to happen.
+//
+// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a lower of
+// mine, then it doesn't matter.
+//
+// If the SurroundObj is anchored in a character bound Fly, and I'm not
+// a Lower of that character bound Fly myself, then the Fly doesn't matter.
+
+//#32639# If the object is anchored with me, i can neglect it, because
+//it's likely that it will follow the flow. A test formatting is not
+//allowed in that case, however!
 sal_uInt8 nRet = 0;
 SwFlowFrm *pTmp = this;
 do
-{   // Wenn an uns oder einem Follow Objekte haengen, so
-// kann keine ProbeFormatierung stattfinden, da absatzgebundene
-// nicht richtig beruecksichtigt wuerden und zeichengebundene sollten
-// gar nicht zur Probe formatiert werden.
+{   // If there are objects hanging either on me or on a follow, we can't
+// do a test formatting, because paragraph bound objects wouldn't
+// be properly considered, and character bound objects shouldn't
+// be test formatted either.
 if( pTmp->GetFrm()->GetDrawObjs() )
 nRet = 1;
 pTmp = pTmp->GetFollow();
@@ -352,13 +354,13 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm 
*pPage, const SwRect &rRe
 if ( aRect.I

[Libreoffice-commits] .: sc/source

[Stephan Bergmann]

 sc/source/ui/view/prevwsh.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0bb56e88f66e62ec305f863d83aa65a46e1b2ba3
Author: Stephan Bergmann 
Date:   Wed Apr 4 14:33:20 2012 +0200

-Werror=unused-but-set-variable

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 8b65824..86f3315 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -301,8 +301,6 @@ void ScPreviewShell::UpdateNeededScrollBars()
 long aHeightOffSet = pDevice ? pDevice->PixelToLogic( Size( nBarW, nBarH 
), pPreview->GetMapMode() ).Height() : 0;
 long aWidthOffSet = aHeightOffSet;
 
-Point aOfs = pPreview->GetOffset();
-
 if( pHorScroll )
 {
 long nMaxPos = aPageSize.Width() - aWindowSize.Width() + aWidthOffSet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sdext/source vcl/source

[David Tardon]

 sdext/source/presenter/PresenterSlideShowView.cxx |   33 --
 sdext/source/presenter/PresenterSlideShowView.hxx |2 +
 vcl/source/gdi/print3.cxx |1 
 3 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit a4b8a1c9f50bca3b557efca75100d9532a404ec6
Author: David Tardon 
Date:   Wed Apr 4 14:21:25 2012 +0200

fdo#33914 do not play sound in presenter console

diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx 
b/sdext/source/presenter/PresenterSlideShowView.cxx
index 0bd0a56..b1dad09 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -165,17 +165,7 @@ void PresenterSlideShowView::LateInit (void)
 // Add the new slide show view to the slide show.
 if (mxSlideShow.is() && ! mbIsViewAdded)
 {
-Reference xView (this);
-mxSlideShow->addView(xView);
-// Prevent embeded sounds being played twice at the same time by
-// disabling sound for the new slide show view.
-beans::PropertyValue aProperty;
-aProperty.Name = A2S("IsSoundEnabled");
-Sequence aValues (2);
-aValues[0] <<= xView;
-aValues[1] <<= sal_False;
-aProperty.Value <<= aValues;
-mxSlideShow->setProperty(aProperty);
+impl_addAndConfigureView();
 mbIsViewAdded = true;
 }
 
@@ -690,7 +680,7 @@ void PresenterSlideShowView::ActivatePresenterView (void)
 {
 if (mxSlideShow.is() && ! mbIsViewAdded)
 {
-mxSlideShow->addView(this);
+impl_addAndConfigureView();
 mbIsViewAdded = true;
 }
 }
@@ -958,7 +948,7 @@ void PresenterSlideShowView::ForceRepaint (void)
 if (mxSlideShow.is() && mbIsViewAdded)
 {
 mxSlideShow->removeView(this);
-mxSlideShow->addView(this);
+impl_addAndConfigureView();
 }
 }
 
@@ -1020,6 +1010,21 @@ void PresenterSlideShowView::ThrowIfDisposed (void)
 }
 }
 
+void PresenterSlideShowView::impl_addAndConfigureView()
+{
+Reference xView (this);
+mxSlideShow->addView(xView);
+// Prevent embeded sounds being played twice at the same time by
+// disabling sound for the new slide show view.
+beans::PropertyValue aProperty;
+aProperty.Name = A2S("IsSoundEnabled");
+Sequence aValues (2);
+aValues[0] <<= xView;
+aValues[1] <<= sal_False;
+aProperty.Value <<= aValues;
+mxSlideShow->setProperty(aProperty);
+}
+
 } } // end of namespace ::sd::presenter
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx 
b/sdext/source/presenter/PresenterSlideShowView.hxx
index 8a1b034..c081627 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -282,6 +282,8 @@ private:
 */
 void ThrowIfDisposed (void)
 throw (css::lang::DisposedException);
+
+void impl_addAndConfigureView();
 };
 
 } } // end of namespace ::sd::presenter
commit 6ab4fac5a518fe7405936b753011dfd8c413bb62
Author: David Tardon 
Date:   Wed Apr 4 12:48:14 2012 +0200

set alpha too

diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx 
b/sdext/source/presenter/PresenterSlideShowView.cxx
index 7c7b8e6..0bd0a56 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -360,7 +360,7 @@ void SAL_CALL PresenterSlideShowView::clear (void)
 rendering::ViewState aViewState (
 geometry::AffineMatrix2D(1,0,0, 0,1,0),
 NULL);
-double aColor[3] = {0,0,0};
+double aColor[4] = {0,0,0,0};
 rendering::RenderState aRenderState(
 geometry::AffineMatrix2D(1,0,0, 0,1,0),
 NULL,
commit 2049940bac74a5230decedacbd95407d93c116db
Author: David Tardon 
Date:   Mon Apr 2 13:59:14 2012 +0200

remove useless line (probably mis-merge)

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 260fdc0..017681a 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -451,7 +451,6 @@ void Printer::ImplPrintJob( const 
boost::shared_ptr& i_pContr
 PrintDialog aDlg( NULL, i_pController );
 if( ! aDlg.Execute() )
 {
-GDIMetaFile aPageFile;
 i_pController->abortJob();
 return;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/Module_extensions.mk

[Matus Kukan]

 extensions/Module_extensions.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e7fd91514940520c33f14898c2298d1251ac34d
Author: Matúš Kukan 
Date:   Wed Apr 4 14:14:33 2012 +0200

fix so_activex_idl, part two

The order seems to be important here.
However it has worked for me and I am not sure this will fix tinderboxes.

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index f7e7180..00b7d7c 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -69,9 +69,9 @@ ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
 ifneq ($(DISABLE_ACTIVEX),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
-   CustomTarget_so_activex_idl \
WinResTarget_activex \
Library_so_activex \
+   CustomTarget_so_activex_idl \
 ))
 
 ifeq ($(BUILD_X64),TRUE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/CustomTarget_so_activex_idl.mk extensions/WinResTarget_activex.mk

[Matus Kukan]

 extensions/CustomTarget_so_activex_idl.mk |8 
 extensions/WinResTarget_activex.mk|4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 0a560f993fb8917a5e2a96d546679484ca8c98e2
Author: Matúš Kukan 
Date:   Wed Apr 4 12:15:37 2012 +0200

fix so_activex_idl, part one

diff --git a/extensions/CustomTarget_so_activex_idl.mk 
b/extensions/CustomTarget_so_activex_idl.mk
index e389f5b..80d8089 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -41,10 +41,10 @@ $(EXAI)/so_activex.tlb : \
$(call gb_Helper_abbreviate_dirs_native, \
midl.exe \
-tlb $@ \
-   -h so_activex.h \
-   -iid so_activex_i.c \
-   -dlldata so_activex_dll.c \
-   -proxy so_activex_p.c \
+   -h $(EXAI)/so_activex.h \
+   -iid $(EXAI)/so_activex_i.c \
+   -dlldata $(EXAI)/so_activex_dll.c \
+   -proxy $(EXAI)/so_activex_p.c \
-Oicf \
$(INCLUDE) \
$<)
diff --git a/extensions/WinResTarget_activex.mk 
b/extensions/WinResTarget_activex.mk
index bad7a0b..5e297a5 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_WinResTarget_set_defs,activex_res,\
-DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call 
gb_Helper_convert_native,$(SRCDIR)),../../..,$(call 
gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)))
 \
 ))
 
-# I suppose this dep is not really necessary, because it should always
-# be fulfilled anyway. But it cannot hurt to have it...
-$(call gb_WinResTarget_get_target,activex_res) : 
$(WORKDIR)/CustomTarget/extensions/source/activex/idl
+$(call gb_WinResTarget_get_target,activex_res) : 
$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bridges/source

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |  154 ++
 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx |   49 +++
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx|   11 
 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk   |1 
 bridges/source/cpp_uno/gcc3_linux_intel/share.hxx |   27 +
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx   |  126 
 6 files changed, 233 insertions(+), 135 deletions(-)

New commits:
commit b0515ea5fa6c29faebed616ae3e0213c72d24904
Author: Stephan Bergmann 
Date:   Wed Apr 4 13:02:44 2012 +0200

Adapt cpp_uno/gcc3_linux_intel to GCC 4.7

...the same way cpp_uno/gcc3_linux_x86-64 was already adapted.

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
new file mode 100644
index 000..4c6370f
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -0,0 +1,154 @@
+/* -*- 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 "sal/config.h"
+
+#include 
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "callvirtualmethod.hxx"
+
+// The call instruction within the asm block of callVirtualMethod may throw
+// exceptions.  At least GCC 4.7.0 with -O0 would create (unnecessary)
+// .gcc_exception_table call-site table entries around all other calls in this
+// function that can throw, leading to std::terminate if the asm call throws an
+// exception and the unwinding C++ personality routine finds the unexpected 
hole
+// in the .gcc_exception_table.  Therefore, make sure this function explicitly
+// only calls nothrow-functions (so GCC 4.7.0 with -O0 happens to not create a
+// .gcc_exception_table section at all for this function).  For some reason,
+// this also needs to be in a source file of its own.
+//
+// Also, this file should be compiled with -fnon-call-exceptions, and ideally
+// there would be a way to tell the compiler that the asm block contains calls
+// to functions that can potentially throw; see the mail thread starting at
+//  "C++: Letting compiler 
know
+// asm block can call function that can throw?"
+
+void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
+void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pRegisterReturn,
+typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
+sal_Int32 * pStackLongs, sal_Int32 nStackLongs)
+{
+// parameter list is mixed list of * and values
+// reference parameters are pointers
+
+assert(pStackLongs && pAdjustedThisPtr);
+assert(sizeof (void *) == 4 && sizeof (sal_Int32) == 4);
+// unexpected size of int
+assert(nStackLongs && pStackLongs); // no stack
+
+volatile long edx = 0, eax = 0; // for register returns
+void * stackptr;
+asm volatile (
+"mov   %%esp, %6\n\t"
+// preserve potential 128bit stack alignment
+"and   $0xfff0, %%esp\n\t"
+"mov   %0, %%eax\n\t"
+"lea   -4(,%%eax,4), %%eax\n\t"
+"and   $0xf, %%eax\n\t"
+"sub   $0xc, %%eax\n\t"
+"add   %%eax, %%esp\n\t"
+// copy values
+"mov   %0, %%eax\n\t"
+"mov   %%eax, %%edx\n\t"
+"dec   %%edx\n\t"
+"shl   $2, %%edx\n\t"
+"add   %1, %%edx\n"
+"Lcopy:\n\t"
+"pushl 0(%%edx)\n\t"
+"sub   $4, %%edx\n\t"
+"dec   %%eax\n\t"
+"jne   Lcopy\n\t"
+// do the actual call
+"mov   %2, %%edx\n\t"
+"mov   0(%%edx), %%edx\n\t"
+"mov   %3, %%eax\n\t"
+"shl   $2, %%eax\n\t"
+"add   %%eax, %%edx\n\t"

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - vcl/inc vcl/source writerfilter/source

[Michael Stahl]

 vcl/inc/graphite_layout.hxx|4 +-
 vcl/source/glyphs/graphite_layout.cxx  |   46 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   18 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 -
 4 files changed, 32 insertions(+), 38 deletions(-)

New commits:
commit 5fa13451520a3e7e291611b47a151f770eaf3314
Author: Miklos Vajna 
Date:   Wed Apr 4 11:04:45 2012 +0200

fdo#48104 fix RTF import of \page in inner groups

If we have a postponed page break and it's sent to dmapper during a new
inner group, we'll still have the page break request after the parser
state is popped, leading to duplicated page breaks. Instead of the
earlier workaround, just send the proper token to the domain mapper, and
it'll handle it properly.
(backport of 7b58fc3dafc789aa55fff5ffef6ab83c3aa8b6e0)

Signed-off-by: Michael Stahl 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ef4d3b8..9600414 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -304,7 +304,6 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
 m_bFormField(false),
 m_bWasInFrame(false),
 m_bIsInFrame(false),
-m_bHasPage(false),
 m_aUnicodeBuffer(),
 m_aHexBuffer()
 {
@@ -432,7 +431,6 @@ void RTFDocumentImpl::checkNeedPap()
 {
 dispatchSymbol(RTF_PAR);
 m_bNeedPap = false;
-
m_aStates.top().aParagraphSprms.erase(NS_sprm::LN_PFPageBreakBefore);
 }
 Mapper().props(pParagraphProperties);
 if (hasBreakBeforeFrame)
@@ -1377,12 +1375,6 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 m_bWasInFrame = inFrame();
 if (!m_bWasInFrame)
 m_bNeedPar = false;
-if (m_bHasPage)
-{
-// this has to be reset even without a pard, since it's a 
symbol in RTF terms
-
m_aStates.top().aParagraphSprms.erase(NS_sprm::LN_PFPageBreakBefore);
-m_bHasPage = false;
-}
 }
 break;
 case RTF_SECT:
@@ -1505,10 +1497,10 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 break;
 case RTF_PAGE:
 {
-RTFValue::Pointer_t pValue(new RTFValue(1));
-dispatchSymbol(RTF_PAR);
-
m_aStates.top().aParagraphSprms->push_back(make_pair(NS_sprm::LN_PFPageBreakBefore,
 pValue));
-m_bHasPage = true;
+sal_uInt8 sBreak[] = { 0xc };
+Mapper().text(sBreak, 1);
+if (!m_bNeedPap)
+parBreak();
 }
 break;
 default:
@@ -1713,7 +1705,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_KEEP: if (m_pCurrentBuffer != &m_aTableBuffer) nParam = 
NS_sprm::LN_PFKeep; break;
 case RTF_KEEPN: if (m_pCurrentBuffer != &m_aTableBuffer) nParam = 
NS_sprm::LN_PFKeepFollow; break;
 case RTF_INTBL: m_pCurrentBuffer = &m_aTableBuffer; nParam = 
NS_sprm::LN_PFInTable; break;
-case RTF_PAGEBB: nParam = NS_sprm::LN_PFPageBreakBefore; m_bHasPage = 
false; break;
+case RTF_PAGEBB: nParam = NS_sprm::LN_PFPageBreakBefore; break;
 default: break;
 }
 if (nParam >= 0)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3644375..4a28e62 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -450,8 +450,6 @@ namespace writerfilter {
 bool m_bWasInFrame;
 /// If a frame start token is already sent to dmapper (nesting 
them is not OK).
 bool m_bIsInFrame;
-/// If we should reset the page break property when we start 
the next paragraph.
-bool m_bHasPage;
 // Unicode characters are collected here so we don't have to 
send them one by one.
 rtl::OUStringBuffer m_aUnicodeBuffer;
 /// Same for hex characters.
commit 3c6b299634b7b08a54b203d984192e1f7bcf9cf3
Author: Martin Hosken 
Date:   Wed Apr 4 14:44:33 2012 +0700

Fix cursor movement in graphite fonts
(cherry picked from commit 9b6b1558a3654625ce9a5bef2bee5245db81ff88)

Signed-off-by: Michael Stahl 

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index c6c711d..838c32d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -163,9 +163,9 @@ private:
 void expandOrCondense(ImplLayoutArgs &rArgs);
 voidfillFrom(gr_segment * rSeg, ImplLayoutArgs & rArgs, float 
fScaling);
 
-void append(gr_segment * pSeg,
+float append(gr_segment * pSeg,

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Tomáš Chvátal]

 solenv/gbuild/CppunitTest.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 141fdfa04807f49b1c4e89a90b477cc1714fc726
Author: Tomáš Chvátal 
Date:   Tue Apr 3 14:21:23 2012 +0200

always pass --headless to cppunits

They should not need any actual UI anyway, and most of them already
pass the option manually.
http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html

This is partial code grab as cherry-pick had the test-mk files collisions
all over the place. I pick only the additional define which results in some
tests adding --headless twice, which does no harm.

Author: Luboš Luňák 
Signed-off-by: Tomáš Chvátal 

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0d8959e..826d3f5 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter 
WNT,$(OS_FOR_BUILD)),/)$(1)
 gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
 define gb_CppunitTest__make_args
 $(ARGS) \
+--headless \
 $(if $(strip $(UNO_TYPES)),\
"-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
$(call gb_CppunitTarget__make_url,$(call 
gb_CppunitTest__get_uno_type_target,$(rdb") \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Martin Hosken]

 vcl/inc/graphite_layout.hxx   |4 +-
 vcl/source/glyphs/graphite_layout.cxx |   46 ++
 2 files changed, 27 insertions(+), 23 deletions(-)

New commits:
commit 9b6b1558a3654625ce9a5bef2bee5245db81ff88
Author: Martin Hosken 
Date:   Wed Apr 4 14:44:33 2012 +0700

Fix cursor movement in graphite fonts

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index c6c711d..838c32d 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -163,9 +163,9 @@ private:
 void expandOrCondense(ImplLayoutArgs &rArgs);
 voidfillFrom(gr_segment * rSeg, ImplLayoutArgs & rArgs, float 
fScaling);
 
-void append(gr_segment * pSeg,
+float append(gr_segment * pSeg,
 ImplLayoutArgs & rArgs,
-const gr_slot * pSlot,
+const gr_slot * pSlot, float gOrigin,
 float nextGlyphOrigin, float fScaling,
 long & rDXOffset, bool bIsBase, int baseChar);
 };
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 93c1bc5..4edeb9a 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -40,6 +40,8 @@
 #undef NDEBUG
 #endif
 
+// #define GRLAYOUT_DEBUG 1
+
 // Header files
 //
 // Standard Library
@@ -274,7 +276,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs &rArgs, float fSc
 }
 mvChar2BaseGlyph[mnSegCharOffset + nFirstCharInCluster - 
mnMinCharPos] = nBaseGlyphIndex;
 }
-append(pSegment, rArgs, baseSlot, rightBoundary, fScaling,
+append(pSegment, rArgs, baseSlot, gr_slot_origin_X(baseSlot), 
rightBoundary, fScaling,
nDxOffset, bCluster, mnSegCharOffset + firstChar);
 }
 if (mnSegCharOffset + nLastCharInCluster < mnMinCharPos)
@@ -353,7 +355,7 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs &rArgs, float fSc
 // only set mvChar2BaseGlyph for first character of cluster
 mvChar2BaseGlyph[mnSegCharOffset + bFirstChar - 
mnMinCharPos] = nBaseGlyphIndex;
 }
-append(pSegment, rArgs, baseSlot, rightBoundary, fScaling,
+append(pSegment, rArgs, baseSlot, gr_slot_origin_X(baseSlot), 
rightBoundary, fScaling,
nDxOffset, true, mnSegCharOffset + firstChar);
 }
 if (mnSegCharOffset + bFirstChar >= mnEndCharPos)
@@ -409,13 +411,13 @@ GraphiteLayout::fillFrom(gr_segment * pSegment, 
ImplLayoutArgs &rArgs, float fSc
 
 // append walks an attachment tree, flattening it, and converting it into a
 // sequence of GlyphItem objects which we can later manipulate.
-void
+float
 GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs &rArgs,
-const gr_slot * gi, float nextGlyphOrigin, float scaling, long & rDXOffset,
+const gr_slot * gi, float gOrigin, float nextGlyphOrigin, float scaling, 
long & rDXOffset,
 bool bIsBase, int baseChar)
 {
 bool bRtl = (rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL);
-float nextOrigin = nextGlyphOrigin;
+float nextOrigin;
 assert(gi);
 assert(gr_slot_before(gi) <= gr_slot_after(gi));
 int firstChar = gr_slot_before(gi) + mnSegCharOffset;
@@ -424,16 +426,22 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs 
&rArgs,
 // is the next glyph attached or in the next cluster?
 //glyph_set_range_t iAttached = gi.attachedClusterGlyphs();
 const gr_slot * pFirstAttached = gr_slot_first_attachment(gi);
+const gr_slot * pNextSibling = gr_slot_next_sibling_attachment(gi);
 if (pFirstAttached)
-{
 nextOrigin = gr_slot_origin_X(pFirstAttached);
-}
+else if (!bIsBase && pNextSibling)
+nextOrigin = gr_slot_origin_X(pNextSibling);
+else
+nextOrigin = nextGlyphOrigin;
 long glyphId = gr_slot_gid(gi);
 long deltaOffset = 0;
 int scaledGlyphPos = round(gr_slot_origin_X(gi) * scaling);
-int glyphWidth = round(nextOrigin * scaling) - scaledGlyphPos;
-if (glyphWidth < 0)
-glyphWidth = 0;
+int glyphWidth = round((nextOrigin - gOrigin) * scaling);
+//if (glyphWidth < 0)
+//{
+//nextOrigin = gOrigin;
+//glyphWidth = 0;
+//}
 #ifdef GRLAYOUT_DEBUG
 fprintf(grLog(),"c%d g%ld,X%d W%d nX%f ", firstChar, glyphId,
 (int)(gr_slot_origin_X(gi) * scaling), glyphWidth, nextOrigin * 
scaling);
@@ -481,16 +489,11 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs 
&rArgs,
 rDXOffset += deltaOffset;
 
 // Recursively append all the attached glyphs.
-for (const gr_slot * agi = gr_slot_first_attachment(gi); agi != NULL;
- agi = gr_slot_next_sibling_attachment(agi))
-{
-if (gr_slot_next_sibling_attachment(agi) == NULL)
-append(pSeg, rArgs, agi, nextGlyphOrigin, scaling, rDXOffset,
-