Bug 53673 - [LABELS][MAILMERGE] Labels broken with mailmerge - help requested

[Winfried Donkers]

Hi all,

Libreoffice 3.6 introduced bug 53673, a problem when working with documents 
generated by the label wizard. The layout of the frames gets broken when saving 
(or opening?) these documents.

It is possible that the cause of this is in the label wizard (e.g. incorrect 
placement of frames), although it did work in 3.5.
Who knows all about writer-document file saving/reading and frame-positons and 
is willing to
-look at the bug (how to reproduce problem is described)
-and/or look at the document-creation code (core/sw/source/ui/app/applab.cxx, 
function SwModule::InsertLab()),
-and give me some clues to solve the problem?

I must say that if the problem is not in the label wizard code, chances are 
that I will not be able to solve the bug.



Winfried

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Master failed to compile on framework module

[Noel Grandin]

Looks like fallout from my recent UNO patches.

Until it's fixed, add a line like
   using com::sun::star::frame::DispatchHelper;
near line 100.

On 2012-08-28 08:18, julien2412 wrote:

I runned "make clean && make" this morning and here are the details.

[ build LNK ] Library/libxstor.so
/home/julien/compile-libreoffice/libo/framework/source/lomenubar/FrameHelper.cxx:
In member function ‘void FrameHelper::dispatchCommand(rtl::OUString)’:
/home/julien/compile-libreoffice/libo/framework/source/lomenubar/FrameHelper.cxx:721:40:
error: ‘DispatchHelper’ has not been declared
make[2]: ***
[/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/framework/source/lomenubar/FrameHelper.o]
Erreur 1
make[2]: *** Attente des tâches non terminées
make[2]: *** wait: Aucun processus enfant. Arrêt.

git last commit retrieved: 3ee97489ea49b339c4a7578afd85f85f77dd0f68

gcc (Debian 4.7.1-2) 4.7.1
GNU Make 3.81

autogen.lastrun:
--enable-lomenubar
--with-system-odbc
--enable-ext-mysql-connector
--with-system-mysql
--enable-symbols
--enable-ext-barcode
--enable-ext-diagram
--enable-ext-google-docs
--enable-ext-hunart
--enable-ext-nlpsolver
--enable-ext-ct2n
--enable-ext-numbertext
--enable-ext-oooblogger
--enable-ext-pdfimport
--enable-postgresql-sdbc
--enable-ext-presenter-console
--enable-ext-presenter-minimizer
--enable-ext-report-builder
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-typo
--enable-ext-validator
--enable-ext-watch-window
--enable-ext-wiki-publisher
--enable-dbus
--enable-graphite
--enable-evolution2
--enable-werror
--enable-debug
--enable-dbgutil
--enable-crashdump
--enable-kde4
--enable-dependency-tracking
--enable-online-update




--
View this message in context: 
http://nabble.documentfoundation.org/Master-failed-to-compile-on-framework-module-tp4003926p4003941.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



Disclaimer: http://www.peralex.com/disclaimer.html


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Master failed to compile on framework module

[julien2412]

I runned "make clean && make" this morning and here are the details.

[ build LNK ] Library/libxstor.so
/home/julien/compile-libreoffice/libo/framework/source/lomenubar/FrameHelper.cxx:
In member function ‘void FrameHelper::dispatchCommand(rtl::OUString)’:
/home/julien/compile-libreoffice/libo/framework/source/lomenubar/FrameHelper.cxx:721:40:
error: ‘DispatchHelper’ has not been declared
make[2]: ***
[/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/framework/source/lomenubar/FrameHelper.o]
Erreur 1
make[2]: *** Attente des tâches non terminées
make[2]: *** wait: Aucun processus enfant. Arrêt.

git last commit retrieved: 3ee97489ea49b339c4a7578afd85f85f77dd0f68

gcc (Debian 4.7.1-2) 4.7.1
GNU Make 3.81

autogen.lastrun:
--enable-lomenubar
--with-system-odbc
--enable-ext-mysql-connector
--with-system-mysql
--enable-symbols
--enable-ext-barcode
--enable-ext-diagram
--enable-ext-google-docs
--enable-ext-hunart
--enable-ext-nlpsolver
--enable-ext-ct2n
--enable-ext-numbertext
--enable-ext-oooblogger
--enable-ext-pdfimport
--enable-postgresql-sdbc
--enable-ext-presenter-console
--enable-ext-presenter-minimizer
--enable-ext-report-builder
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-typo
--enable-ext-validator
--enable-ext-watch-window
--enable-ext-wiki-publisher
--enable-dbus
--enable-graphite
--enable-evolution2
--enable-werror
--enable-debug
--enable-dbgutil
--enable-crashdump
--enable-kde4
--enable-dependency-tracking
--enable-online-update




--
View this message in context: 
http://nabble.documentfoundation.org/Master-failed-to-compile-on-framework-module-tp4003926p4003941.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: config_host.mk.in configure.in Makefile.top

[Libreoffice Gerrit user]

 Makefile.top  |2 +-
 config_host.mk.in |1 +
 configure.in  |   17 +
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 3ee97489ea49b339c4a7578afd85f85f77dd0f68
Author: Noel Grandin 
Date:   Tue Aug 28 07:00:18 2012 +0200

allow separate setting of parallelism for subseq. tests

Change-Id: I5a5444e8ee95b0fd95a97c31c94ab0f9c3935abb

diff --git a/Makefile.top b/Makefile.top
index 643bcbb..a387e53 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -271,7 +271,7 @@ $(1).clean:
cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean 
gb_PARTIALBUILD=T
 
 $(1).subsequentcheck:
-   cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) 
subsequentcheck gb_PARTIALBUILD=T
+   cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) 
subsequentcheck gb_PARTIALBUILD=T
 
 $(1).deliver:
@true
diff --git a/config_host.mk.in b/config_host.mk.in
index 6da79d1..a2404f7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -46,6 +46,7 @@ export CC=@CC@
 export CC_FOR_BUILD=@CC_FOR_BUILD@
 export CDR_CFLAGS=@CDR_CFLAGS@
 export CDR_LIBS=@CDR_LIBS@
+export CHECK_PARALLELISM=@CHECK_PARALLELISM@
 export CLASSPATH=@CLASSPATH@
 export CL_X64=@CL_X64@
 export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
diff --git a/configure.in b/configure.in
index db28504..51c1ff2 100644
--- a/configure.in
+++ b/configure.in
@@ -2068,6 +2068,12 @@ AC_ARG_WITH(max-jobs,
  Defaults to 1, unless you configure --enable-icecream - then to 10.]),
 ,)
 
+AC_ARG_WITH(check-jobs,
+AS_HELP_STRING([--with-check-jobs],
+[Maximum number of jobs that will be issued at the same time during 
'make subsequenttest'.
+ Default value is the same as 'max-jobs'. Useful because the 
subsequent tests are very lighweight.]),
+,)
+
 dnl ===
 dnl MacOSX build and runtime environment options
 dnl ===
@@ -12166,6 +12172,17 @@ AC_SUBST(GMAKE_PARALLELISM)
 AC_SUBST(GMAKE_MODULE_PARALLELISM)
 
 dnl ===
+dnl Number of parallel jobs to be executed during subsequenttest
+dnl ===
+AC_MSG_CHECKING([for maximum no. of jobs during subsequenttest])
+CHECK_PARALLELISM=$GMAKE_PARALLELISM
+if test "$with_check_jobs" != ""; then
+CHECK_PARALLELISM="$with_check_jobs"
+fi
+AC_MSG_RESULT([$CHECK_PARALLELISM])
+AC_SUBST(CHECK_PARALLELISM)
+
+dnl ===
 dnl Setting up the environment.
 dnl ===
 echo "setting up the build environment variables..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Fix typo ImpLoadLibary

[Gerrit]

>From Takeshi Abe :

Takeshi Abe has uploaded a new change for review.

Change subject: Fix typo ImpLoadLibary
..

Fix typo ImpLoadLibary

Change-Id: I773678437aae6577f22078e97bcac1377c4307d8
---
M basic/inc/basic/basmgr.hxx
M basic/source/basmgr/basmgr.cxx
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/495/1
--
To view, visit https://gerrit.libreoffice.org/495
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I773678437aae6577f22078e97bcac1377c4307d8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Takeshi Abe 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-6] fix for fdo#53839, don't crash for invalid repaint range in cond format code

[Markus Mohrhard]

Hey,

the attached patch fixes a strange crash in the cond format repaint
code. The patch is just a safe variant for now, the real problem is
that the concept of calling the repaint code after a cell changed is
not always correct but needs a bit more thinking about the design and
all the implications of a better fix.

This patch is absolutely safe and will prevent the crash for now. For
master I will need to think about a clean concept that also removes
the performance problems with the current approach.

Please also push this patch to master.

Regards,
Markus


0001-don-t-crash-for-invalid-repaint-ranges-in-cond-forma.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6] resolved fdo#51926 handle .xlsm link to external sheet with space

[Eike Rathke]

Hi,

We may want this in 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?id=85e40d787e9aacadfd8599791c83d09eb04e46d5
fixes https://bugs.freedesktop.org/show_bug.cgi?id=51926
Formula references to external documents' sheets with names containing
blanks (and other "irregular" characters, hence quoted) vanish.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpvb8YJWAOdj.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/address.cxx |   95 +++-
 1 file changed, 65 insertions(+), 30 deletions(-)

New commits:
commit 85e40d787e9aacadfd8599791c83d09eb04e46d5
Author: Eike Rathke 
Date:   Tue Aug 28 00:04:20 2012 +0200

resolved fdo#51926 handle .xlsm link to external sheet with space

In MOOXML  '[1]Sheet 4'!$A$1  represents a reference to an external
document's cache index with a sheet name containing blank, and not
[1]'Sheet 4'!$A$1

Change-Id: I5caf9e1d9a80154116dc7a72b33d34229092839c

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 72a30e9..1c3c66a 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -327,6 +327,57 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
 }
 
 
+/** Tries to obtain the external document index and replace by actual document
+name.
+
+@param ppErrRet
+   Contains the default pointer the caller would return if this method
+   returns FALSE, may be replaced by NULL for type or data errors.
+
+@returns FALSE only if the input name is numeric and not within the index
+sequence, or the link type cannot be determined or data mismatch. Returns
+TRUE in all other cases, also when there is no index sequence or the input
+name is not numeric.
+ */
+bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& 
rExternDocName,
+const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks)
+{
+// 1-based, sequence starts with an empty element.
+if (pExternalLinks && pExternalLinks->getLength() > 1)
+{
+// A numeric "document name" is an index into the sequence.
+if (CharClass::isAsciiNumeric( rExternDocName))
+{
+sal_Int32 i = rExternDocName.ToInt32();
+if (i <= 0 || i >= pExternalLinks->getLength())
+return false;   // with default *ppErrRet
+const sheet::ExternalLinkInfo & rInfo = (*pExternalLinks)[i];
+switch (rInfo.Type)
+{
+case sheet::ExternalLinkType::DOCUMENT :
+{
+rtl::OUString aStr;
+if (!(rInfo.Data >>= aStr))
+{
+OSL_TRACE( "ScRange::Parse_XL_Header: Data type 
mismatch for ExternalLinkInfo %d", i);
+*ppErrRet = NULL;
+return false;
+}
+rExternDocName = aStr;
+}
+break;
+default:
+OSL_TRACE( "ScRange::Parse_XL_Header: unhandled 
ExternalLinkType %d for index %d",
+rInfo.Type, i);
+*ppErrRet = NULL;
+return false;
+}
+}
+}
+return true;
+}
+
+
 const sal_Unicode* ScRange::Parse_XL_Header(
 const sal_Unicode* p,
 const ScDocument* pDoc,
@@ -369,36 +420,10 @@ const sal_Unicode* ScRange::Parse_XL_Header(
 }
 ++p;
 
-// 1-based, sequence starts with an empty element.
-if (pExternalLinks && pExternalLinks->getLength() > 1)
-{
-// A numeric "document name" is an index into the sequence.
-if (CharClass::isAsciiNumeric( rExternDocName))
-{
-sal_Int32 i = rExternDocName.ToInt32();
-if (i <= 0 || i >= pExternalLinks->getLength())
-return start;
-const sheet::ExternalLinkInfo & rInfo = (*pExternalLinks)[i];
-switch (rInfo.Type)
-{
-case sheet::ExternalLinkType::DOCUMENT :
-{
-rtl::OUString aStr;
-if (!(rInfo.Data >>= aStr))
-{
-OSL_TRACE( "ScRange::Parse_XL_Header: Data 
type mismatch for ExternalLinkInfo %d", i);
-return NULL;
-}
-rExternDocName = aStr;
-}
-break;
-default:
-OSL_TRACE( "ScRange::Parse_XL_Header: unhandled 
ExternalLinkType %d for index %d",
-rInfo.Type, i);
-return NULL;
-}
-}
-}
+const sal_Unicode* pErrRet = start;
+if (!lcl_XL_getExternalDoc( &pErrRet, rExternDocName, pExternalLinks))
+return pErrRet;
+
 rExternDocName = ScGlobal::GetAbsDocName(rExternDocName, 
pDoc->GetDocumentShell());
 }
 else if (*p == '\'')
@@ -408,6 +433,8 @@ const sal_Unicode* ScRange::Parse_XL_Header(
 // 'E:\[EXTDATA12B.XLSB]Sheet1:Sheet3'!$A$11
 // But, 'Sheet1'!B3 would also be a valid!
 // Excel does not al

Master failed to compile on framework module

[julien2412]

Hello,

On pc Debian x86-64 with master updated today, I can't compile framework
module, more specifically lomenubar part.
I don't have anymore the log because I runned a "make clean && make"
thinking it would be ok afterwards but not better and then made other tests
without success.
I just remember that it was linked with DispatchHelper.

Any idea?

Julien.



--
View this message in context: 
http://nabble.documentfoundation.org/Master-failed-to-compile-on-framework-module-tp4003926.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-1' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/dpcache.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7ca2d95c8ee30c450483433d5f380ebbf80691d5
Author: Kohei Yoshida 
Date:   Wed Aug 22 14:25:01 2012 -0400

fdo#53640: Correctly cache source data coming from database backend.

It was due to a simple misplacement of nRow = 0.  Each record was
labeled row 0.  No wonder it screws up the result badly.

Change-Id: Ia94f42a62f98a9bd7c9d34df3606351bb487931b
Signed-off-by: Michael Meeks 
(cherry picked from commit a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1)

Signed-off-by: Caolán McNamara 

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 3299ba0..a11db55 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -461,24 +461,27 @@ bool ScDPCache::InitFromDataBase (const 
Reference& xRowSet, const
 Reference xRow(xRowSet, UNO_QUERY_THROW);
 
 std::vector aBuckets;
+ScDPItemData aData;
 for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
 {
 xRowSet->first();
-ScDPItemData aData;
 aBuckets.clear();
 Field& rField = maFields[nCol];
+SCROW nRow = 0;
 do
 {
-SCROW nRow = 0;
 short nFormatType = NUMBERFORMAT_UNDEFINED;
+aData.SetEmpty();
 getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1, 
rNullDate, nFormatType);
-aBuckets.push_back(Bucket(aData, 0, nRow++));
+aBuckets.push_back(Bucket(aData, 0, nRow));
 if (!aData.IsEmpty())
 {
 maEmptyRows.insert_back(nRow, nRow+1, false);
 SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
 rField.mnNumFormat = pFormatter ? 
pFormatter->GetStandardFormat(nFormatType) : 0;
 }
+
+++nRow;
 }
 while (xRowSet->next());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED 3-6][REVIEW 3-6-1 3/3] Fix for fdo#53640 - Pivot table from database source

[Caolán McNamara]

On Wed, 2012-08-22 at 21:50 +0200, Eike Rathke wrote:
> Hi,
> 
> On Wednesday, 2012-08-22 20:22:19 +0100, Michael Meeks wrote:
> 
> > On Wed, 2012-08-22 at 15:05 -0400, Kohei Yoshida wrote:
> > > https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=f4ed9a5adbea3de88870ff4f5cb202bd606e0746
> > > cherry-picked to 3-6 and preferably to 3-6-1 as well.  This fixes
> > 
> > Looks sensible - I'm sure clang would have something to say about this
> > sort of incrementing of dead variables ;-)
> 
> Michael cherry-picked that to 3-6 as
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=a28d9cad672739cbf8dc6cf1f9db7d0f8becfee1
> 
> which has my +1

k, looks reasonable, pushed to 3-6-1 now.

> In 3-6 as
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=257a5fb833c2c03a3a82b19b9ab5a7cb3b5848ef
> 
> I can't say much about that without digging into cache/table refreshs
> other than having to trust Kohei's judgement. +0.5? ;-)

*shrug*, not pushed to 3-6-1

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED 3-6][REVIEW 3-6-1 2/3] Fix for fdo#52451

[Caolán McNamara]

On Wed, 2012-08-22 at 20:58 +0200, Eike Rathke wrote:
> Cherry-picked and squashed into one
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=d632fa4d8fc6a42a58cb981865d6267d90951b69
> (just that OUString(".*") had to be rtl::OUString(".*") instead)
> 
> Two more reviews needed for 3-6-1

looks good to me +1

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 formula/source/core/api/token.cxx |7 ++-
 sc/source/core/tool/token.cxx |2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0bb0937b65200382d3d8ad8f36472067ff0cbb40
Author: Eike Rathke 
Date:   Mon Aug 27 22:02:45 2012 +0200

do not silently ignore a token API error, fdo#51926 related

Change-Id: Ie187dad84bd55bb76c795b5c4807566e80349b56

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 4649732..c18ca4f 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -328,7 +328,12 @@ bool FormulaTokenArray::Fill(const uno::Sequence< 
sheet::FormulaToken >& _aSeque
 const sal_Int32 nCount = _aSequence.getLength();
 for (sal_Int32 nPos=0; nPos::get() ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[RESOLVED] Re: Usage of memset to eradicate string content

[Caolán McNamara]

On Sat, 2012-08-25 at 15:25 +0200, Arnaud Versini wrote:
> I posted a first patch to remove the string anhnilation inside the PDF
> import. Better idea to remove this now instead of replacing
> rtl_zeroMemory by a memset and remove it. So could you review it, I'm
> not sure if I can modify pdf import now or if we want to import
> modification from Apache.
> 
> https://gerrit.libreoffice.org/#/c/489/

All resolved now, patch integrated, etc.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 filter/source/pdf/impdialog.cxx|4 
 vcl/source/gdi/pdfwriter_impl2.cxx |3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 34091bc0e33a0aa6e839f5474e53d22a79960e68
Author: Caolán McNamara 
Date:   Mon Aug 27 20:36:23 2012 +0100

drop these memory trashers

some are the wrong length anyway, and anyway the copies remain untrashed,
and munging immutable strings is dubious

Change-Id: Ic7ac3bea35e57ed015092b3b255d48819195490d

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8330730..d19c87e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1317,10 +1317,6 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, 
ClickmaPbSetPwdHdl)
 }
 else
 maPreparedOwnerPassword = Sequence< NamedValue >();
-
-// trash clear text passwords string memory
-memset( (void*)aUserPW.getStr(), 0, aUserPW.getLength() );
-memset( (void*)aOwnerPW.getStr(), 0, aOwnerPW.getLength() );
 }
 enablePermissionControls();
 return 0;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx 
b/vcl/source/gdi/pdfwriter_impl2.cxx
index 16f806b..1855d43 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1315,9 +1315,6 @@ void PDFWriterImpl::padPassword( const rtl::OUString& 
i_rPassword, sal_uInt8* o_
 sal_Int32 i,y;
 for( i = nCurrentChar, y = 0 ; i < ENCRYPTED_PWD_SIZE; i++, y++ )
 o_pPaddedPW[i] = s_nPadString[y];
-
-// trash memory of temporary clear text password
-memset( (sal_Char*)aString.getStr(), 0, aString.getLength() );
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Remove ineffective password erasing security in PDF Import

[Gerrit]

>From Caolán McNamara :

Caolán McNamara has submitted this change and it was merged.

Change subject: Remove ineffective password erasing security in PDF Import
..


Remove ineffective password erasing security in PDF Import

Change-Id: Ic49101733f034cc1165bd3c7704481a569f8a75c
---
M sdext/source/pdfimport/filterdet.cxx
M sdext/source/pdfimport/wrapper/wrapper.cxx
2 files changed, 0 insertions(+), 10 deletions(-)

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved
  Kohei Yoshida: Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/489
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic49101733f034cc1165bd3c7704481a569f8a75c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini 
Gerrit-Reviewer: Arnaud Versini 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Kohei Yoshida 
Gerrit-Reviewer: Michael Stahl 
Gerrit-Reviewer: Norbert Thiebaud 
Gerrit-Reviewer: Stephan Bergmann 
Gerrit-Reviewer: Tor Lillqvist 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sdext/source

[Libreoffice Gerrit user]

 sdext/source/pdfimport/filterdet.cxx   |4 
 sdext/source/pdfimport/wrapper/wrapper.cxx |6 --
 2 files changed, 10 deletions(-)

New commits:
commit fe1e68503651382114d76759c6901bf685d8e106
Author: Arnaud Versini 
Date:   Sat Aug 25 13:57:34 2012 +0200

Remove ineffective password erasing security in PDF Import

Change-Id: Ic49101733f034cc1165bd3c7704481a569f8a75c
Reviewed-on: https://gerrit.libreoffice.org/489
Reviewed-by: Kohei Yoshida 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sdext/source/pdfimport/filterdet.cxx 
b/sdext/source/pdfimport/filterdet.cxx
index 8cbcd36..0629718 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -690,8 +690,6 @@ uno::Reference< io::XStream > getAdditionalStream( const 
rtl::OUString&
 rtl::OString aIsoPwd = 
rtl::OUStringToOString( io_rPwd,

RTL_TEXTENCODING_ISO_8859_1 );
 bAuthenticated = 
pPDFFile->setupDecryptionData( aIsoPwd.getStr() );
-// trash password string on heap
-rtl_zeroMemory( (void*)aIsoPwd.getStr(), 
aIsoPwd.getLength() );
 }
 if( ! bAuthenticated )
 {
@@ -719,8 +717,6 @@ uno::Reference< io::XStream > getAdditionalStream( const 
rtl::OUString&
 rtl::OString aIsoPwd = 
rtl::OUStringToOString( io_rPwd,

RTL_TEXTENCODING_ISO_8859_1 );
 bAuthenticated = 
pPDFFile->setupDecryptionData( aIsoPwd.getStr() );
-// trash password string on heap
-rtl_zeroMemory( 
(void*)aIsoPwd.getStr(), aIsoPwd.getLength() );
 } while( bEntered && ! bAuthenticated );
 }
 
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 772dac3..61d4b29 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -933,8 +933,6 @@ static bool checkEncryption( const rtl::OUString&
 rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd,

RTL_TEXTENCODING_ISO_8859_1 );
 bAuthenticated = pPDFFile->setupDecryptionData( 
aIsoPwd.getStr() );
-// trash password string on heap
-rtl_zeroMemory( (void*)aIsoPwd.getStr(), 
aIsoPwd.getLength() );
 }
 if( bAuthenticated )
 bSuccess = true;
@@ -949,16 +947,12 @@ static bool checkEncryption( const rtl::OUString&
 rtl::OString aIsoPwd = rtl::OUStringToOString( 
io_rPwd,

RTL_TEXTENCODING_ISO_8859_1 );
 bAuthenticated = pPDFFile->setupDecryptionData( 
aIsoPwd.getStr() );
-// trash password string on heap
-rtl_zeroMemory( (void*)aIsoPwd.getStr(), 
aIsoPwd.getLength() );
 } while( bEntered && ! bAuthenticated );
 }
 
 OSL_TRACE( "password: %s", bAuthenticated ? "matches" : 
"does not match" );
 bSuccess = bAuthenticated;
 }
-// trash password string on heap
-rtl_zeroMemory( (void*)io_rPwd.getStr(), 
io_rPwd.getLength()*sizeof(sal_Unicode) );
 if( bAuthenticated )
 {
 rtl::OUStringBuffer aBuf( 128 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-5]: fdo#49901: SwView::ExecSearch: fix Replace All cursor:

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has submitted this change and it was merged.

Change subject: fdo#49901: SwView::ExecSearch: fix Replace All cursor:
..


fdo#49901: SwView::ExecSearch: fix Replace All cursor:

Because the "fix" for i#8288 only set the point of the cursor and not
the mark, it can happen that after a Replace All weird things are
selected; fix that (and i#8288 properly) by using the SwCrsrShell stack,
and don't do it when searching in the selection.
This cannot be done in SwCrsrShell itself because ExecSearch sets the
cursor to the beginning/end of the document already.
(regression from cda75d6f358d438f7ed36ed7fa296ac23e3c4a04)

Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
(cherry picked from commit b3233579ccb2528912835deedde37c1d48417d6c)
---
M sw/source/ui/uiview/viewsrch.cxx
1 file changed, 23 insertions(+), 23 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/482
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-5
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: not delivering cairo on mac os x build

[Riccardo Magliocchetti]

Il 27/08/2012 18:27, Riccardo Magliocchetti ha scritto:

Hello,

i'm trying to sort out building with --enable-headless on mac os x, with
the attached patch it does not try to build cairo and pixman anymore but
somewhere cairo is still expected:

/Users/stage/Documents/riccardo/libo/solenv/gbuild/Library.mk:54: ***
gb_Deliver_deliver: file does not exist in solver, and cannot be
delivered:
/Users/stage/Documents/riccardo/libo/solver/unxmacxi.pro/lib/libcairo.dylib.
Stop.

Any hint?


+ifeq ($(GUIBASE),headless)

For start this is reversed so back to building...

riccardo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewsrch.cxx |   46 +++
 1 file changed, 23 insertions(+), 23 deletions(-)

New commits:
commit fa5d53a4fb05f690cd59de274fb5d5fd1b42f677
Author: Michael Stahl 
Date:   Sat Aug 25 00:39:21 2012 +0200

fdo#49901: SwView::ExecSearch: fix Replace All cursor:

Because the "fix" for i#8288 only set the point of the cursor and not
the mark, it can happen that after a Replace All weird things are
selected; fix that (and i#8288 properly) by using the SwCrsrShell stack,
and don't do it when searching in the selection.
This cannot be done in SwCrsrShell itself because ExecSearch sets the
cursor to the beginning/end of the document already.
(regression from cda75d6f358d438f7ed36ed7fa296ac23e3c4a04)

Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
(cherry picked from commit b3233579ccb2528912835deedde37c1d48417d6c)
Reviewed-on: https://gerrit.libreoffice.org/482
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 29d33c1..a7c6528 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -286,36 +286,36 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool 
bNoMessage)
 case SVX_SEARCHCMD_REPLACE_ALL:
 {
 SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() 
);
-
-// Fix for i#8288: "Replace all" should leave the cursor 
at the place it was
-// before executing the command, rather than at the site 
of the final replacement.
-// To do this take note of the current cursor position 
before replace all begins:
-// note: must be stored so that it is corrected by PamCorr*
-::boost::scoped_ptr const pTmpCursor(
-pWrtShell->GetDoc()->CreateUnoCrsr(
-*pWrtShell->GetSwCrsr()->GetPoint()));
-
-if( !pSrchItem->GetSelection() )
-{
-// bestehende Selektionen aufheben,
-// wenn nicht in selektierten Bereichen gesucht werden 
soll
-pWrtShell->KillSelection(0, false);
-if( DOCPOS_START == aOpts.eEnd )
-pWrtShell->EndDoc();
-else
-pWrtShell->SttDoc();
-}
-
 bExtra = sal_False;
 sal_uLong nFound;
 
 {   //Scope for SwWait-Object
 SwWait aWait( *GetDocShell(), sal_True );
 pWrtShell->StartAllAction();
+if (!pSrchItem->GetSelection())
+{
+// if we don't want to search in the selection...
+pWrtShell->KillSelection(0, false);
+// i#8288 "replace all" should not change cursor
+// position, so save current cursor
+pWrtShell->Push();
+if (DOCPOS_START == aOpts.eEnd)
+{
+pWrtShell->EndDoc();
+}
+else
+{
+pWrtShell->SttDoc();
+}
+}
 nFound = FUNC_Search( aOpts );
-// #i8288# Now that everything has been replaced, 
restore the original cursor position.
-*(pWrtShell->GetSwCrsr()->GetPoint()) =
-*pTmpCursor->GetPoint();
+if (!pSrchItem->GetSelection())
+{
+// create it just to overwrite it with stack cursor
+pWrtShell->CreateCrsr();
+// i#8288 restore the original cursor position
+pWrtShell->Pop(false);
+}
 pWrtShell->EndAllAction();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using syslog instead of console for messages

[Riccardo Magliocchetti]

Hello,

Il 27/08/2012 09:41, Riccardo Magliocchetti ha scritto:

Hello Stephan,

Il 27/08/2012 09:13, Stephan Bergmann ha scritto:

On 08/26/2012 12:34 PM, Riccardo Magliocchetti wrote:

while in headless mode i'd like to have messages delivered to syslog
instead of stderr / stdout, looking at the SAL_* implementation it looks
like what i want is to substitute the std::fputs in
osl/all/log.cxx::log() with syslog() plus some map between these levels
and syslog ones. Is that ok?


yes


So here's a quick patch, not even compile tested because i have few 
questions to resolve before considering it ready for review:


- what about errors? it looks like SAL does not have a level for errors. 
I'd like to have the errors in vcl/headless/headlessinst.cxx going to 
syslog too. Should i use straight syslog or can i use another facility?


- is it ok to initialize syslog in desktop/source/app/sofficemain.cxx?

- can you suggests something better than WANT_SYSLOG_LOGS ? :)

- should i add a switch for syslog logging to configure so that the 
feature may be used also in other environments? May be useful for large 
deployments i think where you want centralized logs.


thanks in advance,
riccardo

diff --git a/configure.in b/configure.in
index 7d7ec8b..b7cc0f4 100644
--- a/configure.in
+++ b/configure.in
@@ -9098,6 +9098,8 @@ if test "x$enable_headless" = "xyes"; then
 ENABLE_HEADLESS="TRUE"
 SCPDEFS="$SCPDEFS -DLIBO_HEADLESS"
 R="headless"
+dnl if we support syslog, we want our logs there
+AC_CHECK_HEADER(syslog.h, AC_DEFINE(WANT_SYSLOG_LOGS))
 fi
 AC_SUBST(ENABLE_HEADLESS)
 
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index a0fba04..251cc20 100755
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,6 +43,10 @@
 #include 
 #endif
 
+#ifdef WANT_SYSLOG_LOGS
+#include 
+#endif
+
 int SVMain();
 
 // -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -82,6 +86,9 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 return EXIT_FAILURE;
 }
 #endif
+#ifdef WANT_SYSLOG_LOGS
+openlog("libreoffice", 0, LOG_USER);
+#endif
 return SVMain();
 #if defined ANDROID || defined WNT
 } catch (const ::com::sun::star::uno::Exception &e) {
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index bac0e93..f869060 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -55,6 +55,10 @@
 #define OSL_DETAIL_GETPID getpid()
 #endif
 
+#ifdef WANT_SYSLOG_LOGS
+#include 
+#endif
+
 // Avoid the use of other sal code in this file as much as possible, so that
 // this code can be called from other sal code without causing endless
 // recursion.
@@ -82,6 +86,22 @@ char const * toString(sal_detail_LogLevel level) {
 }
 }
 
+#ifdef WANT_SYSLOG_LOGS
+int toSyslogPriority(sal_detail_LogLevel level) {
+switch (level) {
+default:
+assert(false); // this cannot happen
+// fall through
+case SAL_DETAIL_LOG_LEVEL_INFO:
+return LOG_INFO;
+case SAL_DETAIL_LOG_LEVEL_WARN:
+return LOG_WARNING;
+case SAL_DETAIL_LOG_LEVEL_DEBUG:
+return LOG_DEBUG;
+}
+}
+#endif
+
 bool report(sal_detail_LogLevel level, char const * area) {
 if (level == SAL_DETAIL_LOG_LEVEL_DEBUG)
 return true;
@@ -156,14 +176,21 @@ void log(
 char const * message)
 {
 std::ostringstream s;
+#ifndef WANT_SYSLOG_LOGS
+s << toString(level) << ':';
+#endif
 if (level == SAL_DETAIL_LOG_LEVEL_DEBUG) {
-s << toString(level) << ':' << /*no where*/' ' << message << '\n';
+s << /*no where*/' ' << message << '\n';
 } else {
-s << toString(level) << ':' << area << ':' << OSL_DETAIL_GETPID << ':'
+s << area << ':' << OSL_DETAIL_GETPID << ':'
 << osl::Thread::getCurrentIdentifier() << ':' << where << message
 << '\n';
 }
+#ifdef WANT_SYSLOG_LOGS
+syslog(toSyslogPriority(level), "%s", s.str().c_str());
+#else
 std::fputs(s.str().c_str(), stderr);
+#endif
 }
 
 }
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 439de86..792e8af 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -78,7 +78,6 @@ public:
 virtual bool ErrorTrapPop( bool ) { return false; }
 };
 
-// All the interesting stuff is slaved from the AndroidSalInstance
 void InitSalData()   {}
 void DeInitSalData() {}
 void InitSalMain()   {}
@@ -89,6 +88,7 @@ void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
 rtl::OUString aError( rErrorText );
 if( aError.isEmpty() )
 aError = rtl::OUString::createFromAscii("Unknown application error");
+/* FIXME: use sal error ? */
 ::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
 
 ::fprintf( stderr, "SalAbort: '%s'",
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists

[Libreoffice-commits] .: sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/data/ods/pivot-table-basic.ods |binary
 sc/qa/unit/subsequent_filters-test.cxx|   84 ++
 2 files changed, 84 insertions(+)

New commits:
commit 95379eb197b98c2ce6e2a29e970e60bf5c02385b
Author: Kohei Yoshida 
Date:   Mon Aug 27 13:05:35 2012 -0400

Add unit test for pivot table import from ods.

Change-Id: I7e7bf5746636e0f13aaaec91d526ac59f6054796

diff --git a/sc/qa/unit/data/ods/pivot-table-basic.ods 
b/sc/qa/unit/data/ods/pivot-table-basic.ods
new file mode 100644
index 000..9bbb5fe
Binary files /dev/null and b/sc/qa/unit/data/ods/pivot-table-basic.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 126f7a5..a6387e6 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -48,10 +48,14 @@
 #include "cell.hxx"
 #include "drwlayer.hxx"
 #include "userdat.hxx"
+#include "dpobject.hxx"
+#include "dpsave.hxx"
 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -157,6 +161,8 @@ public:
 
 void testCellAnchoredShapesODS();
 
+void testPivotTableBasicODS();
+
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testRangeNameXLS);
 CPPUNIT_TEST(testRangeNameXLSX);
@@ -196,6 +202,8 @@ public:
 
 CPPUNIT_TEST(testCellAnchoredShapesODS);
 
+CPPUNIT_TEST(testPivotTableBasicODS);
+
 //disable testPassword on MacOSX due to problems with libsqlite3
 //also crashes on DragonFly due to problems with nss/nspr headers
 #if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT)
@@ -1389,6 +1397,82 @@ void ScFiltersTest::testCellAnchoredShapesODS()
 xDocSh->DoClose();
 }
 
+namespace {
+
+class FindDimByName : std::unary_function
+{
+OUString maName;
+public:
+FindDimByName(const OUString& rName) : maName(rName) {}
+
+bool operator() (const ScDPSaveDimension* p) const
+{
+return p && p->GetName() == maName;
+}
+};
+
+bool hasDimension(const std::vector& rDims, const 
OUString& aName)
+{
+return std::find_if(rDims.begin(), rDims.end(), FindDimByName(aName)) != 
rDims.end();
+}
+
+}
+
+void ScFiltersTest::testPivotTableBasicODS()
+{
+OUString aFileNameBase("pivot-table-basic.");
+OUString aFileExt = OUString::createFromAscii(aFileFormats[ODS].pName);
+OUString aFilterName = 
OUString::createFromAscii(aFileFormats[ODS].pFilterName);
+OUString aFilterType = 
OUString::createFromAscii(aFileFormats[ODS].pTypeName);
+
+rtl::OUString aFileName;
+createFileURL(aFileNameBase, aFileExt, aFileName);
+ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), 
aFilterType, aFileFormats[ODS].nFormatType);
+CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", 
xDocSh.Is());
+
+ScDocument* pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT_MESSAGE("There should be exactly two sheets.", 
pDoc->GetTableCount() == 2);
+
+ScDPCollection* pDPs = pDoc->GetDPCollection();
+CPPUNIT_ASSERT_MESSAGE("Failed to get a live ScDPCollection instance.", 
pDPs);
+CPPUNIT_ASSERT_MESSAGE("There should be exactly one pivot table 
instance.", pDPs->GetCount() == 1);
+
+const ScDPObject* pDPObj = (*pDPs)[0];
+CPPUNIT_ASSERT_MESSAGE("Failed to get an pivot table object.", pDPObj);
+const ScDPSaveData* pSaveData = pDPObj->GetSaveData();
+CPPUNIT_ASSERT_MESSAGE("Failed to get ScDPSaveData instance.", pSaveData);
+std::vector aDims;
+
+// Row fields
+
pSaveData->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_ROW, 
aDims);
+CPPUNIT_ASSERT_MESSAGE("There should be exactly 3 row fields (2 normal 
dimensions and 1 layout dimension).", aDims.size() == 3);
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
hasDimension(aDims, "Row1"));
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
hasDimension(aDims, "Row2"));
+const ScDPSaveDimension* pDataLayout = 
pSaveData->GetExistingDataLayoutDimension();
+CPPUNIT_ASSERT_MESSAGE("There should be a data layout field as a row 
field.",
+   pDataLayout && pDataLayout->GetOrientation() == 
sheet::DataPilotFieldOrientation_ROW);
+
+// Column fields
+
pSaveData->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_COLUMN,
 aDims);
+CPPUNIT_ASSERT_MESSAGE("There should be exactly 2 column fields.", 
aDims.size() == 2);
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
hasDimension(aDims, "Col1"));
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
hasDimension(aDims, "Col2"));
+
+// Page fields
+
pSaveData->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_PAGE, 
aDims);
+CPPUNIT_ASSERT_MESSAGE("There should be exactly 2 page fields.", 
aDims.size() == 2);
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
hasDimension(aDims, "Page1"));
+CPPUNIT_ASSERT_MESSAGE("Dimension expected, but not found.", 
has

Re: PATCH (tweaking the "fill in character" support in Calc Number Format Strings)

[Eike Rathke]

Hi Johann,

On Monday, 2012-08-27 16:29:06 +0200, Johann Messner wrote:

> Many thanks to all of you in the LibreOffice Project for the good
> work (..insbesondere gilt Eike Rathke bzw. den Leuten vom 
> =STARCALCTEAM()
> unsere Anerkennung und unser aller Dank!!)

Lol, thanks :-)

The easter-egg police wiped all traces of history..

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp5bjkVXzgbT.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: PATCH (tweaking the "fill in character" support in Calc Number Format Strings)

[Eike Rathke]

Hi Noel,

On Monday, 2012-08-27 14:54:57 +0100, Noel Power wrote:

> a) to change the how the formatter marks the repeating character, it
> looks like now 0x1b is 'before' the char to repeat, previously it
> was after ( makes more sense to me to have the marker preceding the
> repeat char )
> Eike, was there any reason for the original scheme that you recall
> or any objections to changing

I don't recall anything special there, we just had it wrong ;-)  in fact
Excel puts the '*' before the character to repeat, so that's what we
should do as well.


> b) in cellform.cxx let cells with type CELLTYPE_STRING apply the
> format with the repeating code also. Hmmm now I did see this
> previously but I didn't see why the a string type cell would need to
> apply the numeric format, so I left it out, I presume this change is
> necessary for some types of non numberic cell content, I would guess
> maybe dates or something? is that correct ? ( or if not I'd be
> interested in the scenario that requires it )

The text format may have embedded characters, so a cell containing "foo"
displayed with a format code of '"bar "@" baz"' shows as "bar foo baz".

Each number format may also have a text subformat (the 4th
subformat) in case the cell content is text and not number, e.g.

0;-0;"";"text:"* @

in Excel works as expected.


> c) same as above except for CELLTYPE_FORMULA, so yes, this was
> oversight by me, formulas can have numeric results for sure that
> could use the repeating character format support so that part is
> needed. I guess the change to the format for the else leg of the 'if
> ( pFCell->IsValue() )' test probably has some similar rational as in
> the string case.
> 
> d) some additional checks to prevent potential div/0 which are fine
> 
> e) the new built-in formats, Eike are they ok for you?

In general yes, there just should be no gaps in the formatindex="..."
values, so continue with whatever each locale's last index is.

> if they are I
> also not sure what ( if any ) additional effort is required to
> internationalise those formats :/

I'd leave that to localizers. There are 16 possibilities to display
a negative currency amount (with/without blanks between symbol and
amount, symbol preceding or following amount, minus before or after
amount or before or after symbol, or no minus but parentheses, ...) plus
variants whether some character's width gap is included or not.

Excel's default en-US accounting format code is

_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)

while for de-DE it is

_-* #.##0,00 €_-;-* #.##0,00 €_-;_-* "-"?? €_-;_-@_-

...

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp82JyaPyEZt.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

not delivering cairo on mac os x build

[Riccardo Magliocchetti]

Hello,

i'm trying to sort out building with --enable-headless on mac os x, with 
the attached patch it does not try to build cairo and pixman anymore but 
somewhere cairo is still expected:


/Users/stage/Documents/riccardo/libo/solenv/gbuild/Library.mk:54: *** 
gb_Deliver_deliver: file does not exist in solver, and cannot be 
delivered: 
/Users/stage/Documents/riccardo/libo/solver/unxmacxi.pro/lib/libcairo.dylib. 
 Stop.


Any hint?

thanks,
riccardo
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57b7249..6f9dae1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -525,6 +525,7 @@ endif # ANDROID
 
 endif # SYSTEM_REDLAND
 
+ifeq ($(GUIBASE),headless)
 
 ifeq ($(SYSTEM_CAIRO),YES)
 
@@ -581,6 +582,8 @@ endef
 
 endif # SYSTEM_CAIRO
 
+endif # headless
+
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/core/crsr/crsrsh.cxx |   11 ++
 sw/source/ui/docvw/edtwin.cxx  |   75 -
 sw/source/ui/inc/edtwin.hxx|2 -
 3 files changed, 33 insertions(+), 55 deletions(-)

New commits:
commit 3a8f97a07ff02e160e35c54986c30c014c6415d0
Author: Cédric Bosdonnat 
Date:   Mon Aug 27 18:12:00 2012 +0200

Headers/Footers: don't create temporary parts of document (perf problems)

Clicking on an empty header/footer only displays the separator as
creating empty header/footer could cause important layout recomputing on
long documents.

Change-Id: I800c5dd27744772833dee0da4269e7591bd0a10b

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 1c38bcc..96d96b7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -679,6 +679,17 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool 
bOnlyText, bool bBlock )
 bool bInHeaderFooter = pFrm && ( pFrm->IsHeaderFrm() || 
pFrm->IsFooterFrm() );
 if ( bInHeaderFooter != IsHeaderFooterEdit() )
 ToggleHeaderFooterEdit();
+else
+{
+// Make sure we have the proper Header/Footer separators shown
+// as these may be changed if clicking on an empty Header/Footer
+SetShowHeaderFooterSeparator( Header, pFrm != NULL && 
pFrm->IsHeaderFrm( ) );
+SetShowHeaderFooterSeparator( Footer, pFrm != NULL && 
pFrm->IsFooterFrm( ) );
+
+// Repaint everything
+GetWin()->Invalidate();
+}
+
 
 if( pBlockCrsr && bBlock )
 {
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 2805bc2..3fbc8c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1323,13 +1323,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 rSh.IsHeaderFooterEdit( ) )
 {
 bool bHeader = FRMTYPE_HEADER & rSh.GetFrmType(0,sal_False);
-
-// Remove the temporary header/footer
-if ( !m_sTmpHFPageStyle.isEmpty() )
-{
-rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader, 
false, false );
-}
-
 if ( bHeader )
 rSh.SttPg();
 else
@@ -1337,10 +1330,6 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
 rSh.ToggleHeaderFooterEdit();
 }
 
-// If we are inputing a key in a temporary header/footer, then make it 
definitive
-if ( !m_sTmpHFPageStyle.isEmpty( ) )
-m_sTmpHFPageStyle = rtl::OUString( );
-
 SfxObjectShell *pObjSh = 
(SfxObjectShell*)rView.GetViewFrame()->GetObjectShell();
 if ( bLockInput || (pObjSh && pObjSh->GetProgress()) )
 // When the progress bar is active or a progress is
@@ -2686,26 +2675,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& 
_rMEvt)
 
 const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
 
-FrameControlType eControl;
-bool bIsInHF = IsInHeaderFooter( aDocPos, eControl );
-if ( !m_sTmpHFPageStyle.isEmpty( ) )
-{
-// Are we clicking outside the temporary header/footer? if so remove it
-rtl::OUString sStyleName = rSh.GetCurPageStyle( false );
-bool bMatchesTmpHF = sStyleName == m_sTmpHFPageStyle &&
-( ( m_bTmpHFIsHeader && eControl == Header ) ||
-  ( !m_bTmpHFIsHeader && eControl == Footer ) );
-
-if ( ( !bIsInHF && rSh.IsHeaderFooterEdit( ) ) || !bMatchesTmpHF )
-rSh.ChangeHeaderOrFooter( m_sTmpHFPageStyle, m_bTmpHFIsHeader, 
false, false );
-
-m_sTmpHFPageStyle = rtl::OUString( );
-}
-
 // Are we clicking on a blank header/footer area?
-if ( bIsInHF && !rSh.IsHeaderFooterEdit( ) )
+FrameControlType eControl;
+if ( IsInHeaderFooter( aDocPos, eControl ) )
 {
-// Create empty header/footer under the cursor and switch to it
 const SwPageFrm* pPageFrm = rSh.GetLayout()->GetPageAtPos( aDocPos );
 
 // Is it active?
@@ -2726,10 +2699,25 @@ void SwEditWin::MouseButtonDown(const MouseEvent& 
_rMEvt)
 
 if ( !bActive )
 {
-const String& rStyleName = pPageFrm->GetPageDesc()->GetName();
-rSh.ChangeHeaderOrFooter( rStyleName, eControl == Header, true, 
false );
-m_sTmpHFPageStyle = rStyleName;
-m_bTmpHFIsHeader = eControl == Header;
+SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
+bool bWasInHeader = aPam.GetPoint( )->nNode.GetNode( 
).FindHeaderStartNode( ) != NULL;
+bool bWasInFooter = aPam.GetPoint( )->nNode.GetNode( 
).FindFooterStartNode( ) != NULL;
+
+// Is the cursor in a part like similar to the one we clicked on? 
For example,
+// if the cursor is in a header and we click on an empty header... 
don't change anything to
+// keep consistent behaviour due to header edit mode (and the same 
for the footer as well).
+//
+// Otherwise, we hide the header/footer

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

[Libreoffice Gerrit user]

 sw/inc/swabstdlg.hxx |1 
 sw/source/core/txtnode/txtedt.cxx|   81 +--
 sw/source/ui/dialog/swdlgfact.cxx|4 +
 sw/source/ui/dialog/swdlgfact.hxx|1 
 sw/source/ui/dialog/wordcountdialog.cxx  |5 +
 sw/source/ui/dialog/wordcountwrapper.cxx |5 +
 sw/source/ui/inc/wordcountdialog.hxx |3 +
 sw/source/ui/uiview/view2.cxx|5 +
 8 files changed, 69 insertions(+), 36 deletions(-)

New commits:
commit 5192468dd49f5e1d821239cd51cea42f8bac7a4b
Author: Caolán McNamara 
Date:   Mon Aug 27 16:05:11 2012 +0100

Related: fdo#51908 reuse the status bar word counts for the dialog

Set the counts directly on the word count dialog when we have them
precalculated from updating the status bar

Change-Id: Idd64f20097af661dd4938af7fcc8506eca076e9c

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 2962991..016202c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -203,6 +203,7 @@ class AbstractSwWordCountFloatDlg : public VclAbstractDialog
 {
 public:
 virtual voidUpdateCounts() = 0;
+virtual voidSetCounts(const SwDocStat &rCurrCnt, const SwDocStat 
&rDocStat) = 0;
 virtual Window *GetWindow() = 0; //this method is added for return a 
Window type pointer
 };
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index f7c81aa..868b487 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -571,6 +571,10 @@ void AbstractSwWordCountFloatDlg_Impl::UpdateCounts()
 pDlg->UpdateCounts();
 }
 
+void AbstractSwWordCountFloatDlg_Impl::SetCounts(const SwDocStat &rCurrCnt, 
const SwDocStat &rDocStat)
+{
+pDlg->SetCounts(rCurrCnt, rDocStat);
+}
 
 AbstractMailMergeWizard_Impl::~AbstractMailMergeWizard_Impl()
 {
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index f4a24da..159f6e3 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -79,6 +79,7 @@ class AbstractSwWordCountFloatDlg_Impl : public 
AbstractSwWordCountFloatDlg
 {
 DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg)
 virtual voidUpdateCounts();
+virtual voidSetCounts(const SwDocStat &rCurrCnt, const 
SwDocStat &rDocStat);
 virtual Window *GetWindow(); //this method is added for return 
a Window type pointer
 };
 
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx 
b/sw/source/ui/dialog/wordcountdialog.cxx
index c34c197..122d542 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -133,4 +133,9 @@ void SwWordCountFloatDlg::UpdateCounts()
 aDlg.SetValues(aCurrCnt, aDocStat);
 }
 
+void SwWordCountFloatDlg::SetCounts(const SwDocStat &rCurrCnt, const SwDocStat 
&rDocStat)
+{
+aDlg.SetValues(rCurrCnt, rDocStat);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx 
b/sw/source/ui/dialog/wordcountwrapper.cxx
index aaca02d..2fb4b8d 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -58,3 +58,8 @@ void SwWordCountWrapper::UpdateCounts()
 {
 pAbstDlg->UpdateCounts();
 }
+
+void SwWordCountWrapper::SetCounts(const SwDocStat &rCurrCnt, const SwDocStat 
&rDocStat)
+{
+pAbstDlg->SetCounts(rCurrCnt, rDocStat);
+}
diff --git a/sw/source/ui/inc/wordcountdialog.hxx 
b/sw/source/ui/inc/wordcountdialog.hxx
index 1960072..f70c6a8 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -78,6 +78,8 @@ class SwWordCountFloatDlg : public SfxModelessDialog
  Window *pParent,
  SfxChildWinInfo* pInfo);
 voidUpdateCounts();
+
+voidSetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat);
 };
 
 class SwWordCountWrapper : public SfxChildWindow
@@ -93,6 +95,7 @@ protected:
 
 public:
 voidUpdateCounts();
+voidSetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat);
 };
 
 #endif
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 7dfbe02..770866a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -140,6 +140,7 @@
 #include 
 #include 
 #include 
+#include 
 
 const char sStatusDelim[] = " : ";
 const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," 
add by zhaojianwei
@@ -1215,6 +1216,10 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 wordCount = wordCount.replaceAll("$2", 
rtl::OUString::valueOf(static_cast(selectionStats.nWord)));
 }
 rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount));
+
+SwWordCountWrapper *pWrdCnt = 
(SwWordCountWrapper*)GetViewFrame()->GetChildWindow(SwWordCountWrapper::GetChildWindowId());
+  

[Libreoffice-commits] .: embeddedobj/source

[Libreoffice Gerrit user]

 embeddedobj/source/msole/olecomponent.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2489e82d33d4790c74c61fb90783d8b493bafb4d
Author: Stephan Bergmann 
Date:   Mon Aug 27 17:23:08 2012 +0200

Missing #include

diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index e785aaa..f4fe346 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -38,6 +38,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basic/source odk/setsdkenv_unix.csh.in solenv/bin

[Libreoffice Gerrit user]

 basic/source/basmgr/basmgr.cxx  |   10 --
 odk/setsdkenv_unix.csh.in   |6 +++---
 solenv/bin/modules/installer/epmfile.pm |4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 246d26faecb809cf4f013b3fcd1368892100217a
Author: Takeshi Abe 
Date:   Mon Aug 27 16:47:08 2012 +0900

Fix typo LD_LIBARY_PATH

Change-Id: Iff2b85db621eb7b40d8a46a6452b8cae01a91e2e

diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index f5a2cdc..34bebd7 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -104,7 +104,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 set exampleout=SOLARISexample.out
 
 # set LD_LIBRARY_PATH
-if ( $?LD_LIBARY_PATH == 0) then
+if ( $?LD_LIBRARY_PATH == 0) then
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
 else
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
@@ -125,7 +125,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 set platform=Linux
 
 # set LD_LIBRARY_PATH
-if ( $?LD_LIBARY_PATH == 0) then
+if ( $?LD_LIBRARY_PATH == 0) then
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
 else
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
@@ -167,7 +167,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 set platform=FreeBSD
 
 # set LD_LIBRARY_PATH
-if ( $?LD_LIBARY_PATH == 0) then
+if ( $?LD_LIBRARY_PATH == 0) then
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
 else
setenv LD_LIBRARY_PATH 
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 7d7da01..817b449 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2401,7 +2401,7 @@ sub create_packages_without_epm
 
 if ( $rpm_failed )
 {
-# Because of the problems with LD_LIBARY_PATH, a direct call of 
local "rpm" or "rpmbuild" might be successful
+# Because of the problems with LD_LIBRARY_PATH, a direct call of 
local "rpm" or "rpmbuild" might be successful
 my $rpmprog = "";
 if ( -f "/usr/bin/rpmbuild" ) { $rpmprog = "/usr/bin/rpmbuild"; }
 elsif ( -f "/usr/bin/rpm" ) { $rpmprog = "/usr/bin/rpm"; }
@@ -2420,7 +2420,7 @@ sub create_packages_without_epm
 
 my $helperreturnvalue = $?; # $? contains the return value of 
the systemcall
 
-$infoline = "\nLast try: Using $rpmprog directly (problem with 
LD_LIBARY_PATH)\n";
+$infoline = "\nLast try: Using $rpmprog directly (problem with 
LD_LIBRARY_PATH)\n";
 push( @installer::globals::logfileinfo, $infoline);
 
 $infoline = "\nSystemcall: $helpersystemcall\n";
commit 71c1de8f01d10197226a4d8a441089dee879b3cb
Author: Takeshi Abe 
Date:   Mon Aug 27 16:34:19 2012 +0900

Remove unused member variable

Its reference through IsFoundInPath() was dropped at 
4c3f33d8d54756d3988c4d4c848712b31027f919

Change-Id: I764808d8a59089a05eccedd297a61aa6e76b01e0

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index c0826c6..733e469 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -389,7 +389,6 @@ private:
 sal_BoolbDoLoad;
 sal_BoolbReference;
 sal_BoolbPasswordVerified;
-sal_BoolbFoundInPath;   // Must not relativated again!
 
 // Lib represents library in new UNO library container
 Reference< XLibraryContainer > mxScriptCont;
@@ -431,9 +430,6 @@ public:
 sal_BoolIsPasswordVerified() const  { return 
bPasswordVerified; }
 voidSetPasswordVerified()   { bPasswordVerified = 
sal_True; }
 
-sal_BoolIsFoundInPath() const   { return 
bFoundInPath; }
-voidSetFoundInPath( sal_Bool bInPath )  { bFoundInPath = 
bInPath; }
-
 static BasicLibInfo*Create( SotStorageStream& rSStream );
 
 Reference< XLibraryContainer > GetLibraryContainer( void )
@@ -534,7 +530,6 @@ BasicLibInfo::BasicLibInfo()
 bReference  = sal_False;
 bPasswordVerified   = sal_False;
 bDoLoad = sal_False;
-bFoundInPath= sal_False;
 mxScriptCont= NULL;
 aStorageName= rtl::OUString(szImbedded);
 aRelStorageName = rtl::OUString(szImbedded);
@@ -895,7 +890,6 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, 
const String& rBaseUR
 

[PUSHED] fdo#39468: Translated German comments in sc/source/core/inc

[Gerrit]

>From Kohei Yoshida :

Kohei Yoshida has submitted this change and it was merged.

Change subject: fdo#39468: Translated German comments in sc/source/core/inc
..


fdo#39468: Translated German comments in sc/source/core/inc

Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Reviewed-by: Philipp Riemer 
---
M sc/source/core/inc/adiasync.hxx
M sc/source/core/inc/ddelink.hxx
M sc/source/core/inc/interpre.hxx
3 files changed, 30 insertions(+), 30 deletions(-)

Approvals:
  Philipp Riemer: Looks good to me, but someone else must approve
  Kohei Yoshida: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/493
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer 
Gerrit-Reviewer: Kohei Yoshida 
Gerrit-Reviewer: Philipp Riemer 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/inc/adiasync.hxx |   20 ++--
 sc/source/core/inc/ddelink.hxx  |   14 +++---
 sc/source/core/inc/interpre.hxx |   26 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit f5b7fecbc0744e46468d57b8131ea7d768aa96a2
Author: Gerhard Oettl 
Date:   Mon Aug 27 09:39:35 2012 +0200

fdo#39468: Translated German comments in sc/source/core/inc

Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Reviewed-by: Philipp Riemer 
Reviewed-on: https://gerrit.libreoffice.org/493
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 54625c8..548f58c 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -49,20 +49,20 @@ class ScAddInAsync : public SvtBroadcaster
 private:
 union
 {
-double  nVal;   // aktueller Wert
+double  nVal;   // current value
 String* pStr;
 };
-ScAddInDocs*pDocs;  // Liste der benutzenden Dokumente
-FuncData*   mpFuncData;  // Zeiger auf die Daten in der 
Collection
-sal_uLong   nHandle;// wird von double auf sal_uLong 
gecasted
-ParamType   meType;  // PTR_DOUBLE oder PTR_STRING Ergebnis
-sal_BoolbValid; // ob Wert gueltig
+ScAddInDocs*pDocs;  // List of using documents
+FuncData*   mpFuncData; // Pointer to files in collection
+sal_uLong   nHandle;// is casted from double to sal_uLong
+ParamType   meType; // result of type PTR_DOUBLE or 
PTR_STRING
+sal_BoolbValid; // is value valid?
 
 public:
-// cTor nur wenn ScAddInAsync::Get fehlschlaegt!
-// nIndex: Index aus der FunctionCollection
+// cTor only if ScAddInAsync::Get fails.
+// nIndex: Index from FunctionCollection
 ScAddInAsync(sal_uLong nHandle, FuncData* pFuncData, ScDocument* pDoc);
-// default-cTor nur fuer das eine globale aSeekObj !!!
+// default-cTor only for that single, global aSeekObj!
 ScAddInAsync();
 virtual ~ScAddInAsync();
 static ScAddInAsync*Get( sal_uLong nHandle );
@@ -76,7 +76,7 @@ public:
 { return pDocs->find( pDoc ) != pDocs->end(); }
 voidAddDocument( ScDocument* pDoc ) { pDocs->insert( pDoc ); }
 
-// Vergleichsoperatoren fuer PtrArrSort
+// Comparators for PtrArrSort
 bool operator< ( const ScAddInAsync& r ) const { return nHandle <  
r.nHandle; }
 bool operator==( const ScAddInAsync& r ) const { return nHandle == 
r.nHandle; }
 };
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 216d6d6..4f3734f 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -46,14 +46,14 @@ static sal_Bool bIsInUpdate;
 
 ScDocument* pDoc;
 
-String  aAppl;  // Verbindungsdaten
+String  aAppl;  // connection/ link data
 String  aTopic;
 String  aItem;
-sal_uInt8   nMode;  // Zahlformat-Modus
+sal_uInt8   nMode;  // number format mode
 
-sal_BoolbNeedUpdate;// wird gesetzt, wenn Update nicht 
moeglich war
+sal_BoolbNeedUpdate;// is set, if update was not possible
 
-ScMatrixRef pResult;// Ergebnis
+ScMatrixRef pResult;
 
 public:
 TYPEINFO();
@@ -67,14 +67,14 @@ public:
 
 voidStore( SvStream& rStream, ScMultipleWriteHeader& rHdr ) 
const;
 
-// von SvBaseLink ueberladen:
+// overloaded by SvBaseLink:
 virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
 const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
 
-// von SvtBroadcaster ueberladen:
+// overloaded by SvtBroadcaster:
 virtual voidListenersGone();
 
-// fuer Interpreter:
+// for interpreter:
 
 const ScMatrix* GetResult() const   { return pResult.get(); }
 voidSetResult( ScMatrixRef pRes ) { pResult = pRes; }
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3affc4e..6ed54c4 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -102,7 +102,7 @@ public:
 static void SetGlobalConfig(const ScCalcConfig& rConfig);
 static const ScCalcConfig& GetGlobalConfig();
 
-static void GlobalExit();   // aus ScGlobal::Clear() gerufen
+static void GlobalExit();   // called by ScGlobal::Clear()
 
 /// Could string be a regular expression?
 //

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - scp2/source

[Libreoffice Gerrit user]

 scp2/source/base/registryitem_base.scp |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 7695e138950168bc07669f13abc5498308890b5c
Author: Andras Timar 
Date:   Mon Aug 27 16:42:32 2012 +0200

.odb files do not have thumbnail image (related: fdo#53592)

Change-Id: Ib17bb0a2fc95207da69bfef11b2fab59aefa719d
Signed-off-by: Fridrich Å trba 

diff --git a/scp2/source/base/registryitem_base.scp 
b/scp2/source/base/registryitem_base.scp
index 0cf1782..d12ea13 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -50,13 +50,6 @@ RegistryItem 
gid_Regitem_Odb_Shellex_00021500___C000_0046
 Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_Odb_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-ModuleID = gid_Module_Prg_Base_Bin;
-Subkey = ".odb\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
 RegistryItem 
gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Prg_Base_Bin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk/window/gtksalmenu.cxx |   86 --
 1 file changed, 55 insertions(+), 31 deletions(-)

New commits:
commit dcdf415764469233b56f135827a6a2a6c3e0f2e6
Author: Antonio Fernández 
Date:   Mon Aug 27 14:38:15 2012 +0100

Radio button action data is now properly set.

Change-Id: Icbd44308631278e6ab65cef123d4d32befff87fc

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index c79bbb8..712f868 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -60,6 +60,8 @@ static void UpdateNativeMenu( GtkSalMenu* pMenu ) {
 if ( pMenu == NULL )
 return;
 
+Menu* pVCLMenu = pMenu->GetMenu();
+
 for ( sal_uInt16 i = 0; i < pMenu->GetItemCount(); i++ ) {
 GtkSalMenuItem *pSalMenuItem = pMenu->GetItemAtPos( i );
 sal_uInt16 nId = pSalMenuItem->mnId;
@@ -67,8 +69,6 @@ static void UpdateNativeMenu( GtkSalMenu* pMenu ) {
 if ( pSalMenuItem->mnType == MENUITEM_SEPARATOR )
 continue;
 
-Menu* pVCLMenu = pSalMenuItem->mpVCLMenu;
-
 String aText = pVCLMenu->GetItemText( nId );
 String aCommand = pVCLMenu->GetItemCommand( nId );
 sal_Bool itemEnabled = pVCLMenu->IsItemEnabled( nId );
@@ -169,7 +169,7 @@ rtl::OUString GetGtkKeyName( rtl::OUString keyName )
 return aGtkKeyName;
 }
 
-//GVariant* GetRadionButtonHints( GtkSalMenuItem *pSalMenuItem )
+//GVariant* GetRadioButtonHints( GtkSalMenuItem *pSalMenuItem )
 //{
 //GVariantBuilder *pBuilder;
 //GVariant *pHints;
@@ -216,6 +216,7 @@ rtl::OUString GetGtkKeyName( rtl::OUString keyName )
  * GtkSalMenu
  */
 
+// FIXME: Iterating through the whole list everytime is slow, but works. Some 
fine tuning would be required here...
 void GtkSalMenu::GetItemSectionAndPosition( unsigned nPos, unsigned 
*insertSection, unsigned *insertPos )
 {
 if ( mpVCLMenu == NULL || nPos >= mpVCLMenu->GetItemCount() )
@@ -398,7 +399,6 @@ void GtkSalMenu::SetFrame( const SalFrame* pFrame )
 gdk_x11_window_set_utf8_property ( gdkWindow, 
"_GTK_WINDOW_OBJECT_PATH", aDBusWindowPath );
 gdk_x11_window_set_utf8_property ( gdkWindow, 
"_GTK_MENUBAR_OBJECT_PATH", aDBusMenubarPath );
 
-
 g_free( aDBusPath );
 g_free( aDBusWindowPath );
 g_free( aDBusMenubarPath );
@@ -441,10 +441,26 @@ void GtkSalMenu::CheckItem( unsigned nPos, sal_Bool 
bCheck )
 return;
 
 GVariant *pCheckValue = NULL;
+gboolean bCheckedValue = ( bCheck == sal_True ) ? TRUE : FALSE;
+
+// FIXME: Why pItem->mnBits differs from GetItemBits value?
+MenuItemBits bits = pItem->mpVCLMenu->GetItemBits( pItem->mnId );
+
+if ( bits & MIB_CHECKABLE ) {
+GVariant* pState = g_action_group_get_action_state( pActionGroup, 
pItem->maCommand );
+gboolean bCurrentState = g_variant_get_boolean( pState );
 
-if ( pItem->mnBits & MIB_CHECKABLE ) {
-gboolean bCheckedValue = ( bCheck == sal_True ) ? TRUE : FALSE;
-pCheckValue = g_variant_new_boolean( bCheckedValue );
+if ( bCurrentState != bCheck )
+pCheckValue = g_variant_new_boolean( bCheckedValue );
+}
+else if ( bits & MIB_RADIOCHECK )
+{
+GVariant* pState = g_action_group_get_action_state( pActionGroup, 
pItem->maCommand );
+gchar* aCurrentState = (gchar*) g_variant_get_string( pState, NULL );
+gboolean bCurrentState = g_strcmp0( aCurrentState, "" ) != 0;
+
+if ( bCurrentState != bCheck )
+pCheckValue = (bCheckedValue) ? g_variant_new_string( 
pItem->maCommand ) : g_variant_new_string( "" );
 }
 
 if ( pCheckValue )
@@ -533,7 +549,9 @@ void GtkSalMenu::SetItemCommand( unsigned nPos, 
SalMenuItem* pSalMenuItem, const
 {
 GtkSalMenuItem* pItem = static_cast< GtkSalMenuItem* >( pSalMenuItem );
 
-if ( pItem->mnType == MENUITEM_SEPARATOR || 
pItem->mpVCLMenu->GetPopupMenu( pItem->mnId ) != NULL )
+if ( pItem->mnType == MENUITEM_SEPARATOR ||
+ pItem->mpVCLMenu->GetPopupMenu( pItem->mnId ) != NULL ||
+ aCommandStr.isEmpty() )
 return;
 
 gchar* aCommand = (gchar*) rtl::OUStringToOString( aCommandStr, 
RTL_TEXTENCODING_UTF8 ).getStr();
@@ -542,32 +560,38 @@ void GtkSalMenu::SetItemCommand( unsigned nPos, 
SalMenuItem* pSalMenuItem, const
 if ( pActionGroup == NULL )
 return;
 
-gboolean bChecked = ( pItem->mpVCLMenu->IsItemChecked( pItem->mnId ) ) ? 
TRUE : FALSE;
+GVariant *pTarget = NULL;
 
-if ( pItem->mnBits & MIB_CHECKABLE )
-{
-// Item is a checkmark button.
-GVariantType* pStateType = g_variant_type_new( (gchar*) 
G_VARIANT_TYPE_BOOLEAN );
-GVariant* pState = g_variant_new_boolean( bChecked );
+if ( g_action_group_has_action( G_ACTION_GROUP( pActionGroup ), aCommand ) 
== FALSE ) {
+gboolean bChecked = ( pItem->mpVCLMenu->IsItemChecked( pItem->mnId ) ) 
? TRUE : FALSE;
 
-g_

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - shell/inc shell/source

[Libreoffice Gerrit user]

 shell/inc/internal/zipfile.hxx  |1 
 shell/source/win32/ooofilereader/basereader.cxx |9 +++--
 shell/source/win32/zipfile/zipfile.cxx  |   38 ++--
 3 files changed, 23 insertions(+), 25 deletions(-)

New commits:
commit c828a2fe53b7dede97d9b3b69462db22fb496685
Author: Fridrich Å trba 
Date:   Mon Aug 27 16:33:13 2012 +0200

fdo#53592: Try not to crash on empty m_ZipContent

Change-Id: I9bdc9997e260a75682177c8641695b60df0c81a6
Signed-off-by: Andras Timar 

diff --git a/shell/source/win32/ooofilereader/basereader.cxx 
b/shell/source/win32/ooofilereader/basereader.cxx
index f4f694e..754d37e 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -81,9 +81,12 @@ void CBaseReader::Initialize( const std::string& ContentName)
 if (m_ZipContent.empty())
 m_ZipFile.GetUncompressedContent( ContentName, m_ZipContent );
 
-xml_parser parser;
-parser.set_document_handler(this);  // pass current reader as reader 
to the sax parser
-parser.parse(&m_ZipContent[0], m_ZipContent.size());
+if (!m_ZipContent.empty())
+{
+xml_parser parser;
+parser.set_document_handler(this);  // pass current reader as 
reader to the sax parser
+parser.parse(&m_ZipContent[0], m_ZipContent.size());
+}
 }
 catch(std::exception&
 #if OSL_DEBUG_LEVEL > 0
diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index 13b319c..381e52c 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -261,6 +261,8 @@ static bool areHeadersConsistent(const LocalFileHeader 
&header, const CentralDir
 
 static bool findCentralDirectoryEnd(StreamInterface *stream)
 {
+if (!stream)
+return false;
 stream->sseek(0, SEEK_SET);
 try
 {
@@ -483,7 +485,7 @@ void ZipFile::GetUncompressedContent(
 ContentBuffer.clear();
 return;
 }
-   (void)inflateEnd(&strm);
+(void)inflateEnd(&strm);
 }
 }
 
commit 93a65b34adb99baea96aa85b7854aec2cf071647
Author: Fridrich Å trba 
Date:   Mon Aug 27 16:01:55 2012 +0200

fdo#53533: don't seek to bogus offset

Change-Id: I27d056bdb8329dce302f2737bad5c5dc55791e74
Signed-off-by: Andras Timar 

diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 24fba65..d39db00 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -163,7 +163,6 @@ private:
 private:
 StreamInterface *m_pStream;
 bool m_bShouldFree;
-long m_iStartOffset;
 };
 
 #endif
diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index 452c17a..13b319c 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -259,9 +259,9 @@ static bool areHeadersConsistent(const LocalFileHeader 
&header, const CentralDir
 return true;
 }
 
-static bool findCentralDirectoryEnd(StreamInterface *stream, long &startOffset)
+static bool findCentralDirectoryEnd(StreamInterface *stream)
 {
-stream->sseek(startOffset, SEEK_SET);
+stream->sseek(0, SEEK_SET);
 try
 {
 while (stream->stell() != -1)
@@ -270,7 +270,6 @@ static bool findCentralDirectoryEnd(StreamInterface 
*stream, long &startOffset)
 if (signature == CDIR_END_SIG)
 {
 stream->sseek(-4, SEEK_CUR);
-startOffset = stream->stell();
 return true;
 }
 else
@@ -284,9 +283,9 @@ static bool findCentralDirectoryEnd(StreamInterface 
*stream, long &startOffset)
 return false;
 }
 
-static bool isZipStream(StreamInterface *stream, long &startOffset)
+static bool isZipStream(StreamInterface *stream)
 {
-if (!findCentralDirectoryEnd(stream, startOffset))
+if (!findCentralDirectoryEnd(stream))
 return false;
 CentralDirectoryEnd end;
 if (!readCentralDirectoryEnd(stream, end))
@@ -387,11 +386,10 @@ bool ZipFile::IsValidZipFileVersionNumber(void* /* 
stream*/)
 */
 ZipFile::ZipFile(const std::string &FileName) :
 m_pStream(0),
-m_bShouldFree(true),
-m_iStartOffset(0)
+m_bShouldFree(true)
 {
 m_pStream = new FileStream(FileName.c_str());
-if (m_pStream && !isZipStream(m_pStream, m_iStartOffset))
+if (m_pStream && !isZipStream(m_pStream))
 {
 delete m_pStream;
 m_pStream = 0;
@@ -400,10 +398,9 @@ ZipFile::ZipFile(const std::string &FileName) :
 
 ZipFile::ZipFile(StreamInterface *stream) :
 m_pStream(stream),
-m_bShouldFree(false),
-m_iStartOffset(0)
+m_bShouldFree(false)
 {
-if (!isZipStream(stream, m_iStartOffset))
+if (!isZipStream(stream))
 m_pStream = 0;
 }
 
@@ -424,15 +421,14 @@ ZipFile::~ZipFile()
 void ZipFile::GetUncompressedContent(
 const std::string &C

Re: [PATCH] java cleanup patches [IGNORE]

[Noel Grandin]

I see my previous mail made it to the mailing list, so this one can get 
ignored.


My own fault for trying to send such large cleanup patches :-)

On 2012-08-27 13:45, Noel Grandin wrote:

Hi

These patches perform some mild cleanup.

They have been tested to pass a full make check.

Regards, Noel Grandin

Disclaimer: http://www.peralex.com/disclaimer.html




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



Disclaimer: http://www.peralex.com/disclaimer.html


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: scp2/source

[Libreoffice Gerrit user]

 scp2/source/base/registryitem_base.scp |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 0f33979fc875abe827b42d35ac4fc4304e4a4d7b
Author: Andras Timar 
Date:   Mon Aug 27 16:42:32 2012 +0200

.odb files do not have thumbnail image (related: fdo#53592)

Change-Id: Ib17bb0a2fc95207da69bfef11b2fab59aefa719d

diff --git a/scp2/source/base/registryitem_base.scp 
b/scp2/source/base/registryitem_base.scp
index 0cf1782..d12ea13 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -50,13 +50,6 @@ RegistryItem 
gid_Regitem_Odb_Shellex_00021500___C000_0046
 Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_Odb_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
-ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-ModuleID = gid_Module_Prg_Base_Bin;
-Subkey = ".odb\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
-Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
 RegistryItem 
gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Prg_Base_Bin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW-3-6] fix for fdo#53979, fdo#54018, crash when sorting range with comment and another problem around comments

[Kohei Yoshida]

On 08/26/2012 02:35 PM, Markus Mohrhard wrote:

Hey,

the attached patch fixes two problems around sorting a range with
comments. The first thing is that it fixes the crash in the two bug
reports because the comments were inserted in the wrong place. I also
noted that the current code sorts comments in the same col/row even if
they are not in the selected range.


Yup, the change looks good.  Pushed to 3-6 with my sign-off.


P.S. Please also push to master. I have no internet connection ATM
when I use Linux so I can't push myself.


Pushed to master as well.  Thanks a lot!

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/table3.cxx |   49 +
 1 file changed, 30 insertions(+), 19 deletions(-)

New commits:
commit 2c1d36c575399fcd8743cfe3b96e107e821cbe65
Author: Markus Mohrhard 
Date:   Sun Aug 26 14:04:37 2012 +0200

when swaping cols or rows insert notes at the right place, fdo#53979

Change-Id: I1228b3a064623e810265b47776e33f81f4bf0e51
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ea49b05..15087c5 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -563,7 +563,9 @@ void ScTable::QuickSort( ScSortInfoArray* pArray, SCsCOLROW 
nLo, SCsCOLROW nHi )
 
 void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 {
-for (SCROW nRow = aSortParam.nRow1; nRow <= aSortParam.nRow2; nRow++)
+SCROW nRowStart = aSortParam.nRow1;
+SCROW nRowEnd = aSortParam.nRow2;
+for (SCROW nRow = nRowStart; nRow <= nRowEnd; nRow++)
 {
 aCol[nCol1].SwapCell(nRow, aCol[nCol2]);
 if (aSortParam.bIncludePattern)
@@ -589,16 +591,19 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 ScPostIt* pPostIt = itr->second;
 ++itr;
 
-if (nCol == nCol1)
+if(nRow >= nRowStart && nRow <= nRowEnd)
 {
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol2, nRow);
-}
-else if (nCol == nCol2)
-{
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol1, nRow);
+if (nCol == nCol1)
+{
+aNoteMap.insert(nCol2, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else if (nCol == nCol2)
+{
+aNoteMap.insert(nCol1, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
 
+}
 }
 }
 
@@ -609,6 +614,7 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 SCCOL nCol = itr->first.first;
 SCROW nRow = itr->first.second;
 ScPostIt* pPostIt = itr->second;
+++itr;
 
 maNotes.insert(nCol, nRow, pPostIt);
 aNoteMap.ReleaseNote(nCol, nRow);
@@ -617,7 +623,9 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 
 void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 {
-for (SCCOL nCol = aSortParam.nCol1; nCol <= aSortParam.nCol2; nCol++)
+SCCOL nColStart = aSortParam.nCol1;
+SCCOL nColEnd = aSortParam.nCol2;
+for (SCCOL nCol = nColStart; nCol <= nColEnd; nCol++)
 {
 aCol[nCol].SwapRow(nRow1, nRow2);
 if (aSortParam.bIncludePattern)
@@ -655,16 +663,18 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 ScPostIt* pPostIt = itr->second;
 ++itr;
 
-if (nRow == nRow1)
+if( nCol >= nColStart && nCol <= nColEnd )
 {
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow2);
-}
-else if (nRow == nRow2)
-{
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow1);
-
+if (nRow == nRow1)
+{
+aNoteMap.insert(nCol, nRow2, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else if (nRow == nRow2)
+{
+aNoteMap.insert(nCol, nRow1, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
 }
 }
 
@@ -675,6 +685,7 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 SCCOL nCol = itr->first.first;
 SCROW nRow = itr->first.second;
 ScPostIt* pPostIt = itr->second;
+++itr;
 
 maNotes.insert(nCol, nRow, pPostIt);
 aNoteMap.ReleaseNote(nCol, nRow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/table3.cxx |   49 ++---
 sc/source/ui/optdlg/tpdefaults.cxx |2 -
 2 files changed, 31 insertions(+), 20 deletions(-)

New commits:
commit 1b0a7dc8b787b7be31b1b58a5ea6a9fc7207996d
Author: Markus Mohrhard 
Date:   Sun Aug 26 14:04:37 2012 +0200

when swaping cols or rows insert notes at the right place, fdo#53979

Change-Id: I1228b3a064623e810265b47776e33f81f4bf0e51

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ef7b3b6..1ea61fb 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -563,7 +563,9 @@ void ScTable::QuickSort( ScSortInfoArray* pArray, SCsCOLROW 
nLo, SCsCOLROW nHi )
 
 void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 {
-for (SCROW nRow = aSortParam.nRow1; nRow <= aSortParam.nRow2; nRow++)
+SCROW nRowStart = aSortParam.nRow1;
+SCROW nRowEnd = aSortParam.nRow2;
+for (SCROW nRow = nRowStart; nRow <= nRowEnd; nRow++)
 {
 aCol[nCol1].SwapCell(nRow, aCol[nCol2]);
 if (aSortParam.bIncludePattern)
@@ -589,16 +591,19 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 ScPostIt* pPostIt = itr->second;
 ++itr;
 
-if (nCol == nCol1)
+if(nRow >= nRowStart && nRow <= nRowEnd)
 {
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol2, nRow);
-}
-else if (nCol == nCol2)
-{
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol1, nRow);
+if (nCol == nCol1)
+{
+aNoteMap.insert(nCol2, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else if (nCol == nCol2)
+{
+aNoteMap.insert(nCol1, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
 
+}
 }
 }
 
@@ -609,6 +614,7 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 SCCOL nCol = itr->first.first;
 SCROW nRow = itr->first.second;
 ScPostIt* pPostIt = itr->second;
+++itr;
 
 maNotes.insert(nCol, nRow, pPostIt);
 aNoteMap.ReleaseNote(nCol, nRow);
@@ -617,7 +623,9 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
 
 void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 {
-for (SCCOL nCol = aSortParam.nCol1; nCol <= aSortParam.nCol2; nCol++)
+SCCOL nColStart = aSortParam.nCol1;
+SCCOL nColEnd = aSortParam.nCol2;
+for (SCCOL nCol = nColStart; nCol <= nColEnd; nCol++)
 {
 aCol[nCol].SwapRow(nRow1, nRow2);
 if (aSortParam.bIncludePattern)
@@ -655,16 +663,18 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 ScPostIt* pPostIt = itr->second;
 ++itr;
 
-if (nRow == nRow1)
+if( nCol >= nColStart && nCol <= nColEnd )
 {
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow2);
-}
-else if (nRow == nRow2)
-{
-aNoteMap.insert(nCol, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow1);
-
+if (nRow == nRow1)
+{
+aNoteMap.insert(nCol, nRow2, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else if (nRow == nRow2)
+{
+aNoteMap.insert(nCol, nRow1, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
 }
 }
 
@@ -675,6 +685,7 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
 SCCOL nCol = itr->first.first;
 SCROW nRow = itr->first.second;
 ScPostIt* pPostIt = itr->second;
+++itr;
 
 maNotes.insert(nCol, nRow, pPostIt);
 aNoteMap.ReleaseNote(nCol, nRow);
commit 4d3ad7c59e0d0fe322c76eb4335440e1d1269ac0
Author: Kohei Yoshida 
Date:   Mon Aug 27 09:58:27 2012 -0400

Quick indentation fix on closing brace.

Change-Id: I8626b0b3338e17b1b0fc713d4dba5545e1faba1c

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index c0db2c1..5020b9c 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -65,7 +65,7 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet &rCor
 aEdNSheets.SetPosPixel( aNewPoint );
 aNewPoint.Y() = aEdSheetPrefix.GetPosPixel().Y();
 aEdSheetPrefix.SetPosPixel( aNewPoint );
-   }
+}
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 aEdSheetPrefix.SetModifyHdl( LINK(this, ScTpDefaultsOptions, 
PrefixModifiedHdl) );
 aEdSheetPrefix.SetGetFocusHdl( LINK(this, ScTpDefaultsOptions, 
PrefixEditOnFocusHdl) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/data/n775899.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   29 +
 2 files changed, 29 insertions(+)

New commits:
commit 0898871b7b9492ada947ebc7b8429c5cb56db23c
Author: Miklos Vajna 
Date:   Mon Aug 27 16:28:02 2012 +0200

n#775899 testcase

Change-Id: I68e477464139b183b802cc3200a3b980d1ee72f3

diff --git a/sw/qa/extras/ooxmlimport/data/n775899.docx 
b/sw/qa/extras/ooxmlimport/data/n775899.docx
new file mode 100644
index 000..754e3e1
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n775899.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f82aaa3..e61f123 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,6 +85,7 @@ public:
 void testBnc773061();
 void testAllGapsWord();
 void testN775906();
+void testN775899();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -112,6 +114,7 @@ public:
 CPPUNIT_TEST(testBnc773061);
 CPPUNIT_TEST(testAllGapsWord);
 CPPUNIT_TEST(testN775906);
+CPPUNIT_TEST(testN775899);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -736,6 +739,32 @@ void Test::testN775906()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1905), 
getProperty(getParagraph(1), "ParaLeftMargin"));
 }
 
+void Test::testN775899()
+{
+/*
+ * The problem was that a floating table wasn't imported as a frame, then 
it contained fake paragraphs.
+ *
+ * ThisComponent.TextFrames.Count ' was 0
+ * oParas = ThisComponent.TextFrames(0).Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oPara.supportsService("com.sun.star.text.TextTable") 'was a fake 
paragraph
+ * oParas.hasMoreElements 'was true
+ */
+load("n775899.docx");
+
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+uno::Reference xFrame(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xFrame->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xServiceInfo(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_True, 
xServiceInfo->supportsService("com.sun.star.text.TextTable"));
+
+CPPUNIT_ASSERT_EQUAL(sal_False, xParaEnum->hasMoreElements());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: shell/source

[Libreoffice Gerrit user]

 shell/source/win32/ooofilereader/basereader.cxx |9 ++---
 shell/source/win32/zipfile/zipfile.cxx  |4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 40c85b88ad0351acaf59fd2372676cdb8ca452d6
Author: Fridrich Å trba 
Date:   Mon Aug 27 16:33:13 2012 +0200

fdo#53592: Try not to crash on empty m_ZipContent

Change-Id: I9bdc9997e260a75682177c8641695b60df0c81a6

diff --git a/shell/source/win32/ooofilereader/basereader.cxx 
b/shell/source/win32/ooofilereader/basereader.cxx
index f4f694e..754d37e 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -81,9 +81,12 @@ void CBaseReader::Initialize( const std::string& ContentName)
 if (m_ZipContent.empty())
 m_ZipFile.GetUncompressedContent( ContentName, m_ZipContent );
 
-xml_parser parser;
-parser.set_document_handler(this);  // pass current reader as reader 
to the sax parser
-parser.parse(&m_ZipContent[0], m_ZipContent.size());
+if (!m_ZipContent.empty())
+{
+xml_parser parser;
+parser.set_document_handler(this);  // pass current reader as 
reader to the sax parser
+parser.parse(&m_ZipContent[0], m_ZipContent.size());
+}
 }
 catch(std::exception&
 #if OSL_DEBUG_LEVEL > 0
diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index 13b319c..381e52c 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -261,6 +261,8 @@ static bool areHeadersConsistent(const LocalFileHeader 
&header, const CentralDir
 
 static bool findCentralDirectoryEnd(StreamInterface *stream)
 {
+if (!stream)
+return false;
 stream->sseek(0, SEEK_SET);
 try
 {
@@ -483,7 +485,7 @@ void ZipFile::GetUncompressedContent(
 ContentBuffer.clear();
 return;
 }
-   (void)inflateEnd(&strm);
+(void)inflateEnd(&strm);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: PATCH (tweaking the "fill in character" support in Calc Number Format Strings)

[Johann Messner]

hi Noel,

prologue:

 "All my contributions, past and future, to LibreOffice are licensed 
  under the terms of the MPL / LGPLv3+. "


Am Mo, 27.Aug.12, KW35 (15:54:57 Uhr) schrieb Noel Power :

> So, in summary the changes are


> b) in cellform.cxx let cells with type CELLTYPE_STRING apply the format 
> with the repeating code also. Hmmm now I did see this previously but I 
> didn't see why the a string type cell would need to apply the numeric 
> format, so I left it out, I presume this change is necessary for some 
> types of non numberic cell content, I would guess maybe dates or 
> something? is that correct ? ( or if not I'd be interested in the 
> scenario that requires it )
According to the related ODF Specification (or is it an extension?) all 
of the cell types (including Number, Date, Text, user defined, and so on) 
should support the "fill in character" format specifier ... 
[pls see https://tools.oasis-open.org/issues/browse/OFFICE-3765 ]

> c) same as above except for CELLTYPE_FORMULA, so yes, this was oversight 
> by me, formulas can have numeric results for sure that could use the 
> repeating character format support so that part is needed. I guess the 
> change to the format for the else leg of the 'if ( pFCell->IsValue() )' 
> test probably has some similar rational as in the string case.
Yes, you are absolutely right. 

> d) some additional checks to prevent potential div/0 which are fine
OK 

> 
> e) the new built-in formats, Eike are they ok for you? if they are I 
> also not sure what ( if any ) additional effort is required to 
> internationalise those formats :/
> 
> ps. did you already state you licence intentions for your patches, the 
> usual is to post some blanket statement
> 
>  "All my contributions, past and future, to LibreOffice are licensed 
> under the terms of the MPL / LGPLv3+. "
> 
> to the list, if you haven't done so already would/could you do that please,
... of course (please see the prologue of this eMail)

> 
> thanks again
> Noel

Now, I am wound up to a high pitch ... I am looking forward to a binary LO
release in the future featuring the "fill in character" Cell format 
specifier ;-)))

Many thanks to all of you in the LibreOffice Project for the good
work (..insbesondere gilt Eike Rathke bzw. den Leuten vom 
=STARCALCTEAM()
unsere Anerkennung und unser aller Dank!!)

best regards,
hans


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW-3-6][PUSHED 3-6] adjustment of Calc default options dialog

[Kohei Yoshida]

PUSHED 3-6
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW-3-6] adjustment of Calc default options dialog

[Kohei Yoshida]

On 08/25/2012 01:17 PM, Jean-Baptiste Faure wrote:

Hi,

Please consider backporting to LibreOffice 3.6 this patch
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=f92fcff04a6a88fd004e721294a4817249cabf26


Cherry-picked with my sign-off.  Thanks a lot.

Kohei

--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/optdlg/tpdefaults.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 530a899b1399f0aa192cc8eebaed36ca6613b3eb
Author: Jean-Baptiste FAURE 
Date:   Tue Aug 21 22:15:32 2012 +0200

The label size is computed from the length of the string it contains

Change-Id: I586a31a5d563ea8a11282836ca1d54b0c8be1bf4

Signed-off-by: Arnaud Versini 
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index b67e87b..c0db2c1 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -48,16 +48,23 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet &rCor
 {
 FreeResource();
 
-long nTxtW = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
-long nCtrlW = aFtNSheets.GetSizePixel().Width();
-if ( nTxtW >= nCtrlW )
+// the following computation must be modified accordingly if a third line 
is added to this dialog
+long nTxtW1 = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
+long nCtrlW1 = aFtNSheets.GetSizePixel().Width();
+long nTxtW2 = aFtSheetPrefix.GetCtrlTextWidth(aFtSheetPrefix.GetText() );
+long nCtrlW2 = aFtSheetPrefix.GetSizePixel().Width();
+if ( nTxtW1 >= nCtrlW1 || nTxtW2 >= nCtrlW2)
 {
+long nTxtW = std::max(nTxtW1,nTxtW2);
 Size aNewSize = aFtNSheets.GetSizePixel();
-aNewSize.Width() += ( nTxtW - nCtrlW );
+aNewSize.Width() = nTxtW;
 aFtNSheets.SetSizePixel( aNewSize );
+aFtSheetPrefix.SetSizePixel( aNewSize );
 Point aNewPoint = aEdNSheets.GetPosPixel();
-aNewPoint.X() += ( nTxtW - nCtrlW );
+aNewPoint.X() += (nTxtW - nCtrlW1);
 aEdNSheets.SetPosPixel( aNewPoint );
+aNewPoint.Y() = aEdSheetPrefix.GetPosPixel().Y();
+aEdSheetPrefix.SetPosPixel( aNewPoint );
}
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 aEdSheetPrefix.SetModifyHdl( LINK(this, ScTpDefaultsOptions, 
PrefixModifiedHdl) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 shell/inc/internal/zipfile.hxx |1 
 shell/source/win32/zipfile/zipfile.cxx |   34 +
 2 files changed, 14 insertions(+), 21 deletions(-)

New commits:
commit d3300205918f87054c9dd399ac53ad1e979dcdc7
Author: Fridrich Å trba 
Date:   Mon Aug 27 16:01:55 2012 +0200

fdo#53533: don't seek to bogus offset

Change-Id: I27d056bdb8329dce302f2737bad5c5dc55791e74

diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index aaf3c6c..dd786cc 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -162,7 +162,6 @@ private:
 private:
 StreamInterface *m_pStream;
 bool m_bShouldFree;
-long m_iStartOffset;
 };
 
 #endif
diff --git a/shell/source/win32/zipfile/zipfile.cxx 
b/shell/source/win32/zipfile/zipfile.cxx
index 452c17a..13b319c 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -259,9 +259,9 @@ static bool areHeadersConsistent(const LocalFileHeader 
&header, const CentralDir
 return true;
 }
 
-static bool findCentralDirectoryEnd(StreamInterface *stream, long &startOffset)
+static bool findCentralDirectoryEnd(StreamInterface *stream)
 {
-stream->sseek(startOffset, SEEK_SET);
+stream->sseek(0, SEEK_SET);
 try
 {
 while (stream->stell() != -1)
@@ -270,7 +270,6 @@ static bool findCentralDirectoryEnd(StreamInterface 
*stream, long &startOffset)
 if (signature == CDIR_END_SIG)
 {
 stream->sseek(-4, SEEK_CUR);
-startOffset = stream->stell();
 return true;
 }
 else
@@ -284,9 +283,9 @@ static bool findCentralDirectoryEnd(StreamInterface 
*stream, long &startOffset)
 return false;
 }
 
-static bool isZipStream(StreamInterface *stream, long &startOffset)
+static bool isZipStream(StreamInterface *stream)
 {
-if (!findCentralDirectoryEnd(stream, startOffset))
+if (!findCentralDirectoryEnd(stream))
 return false;
 CentralDirectoryEnd end;
 if (!readCentralDirectoryEnd(stream, end))
@@ -387,11 +386,10 @@ bool ZipFile::IsValidZipFileVersionNumber(void* /* 
stream*/)
 */
 ZipFile::ZipFile(const std::string &FileName) :
 m_pStream(0),
-m_bShouldFree(true),
-m_iStartOffset(0)
+m_bShouldFree(true)
 {
 m_pStream = new FileStream(FileName.c_str());
-if (m_pStream && !isZipStream(m_pStream, m_iStartOffset))
+if (m_pStream && !isZipStream(m_pStream))
 {
 delete m_pStream;
 m_pStream = 0;
@@ -400,10 +398,9 @@ ZipFile::ZipFile(const std::string &FileName) :
 
 ZipFile::ZipFile(StreamInterface *stream) :
 m_pStream(stream),
-m_bShouldFree(false),
-m_iStartOffset(0)
+m_bShouldFree(false)
 {
-if (!isZipStream(stream, m_iStartOffset))
+if (!isZipStream(stream))
 m_pStream = 0;
 }
 
@@ -424,15 +421,14 @@ ZipFile::~ZipFile()
 void ZipFile::GetUncompressedContent(
 const std::string &ContentName, /*inout*/ ZipContentBuffer_t 
&ContentBuffer)
 {
-long startOffset = m_iStartOffset;
-if (!findCentralDirectoryEnd(m_pStream, startOffset))
+if (!findCentralDirectoryEnd(m_pStream))
 return;
 CentralDirectoryEnd end;
 if (!readCentralDirectoryEnd(m_pStream, end))
 return;
 m_pStream->sseek(end.cdir_offset, SEEK_SET);
 CentralDirectoryEntry entry;
-while (m_pStream->stell() != -1 && m_pStream->stell() < startOffset && 
(unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
+while (m_pStream->stell() != -1 && (unsigned long)m_pStream->stell() < 
end.cdir_offset + end.cdir_size)
 {
 if (!readCentralDirectoryEntry(m_pStream, entry))
 return;
@@ -497,15 +493,14 @@ void ZipFile::GetUncompressedContent(
 ZipFile::DirectoryPtr_t ZipFile::GetDirectory() const
 {
 DirectoryPtr_t dir(new Directory_t());
-long startOffset = m_iStartOffset;
-if (!findCentralDirectoryEnd(m_pStream, startOffset))
+if (!findCentralDirectoryEnd(m_pStream))
 return dir;
 CentralDirectoryEnd end;
 if (!readCentralDirectoryEnd(m_pStream, end))
 return dir;
 m_pStream->sseek(end.cdir_offset, SEEK_SET);
 CentralDirectoryEntry entry;
-while (m_pStream->stell() != -1 && m_pStream->stell() < startOffset && 
(unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
+while (m_pStream->stell() != -1 && (unsigned long)m_pStream->stell() < 
end.cdir_offset + end.cdir_size)
 {
 if (!readCentralDirectoryEntry(m_pStream, entry))
 return dir;
@@ -537,15 +532,14 @@ bool ZipFile::HasContent(const std::string &ContentName) 
const
 long ZipFile::GetFileLongestFileNameLength() const
 {
 long lmax = 0;
-long startOffset = m_iStartOffset;
-if (!findCentralDirectoryEnd(m_pStream, startOffset))
+if (!findCentralDirectoryEnd(m_pStream))
 return lmax;
 CentralDirectoryEnd end;
 if (!readCentralDirectoryEnd(m_p

Re: PATCH (tweaking the "fill in character" support in Calc Number Format Strings)

[Noel Power]

Hi
On 26/08/12 21:47, Johann Messner wrote:

Hello Noel,
[dear valued libreoffice developers and hackers],

please check out on

https://linux.jku.at/messner/LibreOffice/

the patch file

patchInfo-26-Aug-2012__against_libreoffice_Master.txt
thank you for making those changes against master, I appreciate it, it 
is much easier to see the changes now, I cc. Eike here who also has ( I 
hope ) also some interest in your patch ( but more importantly knows 
stuff )


it proposes some codes adaptions in order to tweak
the fill in character support in Calc's Cell Formtat Strings as
introduced in  
http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/28410ose
 changes too :-)


So, in summary the changes are

a) to change the how the formatter marks the repeating character, it 
looks like now 0x1b is 'before' the char to repeat, previously it was 
after ( makes more sense to me to have the marker preceding the repeat 
char )
Eike, was there any reason for the original scheme that you recall or 
any objections to changing


b) in cellform.cxx let cells with type CELLTYPE_STRING apply the format 
with the repeating code also. Hmmm now I did see this previously but I 
didn't see why the a string type cell would need to apply the numeric 
format, so I left it out, I presume this change is necessary for some 
types of non numberic cell content, I would guess maybe dates or 
something? is that correct ? ( or if not I'd be interested in the 
scenario that requires it )


c) same as above except for CELLTYPE_FORMULA, so yes, this was oversight 
by me, formulas can have numeric results for sure that could use the 
repeating character format support so that part is needed. I guess the 
change to the format for the else leg of the 'if ( pFCell->IsValue() )' 
test probably has some similar rational as in the string case.


d) some additional checks to prevent potential div/0 which are fine

e) the new built-in formats, Eike are they ok for you? if they are I 
also not sure what ( if any ) additional effort is required to 
internationalise those formats :/


ps. did you already state you licence intentions for your patches, the 
usual is to post some blanket statement


 "All my contributions, past and future, to LibreOffice are licensed 
under the terms of the MPL / LGPLv3+. "


to the list, if you haven't done so already would/could you do that please,

thanks again
Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License Statement

[Marco Biscaro]

Hello all,

All of my past & future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.

Best regards,

Marco Biscaro
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#39468: Translated German comments in sc/source/core/inc

[Philipp Riemer]

2012/8/27 oger000 :
> Hi
>
> Some translations of german comments.
>
> Its my first patch to LO so something may be missing?
>
>
> gerhard

Hey Gerhard,

I fixed your patch and applied the changes. However, the files that
you translated are in a part of the code that was not rebased yet. As
a result, I uploaded the changes to the Gerrit code-review tool so
that someone involved in this rebasing-process can have a look on
them. You can find the patch set at
.

Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

fixed method header indentation in sc/source/ui/undo

[Gerrit]

>From Philipp Riemer :

Philipp Riemer has abandoned this change.

Change subject: fixed method header indentation in sc/source/ui/undo
..


Patch Set 1: Abandoned

Even if this code looks wrong in my eyes...if the master says no, the 
apprentice follows the order.

--
To view, visit https://gerrit.libreoffice.org/487
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I24eb3f141d9c741b490f2d3d94d35dd771712b6f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer 
Gerrit-Reviewer: Kohei Yoshida 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Cleanup files touched by f53466bb4055e56e4f4ce488aa2cac32753...

[Gerrit]

>From Philipp Riemer :

Philipp Riemer has uploaded a new change for review.

Change subject: Cleanup files touched by 
f53466bb4055e56e4f4ce488aa2cac32753af85d
..

Cleanup files touched by f53466bb4055e56e4f4ce488aa2cac32753af85d

I am not sure if these "functions in ..." in interpre.hxx are
needed or if they can be deleted at all.

This patch set is submitted to Gerrit since the files touched are
not rebased yet.

Change-Id: I00c2ccb0be18bb574b2494b035b48c6f37128c72
---
M sc/source/core/inc/adiasync.hxx
M sc/source/core/inc/ddelink.hxx
M sc/source/core/inc/interpre.hxx
3 files changed, 11 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/494/1
--
To view, visit https://gerrit.libreoffice.org/494
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00c2ccb0be18bb574b2494b035b48c6f37128c72
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#39468: Translated German comments in sc/source/core/inc

[Gerrit]

>From Philipp Riemer :

Philipp Riemer has uploaded a new change for review.

Change subject: fdo#39468: Translated German comments in sc/source/core/inc
..

fdo#39468: Translated German comments in sc/source/core/inc

Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Reviewed-by: Philipp Riemer 
---
M sc/source/core/inc/adiasync.hxx
M sc/source/core/inc/ddelink.hxx
M sc/source/core/inc/interpre.hxx
3 files changed, 30 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/493/1
--
To view, visit https://gerrit.libreoffice.org/493
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81b7330bf3178b539855f73aac25539013a2bd90
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Bug 38840 - Adding coverage analysis to unit tests

[Bjoern Michaelsen]

Hi,

On Mon, Aug 27, 2012 at 12:47:37PM +0200, John Smith wrote:
> Well at the moment there may not be a lot of testcases. But I get the
> impression that the whole reason for adding test coverage in the 1st
> place, is that (much) more tests are intended to be added in the
> future for covering the code that isnt tested yet ? And if that is the
> case, wouldnt it make more sense to cleanly separate 'building your
> project' and 'testing your project' ? I dont get the impression that
> everyone that compiles the code will be interested in all checks being
> executed, especially once there are more tests. For the future, it
> might make more sense if 'make build' (or something similar) only
> compiles the code without running the tests, and that the tests only
> get executed if 'make check' is run ?

We already have enough separation there: unittests, slowtests and
subsequentchecks are all triggered as needed and when it makes sense.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +++
 writerfilter/source/dmapper/SettingsTable.cxx |   10 ++
 writerfilter/source/dmapper/SettingsTable.hxx |2 ++
 writerfilter/source/filter/ImportFilter.cxx   |2 --
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 93cdd851ee5917fa95e78d84734c73055b0edc4e
Author: Miklos Vajna 
Date:   Mon Aug 27 14:06:12 2012 +0200

n#775899 docx import of w:usePrinterMetrics compat option

This was set unconditionally, but it turns out it's not the default for
docx, it's triggered by a compat flag there as well.

Change-Id: I84dccfe7ffd49fbc6878b19ff4276f8a36b827a3

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 18e8c45..bc0871c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3663,6 +3664,12 @@ void DomainMapper_Impl::ApplySettingsTable()
 uno::Reference 
xViewDataSupplier(m_xTextDocument, uno::UNO_QUERY);
 xViewDataSupplier->setViewData(xIndexAccess);
 }
+
+if (m_pSettingsTable->GetUsePrinterMetrics())
+{
+uno::Reference< beans::XPropertySet > 
xSettings(m_xTextFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+xSettings->setPropertyValue("PrinterIndependentLayout", 
uno::makeAny(document::PrinterIndependentLayout::DISABLED));
+}
 }
 catch(const uno::Exception&)
 {
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx 
b/writerfilter/source/dmapper/SettingsTable.cxx
index c2dc342..c28b45b 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -68,6 +68,7 @@ struct SettingsTable_Impl
 boolm_bLinkStyles;
 sal_Int16   m_nZoomFactor;
 boolm_bEvenAndOddHeaders;
+boolm_bUsePrinterMetrics;
 
 SettingsTable_Impl( DomainMapper& rDMapper, const uno::Reference< 
lang::XMultiServiceFactory > xTextFactory ) :
 m_rDMapper( rDMapper )
@@ -87,6 +88,7 @@ struct SettingsTable_Impl
 , m_bLinkStyles(false)
 , m_nZoomFactor(0)
 , m_bEvenAndOddHeaders(false)
+, m_bUsePrinterMetrics(false)
 {}
 
 };
@@ -194,6 +196,9 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
 resolveSprmProps(*this, rSprm);
 }
 break;
+case NS_ooxml::LN_CT_Compat_usePrinterMetrics:
+m_pImpl->m_bUsePrinterMetrics = nIntValue;
+break;
 default:
 {
 #ifdef DEBUG_DMAPPER_SETTINGS_TABLE
@@ -226,6 +231,11 @@ sal_Int16 SettingsTable::GetZoomFactor() const
 return m_pImpl->m_nZoomFactor;
 }
 
+bool SettingsTable::GetUsePrinterMetrics() const
+{
+return m_pImpl->m_bUsePrinterMetrics;
+}
+
 bool SettingsTable::GetEvenAndOddHeaders() const
 {
 return m_pImpl->m_bEvenAndOddHeaders;
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx 
b/writerfilter/source/dmapper/SettingsTable.hxx
index 965636b..6c30f37 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -63,6 +63,8 @@ class WRITERFILTER_DLLPRIVATE SettingsTable : public 
LoggedProperties, public Lo
 
 bool GetEvenAndOddHeaders() const;
 
+bool GetUsePrinterMetrics() const;
+
 void ApplyProperties( uno::Reference< text::XTextDocument > xDoc );
 
  private:
diff --git a/writerfilter/source/filter/ImportFilter.cxx 
b/writerfilter/source/filter/ImportFilter.cxx
index e51bd96..8e60b56 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -179,7 +178,6 @@ void WriterFilter::setTargetDocument( const uno::Reference< 
lang::XComponent >&
xSettings->setPropertyValue( "StylesNoDefault", uno::makeAny( sal_True ) );
 
xSettings->setPropertyValue("FloattableNomargins", uno::makeAny( sal_True 
));
-   xSettings->setPropertyValue("PrinterIndependentLayout", 
uno::makeAny(document::PrinterIndependentLayout::DISABLED));
 }
 
 void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent 
>& xDoc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 8 commits - clucene/configs clucene/patches clucene/UnpackedTarball_clucene.mk config_host.mk.in configure.in icu/icu4c-bsd.patch icu/icu4c-interlck.patch icu/makefile.mk sal/

[Libreoffice Gerrit user]

 clucene/UnpackedTarball_clucene.mk|9 +
 clucene/configs/clucene-config-GCC-atomic.h   |  148 ++
 clucene/configs/clucene-config-MINGW-atomic.h |  148 ++
 clucene/configs/clucene-config-generic.h  |2 
 clucene/patches/clucene-gcc-atomics.patch |   31 -
 config_host.mk.in |1 
 configure.in  |   27 
 icu/icu4c-bsd.patch   |   22 +++
 icu/icu4c-interlck.patch  |   11 -
 icu/makefile.mk   |8 +
 sal/osl/unx/interlck.c|   24 ++--
 solenv/gbuild/platform/com_GCC_defs.mk|6 +
 12 files changed, 376 insertions(+), 61 deletions(-)

New commits:
commit c4ab4d3b2aa01f37bc38485fdee9ed59c68cb770
Author: Jung-uk Kim 
Date:   Mon Aug 27 13:26:27 2012 +0200

fdo#53894: Fix ICU version check

Change-Id: I980401f886a6f95d35744b059706aca932af28a7

diff --git a/configure.in b/configure.in
index 43de70b..db28504 100644
--- a/configure.in
+++ b/configure.in
@@ -8234,12 +8234,12 @@ You can use --with-system-icu-for-build=force to use it 
anyway.])
 if test -z "$SYSTEM_GENCMN"; then
 AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu 
development tool \'gencmn\'])
 fi
-if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge 
"4"; then
+if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" 
-ge "4" \); then
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
 else
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO"
 fi
-if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge 
"9"; then
+if test "$ICU_MAJOR" -ge "49"; then
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
 else
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO"
commit c89dab21ea72cf6ce9f831678da251fd6e24341c
Author: Jung-uk Kim 
Date:   Mon Aug 27 13:19:25 2012 +0200

fdo#53893: Undefine U_TIMEZONE for BSDs (except for NetBSD)

FreeBSD and other BSDs (except for NetBSD) must not define U_TIMEZONE.  This
patch is obtained from upstream:

http://bugs.icu-project.org/trac/changeset?reponame=&new=31780

Change-Id: Id1b85b9958036230045c3e13eb4b6617e6bdc924

diff --git a/icu/icu4c-bsd.patch b/icu/icu4c-bsd.patch
new file mode 100644
index 000..78f8ca2
--- /dev/null
+++ b/icu/icu4c-bsd.patch
@@ -0,0 +1,22 @@
+--- misc/icu/source/common/putilimp.h  2012-06-01 10:52:52.0 -0400
 misc/build/icu/source/common/putilimp.h2012-08-21 13:32:58.0 
-0400
+@@ -117,6 +117,8 @@
+ #   define U_TIMEZONE __timezone
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
+ #   define U_TIMEZONE _timezone
++#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__)
++   /* not defined */
+ #elif U_PLATFORM == U_PF_OS400
+/* not defined */
+ #else
+--- misc/icu/source/common/unicode/platform.h  2012-08-21 16:53:20.957449000 
-0400
 misc/build/icu/source/common/unicode/platform.h2012-08-21 
17:02:16.0 -0400
+@@ -131,7 +131,7 @@
+ #   include 
+ #elif defined(linux) || defined(__linux__) || defined(__linux)
+ #   define U_PLATFORM U_PF_LINUX
+-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || 
defined(__NetBSD__) || defined(__OpenBSD__)
+ #   define U_PLATFORM U_PF_BSD
+ #elif defined(sun) || defined(__sun)
+ /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from 
SunOS? */
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 7b990ab..aaace59 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -49,6 +49,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31
 
 PATCH_FILES=\
+icu4c-bsd.patch \
 icu4c-build.patch \
 icu4c.8320.freeserif.crash.patch \
 icu4c.8198.revert.icu5431.patch \
commit 38e0a58ce11125d20ef1f8aed7996518d7ddbb38
Author: Jung-uk Kim 
Date:   Mon Aug 27 13:11:21 2012 +0200

fdo#53857: Assume --strip-components is always available for bsdtar

Change-Id: Ic05c0cb9ac2c20788870069939d6708214ea0cda

diff --git a/configure.in b/configure.in
index b72029a..43de70b 100644
--- a/configure.in
+++ b/configure.in
@@ -2221,7 +2221,7 @@ fi
 AC_SUBST(GNUTAR)
 
 AC_MSG_CHECKING([for tar's option to strip components])
-$GNUTAR --help 2> /dev/null | egrep "strip-components" 2>&1 >/dev/null
+$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null
 if test $? -eq 0; then
 STRIP_COMPONENTS="--strip-components"
 else
commit 6e7baaaba85b0d6cd86e959f9af229a0d30c01f8
Author: Jung-uk Kim 
Date:   Mon Aug 27 12:02:53 2012 +0200

fdo#53855: Use the newly added HAVE_GCC_BUILTIN_ATOMIC for icu

Signed-off-by: Stephan Bergmann :
* pass -DU_HAVE_GCC_ATOMICS=1 in when applicable on MINGW, too

C

Re: [PUSHED] Modified the wording of the Save-on-Exit-Dialog

[Andras Timar]

2012/8/27 Samuel Mehrbrodt :
> Hi Bjoern,
>
> Thanks for pushing.
>
> How are translations handled? I introduced a new string, and modified an two
> existing ones. How do translators know that they need to update the
> translations?

Don't worry, they'll now in time (when we start to translate
LibreOffice 3.7). It would be nearly impossible to track UI changes
manually. L10ntools do the job.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Modified the wording of the Save-on-Exit-Dialog

[Samuel Mehrbrodt]

Hi Bjoern,

Thanks for pushing.

How are translations handled? I introduced a new string, and modified an 
two existing ones. How do translators know that they need to update the 
translations?


Samuel

Am 27.08.2012 13:11, schrieb Gerrit:

From Björn Michaelsen :


Björn Michaelsen has submitted this change and it was merged.

Change subject: Modified the wording of the Save-on-Exit-Dialog
..


Modified the wording of the Save-on-Exit-Dialog

Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
---
M sfx2/inc/sfx2/sfx.hrc
M sfx2/source/doc/QuerySaveDocument.cxx
M sfx2/source/doc/doc.src
3 files changed, 8 insertions(+), 2 deletions(-)

Approvals:
   Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/491
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Samuel Mehrbrodt 
Gerrit-Reviewer: Stefan Knorr 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Modified the wording of the Save-on-Exit-Dialog

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has submitted this change and it was merged.

Change subject: Modified the wording of the Save-on-Exit-Dialog
..


Modified the wording of the Save-on-Exit-Dialog

Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
---
M sfx2/inc/sfx2/sfx.hrc
M sfx2/source/doc/QuerySaveDocument.cxx
M sfx2/source/doc/doc.src
3 files changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/491
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt 
Gerrit-Reviewer: Björn Michaelsen 
Gerrit-Reviewer: Samuel Mehrbrodt 
Gerrit-Reviewer: Stefan Knorr 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sfx2/inc/sfx2/sfx.hrc |1 +
 sfx2/source/doc/QuerySaveDocument.cxx |1 +
 sfx2/source/doc/doc.src   |8 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 097a0b91add3fa0d2b142804bf040940010f7658
Author: Samuel Mehrbrodt 
Date:   Mon Aug 27 11:10:20 2012 +0200

Modified the wording of the Save-on-Exit-Dialog

Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
Reviewed-on: https://gerrit.libreoffice.org/491
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 0d44061..c215a18 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -162,6 +162,7 @@
 #define STR_KB  (RID_SFX_START+112)
 #define STR_MB  (RID_SFX_START+113)
 #define STR_GB  (RID_SFX_START+114)
+#define STR_QUERY_SAVE_DOCUMENT_TITLE   (RID_SFX_START+115)
 
 #define STR_STANDARD_SHORTCUT   (RID_SFX_START+117)
 #define STR_REPAIREDDOCUMENT(RID_SFX_START+118)
diff --git a/sfx2/source/doc/QuerySaveDocument.cxx 
b/sfx2/source/doc/QuerySaveDocument.cxx
index 2510e9a..49448eb 100644
--- a/sfx2/source/doc/QuerySaveDocument.cxx
+++ b/sfx2/source/doc/QuerySaveDocument.cxx
@@ -36,6 +36,7 @@ short ExecuteQuerySaveDocument(Window* _pParent,const String& 
_rTitle)
 aText.SearchAndReplace( DEFINE_CONST_UNICODE( "$(DOC)" ),
 _rTitle );
 QueryBox aQBox( _pParent, WB_YES_NO_CANCEL | WB_DEF_YES, aText );
+aQBox.SetText(SfxResId(STR_QUERY_SAVE_DOCUMENT_TITLE).toString()); // 
Window title
 aQBox.SetButtonText( BUTTONID_NO, SfxResId(STR_NOSAVEANDCLOSE).toString() 
);
 aQBox.SetButtonText( BUTTONID_YES, SfxResId(STR_SAVEDOC).toString() );
 return aQBox.Execute();
diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src
index 3b5293d..640283d 100644
--- a/sfx2/source/doc/doc.src
+++ b/sfx2/source/doc/doc.src
@@ -46,9 +46,13 @@ QueryBox MSG_REGION_NOTEMPTY
 DefButton = WB_DEF_NO ;
 Message [ en-US ] = "The category is not empty.\nDelete anyway?" ;
 };
+String STR_QUERY_SAVE_DOCUMENT_TITLE
+{
+Text [ en-US ] = "Save document" ;
+};
 String STR_QUERY_SAVE_DOCUMENT
 {
-Text [ en-US ] = "The document \"$(DOC)\" has been modified.\nDo you want 
to save your changes?" ;
+Text [ en-US ] = "Save changes to document \"$(DOC)\" before closing?" ;
 };
 Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
 Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
@@ -307,7 +311,7 @@ String STR_DOCTYPENAME_MESSAGE
 
 String STR_NOSAVEANDCLOSE
 {
-Text [ en-US ] = "~Discard" ;
+Text [ en-US ] = "Close ~without saving" ;
 };
 
 String STR_PACKNGO_NOACCESS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/filter/ImportFilter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 926fe8298be1a2d4a22277a5e9ecf4e2582b0b21
Author: Miklos Vajna 
Date:   Mon Aug 27 13:07:05 2012 +0200

n#775899 docx import: set PrinterIndependentLayout like ww8 does

Change-Id: I32869aa3d7b6b25c7eb9756d79ea7126130afc4b

diff --git a/writerfilter/source/filter/ImportFilter.cxx 
b/writerfilter/source/filter/ImportFilter.cxx
index 8e60b56..e51bd96 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -178,6 +179,7 @@ void WriterFilter::setTargetDocument( const uno::Reference< 
lang::XComponent >&
xSettings->setPropertyValue( "StylesNoDefault", uno::makeAny( sal_True ) );
 
xSettings->setPropertyValue("FloattableNomargins", uno::makeAny( sal_True 
));
+   xSettings->setPropertyValue("PrinterIndependentLayout", 
uno::makeAny(document::PrinterIndependentLayout::DISABLED));
 }
 
 void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent 
>& xDoc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dictionaries/ru_RU

[Libreoffice Gerrit user]

 dictionaries/ru_RU/README_ru_RU.txt |   10 ++
 dictionaries/ru_RU/ru_RU.aff|1 +
 2 files changed, 11 insertions(+)

New commits:
commit 27caa10134f27e9bb342322af42e6ad8f1ddb4fb
Author: László Németh 
Date:   Fri Aug 24 16:37:16 2012 +0200

fdo#35001 (add TRY for better suggestions)

Change-Id: I47079586f85385508dcb3973b7acc59de0ad36f8
Signed-off-by: Andras Timar 

diff --git a/dictionaries/ru_RU/README_ru_RU.txt 
b/dictionaries/ru_RU/README_ru_RU.txt
index 0ded5e1..4620b48 100644
--- a/dictionaries/ru_RU/README_ru_RU.txt
+++ b/dictionaries/ru_RU/README_ru_RU.txt
@@ -1,5 +1,15 @@
 * Copyright (c) 1997-2008, Alexander I. Lebedev
 
+Modifications:
+--
+2012-08-24: Laszlo Nemeth (nemeth at numbertext org)
+* ru_RU.aff: add TRY line for better suggestions
+  (fix fdo#35001, reported by sasha.libreoffice at gmail)
+
+Copyright:
+--
+* Copyright (c) 1997-2008, Alexander I. Lebedev
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/dictionaries/ru_RU/ru_RU.aff b/dictionaries/ru_RU/ru_RU.aff
index cf92c94..28ac15f 100644
--- a/dictionaries/ru_RU/ru_RU.aff
+++ b/dictionaries/ru_RU/ru_RU.aff
@@ -1,4 +1,5 @@
 SET KOI8-R
+TRY ÉÁÏÅÎÔÒ×ÓÊÌÐËÙØÑÍÄÕÛÚÂÇÞÝÀÖÃÈÆÜßáëó÷ðíçâìôäîéïòæüåèþõúûñàãöêý
 
 SFX Z Y 4
 SFX Z   ÙÊ   Ï[ÌÎÒÔ×]ÙÊ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dictionaries/ru_RU

[Libreoffice Gerrit user]

 dictionaries/ru_RU/README_ru_RU.txt |   10 ++
 dictionaries/ru_RU/ru_RU.aff|1 +
 2 files changed, 11 insertions(+)

New commits:
commit 3eda0173185565948d483469a5a838fa5a103c53
Author: László Németh 
Date:   Fri Aug 24 16:37:16 2012 +0200

fdo#35001 (add TRY for better suggestions)

Change-Id: I47079586f85385508dcb3973b7acc59de0ad36f8
Signed-off-by: Andras Timar 

diff --git a/dictionaries/ru_RU/README_ru_RU.txt 
b/dictionaries/ru_RU/README_ru_RU.txt
index 0ded5e1..4620b48 100644
--- a/dictionaries/ru_RU/README_ru_RU.txt
+++ b/dictionaries/ru_RU/README_ru_RU.txt
@@ -1,5 +1,15 @@
 * Copyright (c) 1997-2008, Alexander I. Lebedev
 
+Modifications:
+--
+2012-08-24: Laszlo Nemeth (nemeth at numbertext org)
+* ru_RU.aff: add TRY line for better suggestions
+  (fix fdo#35001, reported by sasha.libreoffice at gmail)
+
+Copyright:
+--
+* Copyright (c) 1997-2008, Alexander I. Lebedev
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/dictionaries/ru_RU/ru_RU.aff b/dictionaries/ru_RU/ru_RU.aff
index cf92c94..28ac15f 100644
--- a/dictionaries/ru_RU/ru_RU.aff
+++ b/dictionaries/ru_RU/ru_RU.aff
@@ -1,4 +1,5 @@
 SET KOI8-R
+TRY ÉÁÏÅÎÔÒ×ÓÊÌÐËÙØÑÍÄÕÛÚÂÇÞÝÀÖÃÈÆÜßáëó÷ðíçâìôäîéïòæüåèþõúûñàãöêý
 
 SFX Z Y 4
 SFX Z   ÙÊ   Ï[ÌÎÒÔ×]ÙÊ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 38840 - Adding coverage analysis to unit tests

[John Smith]

On Mon, Aug 27, 2012 at 9:10 AM, Stephan Bergmann  wrote:
>
> (at least for the given case of our LO code base, which is not too heavily
> loaded with dedicated tests to begin with).
>
Well at the moment there may not be a lot of testcases. But I get the
impression that the whole reason for adding test coverage in the 1st
place, is that (much) more tests are intended to be added in the
future for covering the code that isnt tested yet ? And if that is the
case, wouldnt it make more sense to cleanly separate 'building your
project' and 'testing your project' ? I dont get the impression that
everyone that compiles the code will be interested in all checks being
executed, especially once there are more tests. For the future, it
might make more sense if 'make build' (or something similar) only
compiles the code without running the tests, and that the tests only
get executed if 'make check' is run ?

Just my 2$


Regards,


John Smith.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/inc/pagedesc.hxx|2 ++
 sw/source/core/doc/doclay.cxx  |2 +-
 sw/source/core/doc/poolfmt.cxx |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d79cd86e2e2b1e6a8f94794946752909ed7e7a7f
Author: Cédric Bosdonnat 
Date:   Mon Aug 27 12:40:38 2012 +0200

sw, FIRSTSHARE flag wasn't set in defaults and copied in SetUseOn

Change-Id: Ib0fd2097af4f45ec838b96e8214dfe913a3b47df

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index e83452f..4e21c55 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -287,6 +287,8 @@ inline void SwPageDesc::SetUseOn( UseOnPage eNew )
 eTmp = nsUseOnPage::PD_HEADERSHARE;
 if ( eUse & nsUseOnPage::PD_FOOTERSHARE )
 eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE);
+if ( eUse & nsUseOnPage::PD_FIRSTSHARE )
+eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FIRSTSHARE);
 eUse = (UseOnPage) (eTmp | eNew);
 
 }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index ccd9670..9343ef3 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1486,7 +1486,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, 
bool bRegardLanguage )
 aSet.Put( aLR );
 aSet.Put( aUL );
 if( pNewPgDsc )
-pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
+pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL | 
nsUseOnPage::PD_FIRSTSHARE );
 }
 break;
 
commit 61acb79808a641e49e4db3a106807045dd744704
Author: Cédric Bosdonnat 
Date:   Mon Aug 27 10:25:46 2012 +0200

sw: fixed STL conversion from 1015cd4ff73ee25e55b4da8c8bc55a41e652da87

Bad integer cast made reserve throw an std::length_error exception

Change-Id: Iafdf859dd13e8b44ad61ee7e02eb11370f8260fb

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5f6e55f..33e7d56 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -2053,7 +2053,7 @@ void SwDoc::SetAllUniqueFlyNames()
 if( 255 < ( n = GetSpzFrmFmts()->size() ))
 n = 255;
 SwFrmFmts aArr;
-aArr.reserve( (sal_Int8)n );
+aArr.reserve( n );
 SwFrmFmt* pFlyFmt;
 sal_Bool bLoadedFlag = sal_True;// something for the Layout
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/ui/shells/basesh.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 360c3e912a264b8b2219a28a64856b5e867adb10
Author: Tor Lillqvist 
Date:   Mon Aug 27 13:15:30 2012 +0300

WaE: unused variable ´nHtmlMode´

Change-Id: I3c949e9f536b81bf405cf03992e2a9bbe0a2b0d4

diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 0dd7b7f..099e96f 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1585,7 +1585,6 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 (eSet == FLY_AS_CHAR));
 if(nWhich != FN_TOOL_ANCHOR)
 {
-sal_uInt16 nHtmlMode = 
::GetHtmlMode(GetView().GetDocShell());
 if( nWhich == FN_TOOL_ANCHOR_FRAME && 
!rSh.IsFlyInFly() )
 rSet.DisableItem(nWhich);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#47157 adding Keywords to .desktop files

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has submitted this change and it was merged.

Change subject: fdo#47157 adding Keywords to .desktop files
..


fdo#47157 adding Keywords to .desktop files

Adding Keywords to .desktop files, following the suggestions in
https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0

Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d
---
M sysui/desktop/menus/base.desktop
M sysui/desktop/menus/calc.desktop
M sysui/desktop/menus/draw.desktop
M sysui/desktop/menus/impress.desktop
M sysui/desktop/menus/math.desktop
M sysui/desktop/menus/writer.desktop
6 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/490
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marco Biscaro 
Gerrit-Reviewer: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sysui/desktop

[Libreoffice Gerrit user]

 sysui/desktop/menus/base.desktop|1 +
 sysui/desktop/menus/calc.desktop|1 +
 sysui/desktop/menus/draw.desktop|1 +
 sysui/desktop/menus/impress.desktop |1 +
 sysui/desktop/menus/math.desktop|1 +
 sysui/desktop/menus/writer.desktop  |1 +
 6 files changed, 6 insertions(+)

New commits:
commit 9d844ce3f8e411bfb4237372b1a6d4aec21a0a65
Author: Marco Biscaro 
Date:   Sun Aug 26 21:32:41 2012 -0300

fdo#47157 adding Keywords to .desktop files

Adding Keywords to .desktop files, following the suggestions in
https://bugs.freedesktop.org/show_bug.cgi?id=47157#c0

Change-Id: Ic2a1428aaa12bc31b0af8488d166f78d5a970a1d
Reviewed-on: https://gerrit.libreoffice.org/490
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 72cf467..578e5c7 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -9,6 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.bas
 Name=%PRODUCTNAME Base
 GenericName=Database Development
 Comment=Manage databases, create queries and reports to track and manage your 
information by using Base.
+Keywords=Data;SQL;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index e9f3250..638b9e2 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -9,6 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.op
 Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculations, analyze information and manage lists in 
spreadsheets by using Calc.
+Keywords=Accounting;Stats;Chart;ods;xls;xlsx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 9511fd5..6d92845 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -9,6 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opend
 Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
+Keywords=Vector;Schema;Diagram;odg;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 2fb8650..d8ca703 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -9,6 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.o
 Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by 
using Impress.
+Keywords=Slideshow;odp;ppt;pptx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 867711d..4381a49 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -10,6 +10,7 @@ 
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math
 Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
+Keywords=Equation;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index 888b382..f76ac4e 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -9,6 +9,7 @@ 
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocum
 Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and 
Web pages by using Writer.
+Keywords=Text;Letter;CV;odt;doc;docx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
 [X-New Shortcut Group]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

[Libreoffice Gerrit user]

 basic/source/runtime/step0.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 55899d7f5f3125ea2d4b1178065ffea80b3d2b50
Author: Noel Power 
Date:   Mon Aug 27 10:51:42 2012 +0100

fix for fdo#54046

fix case where the value is neither uno object or unostruct

Change-Id: I2862ab23a875a691edb202bb9d334b000871f718

diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 0ddda8f..667a805 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -351,7 +351,13 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& 
refVal, SbxVariableRe
 
 SbUnoObject* pUnoVal =  PTR_CAST(SbUnoObject,(SbxObject*)xValObj);
 SbUnoStructRefObject* pUnoStructVal = 
PTR_CAST(SbUnoStructRefObject,(SbxObject*)xValObj);
-Any aAny = pUnoVal ? pUnoVal->getUnoAny() : pUnoStructVal->getUnoAny();
+Any aAny;
+// make doubly sure value is either an Uno object or
+// an uno struct
+if ( pUnoVal || pUnoStructVal )
+aAny = pUnoVal ? pUnoVal->getUnoAny() : pUnoStructVal->getUnoAny();
+else
+return false;
 if (  aAny.getValueType().getTypeClass() == TypeClass_STRUCT )
 {
 refVar->SetType( SbxOBJECT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[feature/killsdf]: typo fix in comment

[Gerrit]

>From Andras Timar :

Andras Timar has submitted this change and it was merged.

Change subject: typo fix in comment
..


typo fix in comment

Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530
---
M sw/source/filter/ww8/ww8par.cxx
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andras Timar: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/492
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Andras Timar 
Gerrit-Reviewer: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/killsdf' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42688495edac102b18014a02072ba081870059db
Author: Andras Timar 
Date:   Mon Aug 27 11:43:30 2012 +0200

typo fix in comment

Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530
Reviewed-on: https://gerrit.libreoffice.org/492
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ee4e34b..c9eac6c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3897,7 +3897,7 @@ void wwSectionManager::InsertSegments()
 
 bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  
bThisAndPreviousAreCompatible): false;
 bool bInsertPageDesc = !bInsertSection;
-bool bProtected = SectionIsProtected(*aIter); // do we really  need 
this ?? I guess I have a different logic in editshell which disales this...
+bool bProtected = SectionIsProtected(*aIter); // do we really  need 
this ?? I guess I have a different logic in editshell which disables this...
 if (bUseEnhFields && mrReader.pWDop->fProtEnabled && 
aIter->IsNotProtected())
 {
 // here we have the special case that the whole document is 
protected, with the execption of this section.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[feature/killsdf]: typo fix in comment

[Gerrit]

>From Andras Timar :

Andras Timar has uploaded a new change for review.

Change subject: typo fix in comment
..

typo fix in comment

Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530
---
M sw/source/filter/ww8/ww8par.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/492/1
--
To view, visit https://gerrit.libreoffice.org/492
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdcaacef04b542ff296d13ad0fce7dd27ef36530
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/killsdf
Gerrit-Owner: Andras Timar 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement

[Samuel Mehrbrodt]

All of my past & future contributions to LibreOffice may be licensed 
under the MPL/LGPLv3+ dual license


Samuel Mehrbrodt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Modified the wording of the Save-on-Exit-Dialog

[Gerrit]

>From Samuel Mehrbrodt :

Samuel Mehrbrodt has uploaded a new change for review.

Change subject: Modified the wording of the Save-on-Exit-Dialog
..

Modified the wording of the Save-on-Exit-Dialog

Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
---
M sfx2/inc/sfx2/sfx.hrc
M sfx2/source/doc/QuerySaveDocument.cxx
M sfx2/source/doc/doc.src
3 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/491/1
--
To view, visit https://gerrit.libreoffice.org/491
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3a02efc4541754ba553909ad03a115258890351
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH (partial)] Writer autocompletion feature

[Tomaž Vajngerl]

Hi,

I would like to give a little status regarding this topic:
- lookuptree code has been integrated into editeng package and changed
to support OUString instead of std::string
- tests has been converted to CppUnit and extended to test for unicode
characters support
- remark: old code used a sorted vector for word lookup which did not
even work in some situations on some environments I tried
- lookuptree is now used for word lookup but not yet used for word
list managing (iterator through all words is needed) so currently both
are still used and words are added to both data structures.
- lookuptree supports remembering the position in a word so it does
not need to do whole word lookups all the time, but currently whole
word lookup is always used because the code in sw needs to be changed
to support this
- word statistics is currently not used because the sw code needs to
be changed to support this in a sensible way
- support for more languages is not yet implemented

I will remove all the usage of old sorted vector for autocompletion in
the near future, but other things will need to wait.

Regrds, Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - lpsolve/lp_solve_5.5.patch lpsolve/makefile.mk postprocess/packcomponents sccomp/Module_sccomp.mk vcl/ios vcl/source

[Libreoffice Gerrit user]

 lpsolve/lp_solve_5.5.patch   |   15 ---
 lpsolve/makefile.mk  |   14 ++
 postprocess/packcomponents/makefile.mk   |2 +-
 sccomp/Module_sccomp.mk  |4 
 vcl/ios/source/gdi/salcoretextlayout.cxx |2 +-
 vcl/source/gdi/outdev.cxx|8 
 6 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit 123393ca342e1865cdc9acaa654e27eabb14f232
Author: Tor Lillqvist 
Date:   Sun Aug 26 21:36:25 2012 +0300

Fix dbgutil iOS build

Change-Id: Ie05a958411683cc4ea5adcac0f1ab6ea0c4736de

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 0d73827..c8a0345 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -75,8 +75,16 @@
 using namespace ::com::sun::star;
 
 DBG_NAME( OutputDevice )
+#ifdef IOS // Static linking, these already exist in the tools
+   // library, so put them in the anonymous namespace here to
+   // avoid clash...
+namespace {
+#endif
 DBG_NAME( Polygon )
 DBG_NAME( PolyPolygon )
+#ifdef IOS
+}
+#endif
 DBG_NAMEEX( Region )
 
 // ---
commit 611a04bc3e023d88c26e1915d45c2b877f92e08e
Author: Tor Lillqvist 
Date:   Sun Aug 26 21:34:36 2012 +0300

Undefined variable mnTrailingSpaceWidth

Change-Id: Id3bf0bbeecbf4b36eb629bc5a80db7443fff4395

diff --git a/vcl/ios/source/gdi/salcoretextlayout.cxx 
b/vcl/ios/source/gdi/salcoretextlayout.cxx
index 4fd1baf..99151e8 100644
--- a/vcl/ios/source/gdi/salcoretextlayout.cxx
+++ b/vcl/ios/source/gdi/salcoretextlayout.cxx
@@ -173,7 +173,7 @@ long CoreTextLayout::FillDXArray( long* pDXArray ) const
 return GetTextWidth();
 }
 // check assumptions
-DBG_ASSERT( !mnTrailingSpaceWidth, "CoreText::FillDXArray() with nTSW!=0" 
);
+// DBG_ASSERT( !mnTrailingSpaceWidth, "CoreText::FillDXArray() with 
nTSW!=0" );
 
 // initialize details about the resulting layout
 InitGIA();
commit bec74ec286e1d1671763a2e5b2a6f4614f0d7669
Author: Tor Lillqvist 
Date:   Fri Aug 24 16:03:19 2012 +0300

Bypass the solver component for iOS for now

Change-Id: I09551ef015d31d2337ba3ab40e720210c095670f

diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index bca62f4..2fdd679 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -133,18 +133,3 @@
 +fi
 +
 +rm *.o 2>/dev/null
 misc/build/lp_solve_5.5/lpsolve55/ccc.ios.orig Sun May 22 11:19:48 2011
-+++ misc/build/lp_solve_5.5/lpsolve55/ccc.ios  Sun May 22 11:19:48 2011
-@@ -1 +1,11 @@
--dummy
-+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c 
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c 
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c 
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c 
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c 
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd 
-I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP 
-DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+ar -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index c91e3a0..cfc3985 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -36,6 +36,8 @@ TARGET=lpsolve
 
 # --- Files 
 
+.IF "$(OS)" != "IOS"
+
 TARFILE_NAME=lp_solve_5.5
 TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
 
@@ -77,10 +79,6 @@ OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
 .EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose
 BUILD_ACTION=sh ccc.osx
 OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
-.ELIF "$(OS)"=="IOS"
-.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS
-BUILD_ACTION=sh ccc.ios
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
 .ELSE
 .IF "$(COMNAME)"=="sunpro5"
 BUILD_ACTION=sh ccc.solaris
@@ -95,9 +93,17 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
 
 OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h 
lp_SOS.h
 
+
 # --- Targets --
 
 .INCLUDE : set_ext.mk
+
+.ENDIF
+
 .INCLUDE : target.mk
+
+.IF "$(OS)" != "IOS"
+
 .INCLUDE : tg_ext.mk
 
+.ENDIF
diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index a5f2f81..a40841a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -85,7 +85,6 @@ my_components = \
 component/sc/util/scfilt \
 component/scaddins/source/analysis/analysis \
 component/scaddins/source/datefunc/date \
-component/sccomp/source/solver/solver \
 component/sd/util/sd \
 component/sd/util/sdd \
 component/sd/util/sdfilt \
@@ -209,6 +208,7 @@ my

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

[Libreoffice Gerrit user]

New branch 'feature/killsdf' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

New branch 'feature/killsdf' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

New branch 'feature/killsdf' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

New branch 'feature/killsdf' available with the following commits:
commit 61c312d271767779e1f580e3123012a864e84942
Author: Andras Timar 
Date:   Mon Aug 27 10:21:44 2012 +0200

typo fix in comment

Change-Id: Ief5fe1a58c5f0b09eded67c638eb07a5805e41e2

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

[PUSHED] Remove remaining checks for HTMLMODE_SOME_ABS_POS

[Gerrit]

>From Björn Michaelsen :

Björn Michaelsen has submitted this change and it was merged.

Change subject: Remove remaining checks for HTMLMODE_SOME_ABS_POS
..


Remove remaining checks for HTMLMODE_SOME_ABS_POS

This HTML mode is never disabled for any HTML export options. Thus
it is not necessary to check for it. Completes the cleanup started
in commit feeb57e0a63cdcd81898050d059e7933f62c5292

Change-Id: I3ea27ea52cdc355f19d0d2fb33ac92262df5d13f
---
M cui/source/tabpages/swpossizetabpage.cxx
M sfx2/inc/sfx2/htmlmode.hxx
M sw/source/ui/config/viewopt.cxx
M sw/source/ui/docvw/edtwin.cxx
M sw/source/ui/frmdlg/frmpage.cxx
M sw/source/ui/ribbar/tbxanchr.cxx
M sw/source/ui/shells/basesh.cxx
M sw/source/ui/shells/drwbassh.cxx
M sw/source/ui/shells/textsh.cxx
9 files changed, 16 insertions(+), 46 deletions(-)

Approvals:
  Björn Michaelsen: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/488
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea27ea52cdc355f19d0d2fb33ac92262df5d13f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Harri Pitkänen 
Gerrit-Reviewer: Björn Michaelsen 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cui/source sfx2/inc sw/source

[Libreoffice Gerrit user]

 cui/source/tabpages/swpossizetabpage.cxx |   17 -
 sfx2/inc/sfx2/htmlmode.hxx   |1 -
 sw/source/ui/config/viewopt.cxx  |9 +++--
 sw/source/ui/docvw/edtwin.cxx|3 +--
 sw/source/ui/frmdlg/frmpage.cxx  |   17 -
 sw/source/ui/ribbar/tbxanchr.cxx |4 +---
 sw/source/ui/shells/basesh.cxx   |4 +---
 sw/source/ui/shells/drwbassh.cxx |4 +---
 sw/source/ui/shells/textsh.cxx   |3 +--
 9 files changed, 16 insertions(+), 46 deletions(-)

New commits:
commit c184419d523a15fd875f0565e268158be27ac703
Author: Harri Pitkänen 
Date:   Fri Aug 24 18:53:36 2012 +0300

Remove remaining checks for HTMLMODE_SOME_ABS_POS

This HTML mode is never disabled for any HTML export options. Thus
it is not necessary to check for it. Completes the cleanup started
in commit feeb57e0a63cdcd81898050d059e7933f62c5292

Change-Id: I3ea27ea52cdc355f19d0d2fb33ac92262df5d13f
Reviewed-on: https://gerrit.libreoffice.org/488
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index 2eb6f25..caa95e0 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -894,14 +894,6 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
 
 if(m_bHtmlMode)
 {
-if( 0 == (m_nHtmlMode & HTMLMODE_SOME_ABS_POS))
-{
-if(GetAnchorType() == TextContentAnchorType_AT_PAGE)
-{
-m_aToParaRB.Check();
-}
-m_aToPageRB.Enable(sal_False);
-}
 m_aHoriMirrorCB.Show(sal_False);
 m_aKeepRatioCB.Enable(sal_False);
 // #i18732# - hide checkbox in HTML mode
@@ -1227,8 +1219,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
 m_bAtVertPosModified = sal_True;
 
 // special treatment for HTML-Mode with horz-vert-dependencies
-if(m_bHtmlMode && m_nHtmlMode & HTMLMODE_SOME_ABS_POS &&
-TextContentAnchorType_AT_CHARACTER == GetAnchorType())
+if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType())
 {
 sal_Bool bSet = sal_False;
 if(bHori)
@@ -1444,7 +1435,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
 if(m_bHtmlMode)
 {
 m_pVMap = aVParaHtmlMap;
-m_pHMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHParaHtmlAbsMap : 
aHParaHtmlMap;
+m_pHMap = aHParaHtmlAbsMap;
 }
 else
 {
@@ -1456,8 +1447,8 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
 {
 if(m_bHtmlMode)
 {
-m_pVMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap   
 : aVCharHtmlMap;
-m_pHMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap   
 : aHCharHtmlMap;
+m_pVMap = aVCharHtmlAbsMap;
+m_pHMap = aHCharHtmlAbsMap;
 }
 else
 {
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 4d5393c..90af4b2 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -25,7 +25,6 @@
 #define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
 #define HTMLMODE_FULL_STYLES0x0040 /* == SW */
 #define HTMLMODE_PARA_BLOCK 0x0100
-#define HTMLMODE_SOME_ABS_POS   0x2000
 #define HTMLMODE_RESERVED1  0x4000
 #define HTMLMODE_RESERVED0  0x8000
 
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 18ab294..ff7d59a 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -326,16 +326,13 @@ sal_uInt16  GetHtmlMode(const SwDocShell* pShell)
 switch ( rHtmlOpt.GetExportMode() )
 {
 case HTML_CFG_MSIE:
-nRet |= HTMLMODE_FULL_STYLES|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FULL_STYLES;
 break;
 case HTML_CFG_NS40:
-nRet |= HTMLMODE_FRM_COLUMNS|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FRM_COLUMNS;
 break;
 case HTML_CFG_WRITER:
-nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES;
 break;
 }
 }
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bf24d48..2805bc2 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1160,8 +1160,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
 }
 else
 {
-bSetPos = (::GetHtmlMode(rView.GetDocShell()) & 
HTMLMODE_SOME_ABS_POS) ?
-sal_True : sal_False;
+bSetPos = sal_True;
 }
 

License statement

[oger000]

All of my past&  future contributions to LibreOffice may be licensed under the 
MPL/LGPLv3+ dual license.


gerhard öttl


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#39468: Translated German comments in sc/source/core/inc

[oger000]

Hi

Some translations of german comments.

Its my first patch to LO so something may be missing?


gerhard
>From 8a6431891604f6be5676003470d4240a4a1c4902 Mon Sep 17 00:00:00 2001
From: gerhard oettl 
Date: Mon, 27 Aug 2012 09:39:35 +0200
Subject: [PATCH 1/1] fdo#39468: Translated German comments in sc/source/core/inc
Content-Type: text/plain; charset="utf-8"

---
 sc/source/core/inc/adiasync.hxx |   20 ++--
 sc/source/core/inc/ddelink.hxx  |   14 +++---
 sc/source/core/inc/interpre.hxx |   18 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 54625c8..fe4863d 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -49,20 +49,20 @@ class ScAddInAsync : public SvtBroadcaster
 private:
 union
 {
-double  nVal;   // aktueller Wert
+double  nVal;   // current value
 String* pStr;
 };
-ScAddInDocs*pDocs;  // Liste der benutzenden Dokumente
-FuncData*   mpFuncData;  // Zeiger auf die Daten in der Collection
-sal_uLong   nHandle;// wird von double auf sal_uLong gecasted
-ParamType   meType;  // PTR_DOUBLE oder PTR_STRING Ergebnis
-sal_BoolbValid; // ob Wert gueltig
+ScAddInDocs*pDocs;  // list of using documents
+FuncData*   mpFuncData; // pointer to files in collection
+sal_uLong   nHandle;// is casted from double to sal_uLong
+ParamType   meTypce;// result of type PTR_DOUBLE or PTR_STRING
+sal_BoolbValid; // marker if value is valid

 public:
-// cTor nur wenn ScAddInAsync::Get fehlschlaegt!
-// nIndex: Index aus der FunctionCollection
+// cTor only if ScAddInAsync::Get fails!
+// nIndex: Index from FunctionCollection
 ScAddInAsync(sal_uLong nHandle, FuncData* pFuncData, ScDocument* pDoc);
-// default-cTor nur fuer das eine globale aSeekObj !!!
+// default-cTor only for that one aSeekObj !!!
 ScAddInAsync();
 virtual ~ScAddInAsync();
 static ScAddInAsync*Get( sal_uLong nHandle );
@@ -76,7 +76,7 @@ public:
 { return pDocs->find( pDoc ) != pDocs->end(); }
 voidAddDocument( ScDocument* pDoc ) { pDocs->insert( pDoc ); }

-// Vergleichsoperatoren fuer PtrArrSort
+// Comparator for PtrArrSort
 bool operator< ( const ScAddInAsync& r ) const { return nHandle <  r.nHandle; }
 bool operator==( const ScAddInAsync& r ) const { return nHandle == r.nHandle; }
 };
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 216d6d6..eeb9108 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -46,14 +46,14 @@ static sal_Bool bIsInUpdate;

 ScDocument* pDoc;

-String  aAppl;  // Verbindungsdaten
+String  aAppl;  // connection/link data
 String  aTopic;
 String  aItem;
-sal_uInt8   nMode;  // Zahlformat-Modus
+sal_uInt8   nMode;  // number format mode

-sal_BoolbNeedUpdate;// wird gesetzt, wenn Update nicht moeglich war
+sal_BoolbNeedUpdate;// is set, if update was not possible

-ScMatrixRef pResult;// Ergebnis
+ScMatrixRef pResult;

 public:
 TYPEINFO();
@@ -67,14 +67,14 @@ public:

 voidStore( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;

-// von SvBaseLink ueberladen:
+// overloaded by SvBaseLink:
 virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
 const String& rMimeType, const ::com::sun::star::uno::Any & rValue );

-// von SvtBroadcaster ueberladen:
+// overloaded by SvtBroadcaster:
 virtual voidListenersGone();

-// fuer Interpreter:
+// for interpreter:

 const ScMatrix* GetResult() const   { return pResult.get(); }
 voidSetResult( ScMatrixRef pRes ) { pResult = pRes; }
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3affc4e..9ac3ea5 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -102,7 +102,7 @@ public:
 static void SetGlobalConfig(const ScCalcConfig& rConfig);
 static const ScCalcConfig& GetGlobalConfig();

-static void GlobalExit();   // aus ScGlobal::Clear() gerufen
+static void GlobalExit();   // called by ScGlobal::Clear()

 /// Could string be a regular expressi

Re: using syslog instead of console for messages

[Riccardo Magliocchetti]

Hello Stephan,

Il 27/08/2012 09:13, Stephan Bergmann ha scritto:

On 08/26/2012 12:34 PM, Riccardo Magliocchetti wrote:

while in headless mode i'd like to have messages delivered to syslog
instead of stderr / stdout, looking at the SAL_* implementation it looks
like what i want is to substitute the std::fputs in
osl/all/log.cxx::log() with syslog() plus some map between these levels
and syslog ones. Is that ok?


yes


Also does "libo" makes sense as message prefix?


why not "libreoffice"?


i was afraid it was quite a long string, but i have way longer prefixes 
in my syslog so let's go with full "libreoffice".


thanks,
riccardo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fdo#49901: SwView::ExecSearch: fix Replace All cursor:

[Gerrit]

>From Miklos Vajna :

Miklos Vajna has submitted this change and it was merged.

Change subject: fdo#49901: SwView::ExecSearch: fix Replace All cursor:
..


fdo#49901: SwView::ExecSearch: fix Replace All cursor:

Because the "fix" for i#8288 only set the point of the cursor and not
the mark, it can happen that after a Replace All weird things are
selected; fix that (and i#8288 properly) by using the SwCrsrShell stack,
and don't do it when searching in the selection.
This cannot be done in SwCrsrShell itself because ExecSearch sets the
cursor to the beginning/end of the document already.
(regression from cda75d6f358d438f7ed36ed7fa296ac23e3c4a04)

Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
(cherry picked from commit b3233579ccb2528912835deedde37c1d48417d6c)
---
M sw/source/ui/uiview/viewsrch.cxx
1 file changed, 23 insertions(+), 23 deletions(-)

Approvals:
  Miklos Vajna: Verified; Looks good to me, approved


--
To view, visit https://gerrit.libreoffice.org/481
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 
Gerrit-Reviewer: Miklos Vajna 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewsrch.cxx |   46 +++
 1 file changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 546f1a008482ca5227897faaf4e588a7d8f5dd58
Author: Michael Stahl 
Date:   Sat Aug 25 00:39:21 2012 +0200

fdo#49901: SwView::ExecSearch: fix Replace All cursor:

Because the "fix" for i#8288 only set the point of the cursor and not
the mark, it can happen that after a Replace All weird things are
selected; fix that (and i#8288 properly) by using the SwCrsrShell stack,
and don't do it when searching in the selection.
This cannot be done in SwCrsrShell itself because ExecSearch sets the
cursor to the beginning/end of the document already.
(regression from cda75d6f358d438f7ed36ed7fa296ac23e3c4a04)

Change-Id: Ie9f8d7da2fa26000a0237c24f8742e47ffa29213
(cherry picked from commit b3233579ccb2528912835deedde37c1d48417d6c)
Reviewed-on: https://gerrit.libreoffice.org/481
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index d0f6079..1e583ce 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -286,36 +286,36 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool 
bNoMessage)
 case SVX_SEARCHCMD_REPLACE_ALL:
 {
 SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() 
);
-
-// Fix for i#8288: "Replace all" should leave the cursor 
at the place it was
-// before executing the command, rather than at the site 
of the final replacement.
-// To do this take note of the current cursor position 
before replace all begins:
-// note: must be stored so that it is corrected by PamCorr*
-::boost::scoped_ptr const pTmpCursor(
-pWrtShell->GetDoc()->CreateUnoCrsr(
-*pWrtShell->GetSwCrsr()->GetPoint()));
-
-if( !pSrchItem->GetSelection() )
-{
-// bestehende Selektionen aufheben,
-// wenn nicht in selektierten Bereichen gesucht werden 
soll
-pWrtShell->KillSelection(0, false);
-if( DOCPOS_START == aOpts.eEnd )
-pWrtShell->EndDoc();
-else
-pWrtShell->SttDoc();
-}
-
 bExtra = sal_False;
 sal_uLong nFound;
 
 {   //Scope for SwWait-Object
 SwWait aWait( *GetDocShell(), sal_True );
 pWrtShell->StartAllAction();
+if (!pSrchItem->GetSelection())
+{
+// if we don't want to search in the selection...
+pWrtShell->KillSelection(0, false);
+// i#8288 "replace all" should not change cursor
+// position, so save current cursor
+pWrtShell->Push();
+if (DOCPOS_START == aOpts.eEnd)
+{
+pWrtShell->EndDoc();
+}
+else
+{
+pWrtShell->SttDoc();
+}
+}
 nFound = FUNC_Search( aOpts );
-// #i8288# Now that everything has been replaced, 
restore the original cursor position.
-*(pWrtShell->GetSwCrsr()->GetPoint()) =
-*pTmpCursor->GetPoint();
+if (!pSrchItem->GetSelection())
+{
+// create it just to overwrite it with stack cursor
+pWrtShell->CreateCrsr();
+// i#8288 restore the original cursor position
+pWrtShell->Pop(false);
+}
 pWrtShell->EndAllAction();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: using syslog instead of console for messages

[Stephan Bergmann]

On 08/26/2012 12:34 PM, Riccardo Magliocchetti wrote:

while in headless mode i'd like to have messages delivered to syslog
instead of stderr / stdout, looking at the SAL_* implementation it looks
like what i want is to substitute the std::fputs in
osl/all/log.cxx::log() with syslog() plus some map between these levels
and syslog ones. Is that ok?


yes


Also does "libo" makes sense as message prefix?


why not "libreoffice"?

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] fdo#46542, fdo#46559 (small fixes for English grammar checking)

[Németh László]

Hi,

Many thanks, also for the correction.

László

2012/8/27 Andras Timar 

> Hi,
>
> 2012/8/26 Németh László :
> > Hi,
> >
> > The attached 2-line libreoffice-3-6 patch adds two reported words to the
> > exceptions of the English grammar checking.
> > (It has already been fixed in the master, but with a greater,
> restructured
> > code and other improvements.)
>
> It was fdo#46549, not fdo#46559. I pushed it to libreoffice-3-6 with
> corrected commit message.
>
> Thanks,
> Andras
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Bug 38840 - Adding coverage analysis to unit tests

[Stephan Bergmann]

On 08/24/2012 06:31 PM, John Smith wrote:

On Fri, Aug 24, 2012 at 5:28 PM, Stephan Bergmann  wrote:

In a sense, even during the tests, very much of our code is executed "by
accident" rather than due to dedicated test code calling it:  Especially the
subsequentcheck stuff contains checks that are not simple unit tests, but
start of a complete soffice.bin process, causing "unintended" testing of
large parts of the infrastructure code anyway.


Whether code gets tested 'unintended' or not during your 'tests' is
really not relevant, is it ? Only if the code gets executed or not ?


That it is not relevant would be my interpretation, too (at least for 
the given case of our LO code base, which is not too heavily loaded with 
dedicated tests to begin with).  And that's why I asked why you only use 
that delta anyway.  :)


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice