[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 70449, which changed state.

Bug 70449 Summary: StartCenter: it is not possible to easily navigate through 
recent used files with the keyboard
https://bugs.freedesktop.org/show_bug.cgi?id=70449

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: 2 commits - git-hooks/cppunit.git prettyprint/prettyprint

[Miklos Vajna]

 git-hooks/cppunit.git/hooks/update |9 +
 prettyprint/prettyprint|2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit aedf13f8c17f367bc6592f90145b8f5cf0d94db3
Author: Miklos Vajna 
Date:   Tue Dec 17 09:28:49 2013 +0100

prettyprint: handle svg

Change-Id: Ia9dc80205da2ac633dc750747be01826c1796ab3

diff --git a/prettyprint/prettyprint b/prettyprint/prettyprint
index 0f3e698..6cd7ddb 100755
--- a/prettyprint/prettyprint
+++ b/prettyprint/prettyprint
@@ -9,7 +9,7 @@ mydir=$(dirname $0)
 
 if [ "$kind" == "text/rtf" ]; then
$mydir/formatrtf $file
-elif [ "$kind" == "application/xml" ]; then
+elif [ "$kind" == "application/xml" -o "$kind" == "image/svg+xml" ]; then
#xmllint --format --recover $file 2>/dev/null
$mydir/formatxml $file
 else
commit 5acec380d97ab596f6d579cf39a2a4e4e68fa339
Author: Miklos Vajna 
Date:   Tue Dec 17 09:28:37 2013 +0100

git-hooks: sync cppunit hook with core

Change-Id: I192e06f1be9d0542a755ae03efc97b792c04a38b

diff --git a/git-hooks/cppunit.git/hooks/update 
b/git-hooks/cppunit.git/hooks/update
index 736b3cd..1079e87 100755
--- a/git-hooks/cppunit.git/hooks/update
+++ b/git-hooks/cppunit.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
echo "*** The reference for this repo is gerrit. do not push directly 
to fdo" >&2
exit 1
 fi
+from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-comm...@lists.freedesktop.org"
@@ -54,8 +55,9 @@ date_format="%F %R %z"
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr "$2" : '0*$' >/dev/null ; then
-   subject="Changes to '${1##refs/heads/}'"
+   subject="$repo: Changes to '${1##refs/heads/}'"
 else
base=$(git-merge-base "$2" "$3")
subject=$(git-diff-tree -r --name-only "$base" "$3" |
@@ -68,7 +70,6 @@ else
if [ "$branch" != "master" ] ; then
subject="Branch '$branch' - $subject"
fi
-   repo=$(basename $GIT_DIR)
subject="$repo: $subject"
 fi
 
@@ -120,7 +121,7 @@ else
esac
bytes=0
IFS="$(echo)"
-   git-rev-list "$3" "^$base" | while read rev; do git-show $rev; done | 
sed 's#\\##g' |
+   git-rev-list "$3" "^$base" | while read rev; do git-show -M $rev; done 
| sed 's#\\##g' |
while read line
do
if [ "$bytes" -ge "0" ] ; then
@@ -135,5 +136,5 @@ else
done
 fi |
 mail -s "$subject" -a "X-Git-Repository: 
git://anongit.freedesktop.org/git/libreoffice/cppunit.git" \
- -a "List-Post: " $recipients
+ -a "List-Post: " -a "From: 
$from" $recipients
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/source sw/CppunitTest_sw_filters_test.mk sw/qa

[Miklos Vajna]

 starmath/source/parse.cxx |   38 +++---
 sw/CppunitTest_sw_filters_test.mk |1 
 sw/qa/core/data/rtf/pass/fdo61638.rtf |   31 +++
 3 files changed, 54 insertions(+), 16 deletions(-)

New commits:
commit cdd59ee13b1dca7e3d269bf1a3c555903eee96ee
Author: Miklos Vajna 
Date:   Tue Dec 17 10:07:10 2013 +0100

fdo#61638 SmParser::NextToken: don't crash on ending dot

Change-Id: Ia9c168e52a99286910c9e63e0e052671c5259ba8

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9b8fc8d..635cf38 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -872,24 +872,30 @@ void SmParser::NextToken()
 break;
 case '.':
 {
-// for compatibility with SO5.2
-// texts like .34 ...56 ... h ...78..90
-// will be treated as numbers
-m_aCurToken.eType = TNUMBER;
-m_aCurToken.cMathChar = '\0';
-m_aCurToken.nGroup   = 0;
-m_aCurToken.nLevel= 5;
-
-sal_Int32 nTxtStart = m_nBufferIndex;
-sal_Unicode cChar;
-do
+// Only one character? Then it can't be a number.
+if (m_nBufferIndex < m_aBufferString.getLength() - 1)
 {
-cChar = m_aBufferString[ ++m_nBufferIndex ];
+// for compatibility with SO5.2
+// texts like .34 ...56 ... h ...78..90
+// will be treated as numbers
+m_aCurToken.eType = TNUMBER;
+m_aCurToken.cMathChar = '\0';
+m_aCurToken.nGroup   = 0;
+m_aCurToken.nLevel= 5;
+
+sal_Int32 nTxtStart = m_nBufferIndex;
+sal_Unicode cChar;
+do
+{
+cChar = m_aBufferString[ ++m_nBufferIndex ];
+}
+while ( cChar == '.' || rtl::isAsciiDigit( cChar ) 
);
+
+m_aCurToken.aText = m_aBufferString.copy( 
nTxtStart, m_nBufferIndex - nTxtStart );
+aRes.EndPos = m_nBufferIndex;
 }
-while ( cChar == '.' || rtl::isAsciiDigit( cChar ) );
-
-m_aCurToken.aText = m_aBufferString.copy( nTxtStart, 
m_nBufferIndex - nTxtStart );
-aRes.EndPos = m_nBufferIndex;
+else
+bHandled = false;
 }
 break;
 case '/':
diff --git a/sw/CppunitTest_sw_filters_test.mk 
b/sw/CppunitTest_sw_filters_test.mk
index cc1a9e9..95be87c 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 package/util/package2 \
 sax/source/expatwrap/expwrap \
 sfx2/util/sfx \
+   starmath/util/sm \
 svtools/util/svt \
 sw/util/msword \
 sw/util/sw \
diff --git a/sw/qa/core/data/rtf/pass/fdo61638.rtf 
b/sw/qa/core/data/rtf/pass/fdo61638.rtf
new file mode 100644
index 000..e85245b
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo61638.rtf
@@ -0,0 +1,31 @@
+{\rtf1
+{\mmath
+{\*\moMathPara 
+{\*\moMath 
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 =}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 b}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 c}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 d}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 .}
+}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7877010 \par }
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=72598

Roczek  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |je...@vdwaa.nl
   |desktop.org |
 CC||dennisroc...@gmail.com

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: fpicker/Module_fpicker.mk

[Caolán McNamara]

 fpicker/Module_fpicker.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc985c30048d410ab68a55af64f56df85547a6bf
Author: Caolán McNamara 
Date:   Tue Dec 17 09:16:59 2013 +

should be a l10n target

Change-Id: If6f7540ba59dc518f258b3b322299432f9b34a7d

diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 573d76c..169e885 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,fpicker))
 
 $(eval $(call gb_Module_add_targets,fpicker,\
Library_fps_office \
-   UIConfig_fps \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,fpicker,\
AllLangResTarget_fps_office \
+   UIConfig_fps \
 ))
 
 ifeq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/hsqldb/HUser.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a66c737a137ec6a4c4578901edb6db8a724f4bb
Author: Julien Nabet 
Date:   Tue Dec 17 07:29:54 2013 +0100

cppcheck: fix statements that begin with string constant

Change-Id: I42427beeae06f607e60aeeb7142714fd1f5d740d
Reviewed-on: https://gerrit.libreoffice.org/7110
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx 
b/connectivity/source/drivers/hsqldb/HUser.cxx
index dc6d8d8..297591e 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -228,7 +228,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& 
objName, sal_Int32 obj
 {
 Reference xMeta = m_xConnection->getMetaData();
 OUString sGrant = "GRANT " +  sPrivs +
-" ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+" ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
 " TO " + m_Name;
 
 Reference xStmt = m_xConnection->createStatement();
@@ -254,7 +254,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& 
objName, sal_Int32 ob
 {
 Reference xMeta = m_xConnection->getMetaData();
 OUString sGrant = "REVOKE " + sPrivs +
-" ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
+" ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
 " FROM " + m_Name;
 
 Reference xStmt = m_xConnection->createStatement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/docs

[Stephan Bergmann]

 odk/docs/tools.html |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc95037d1073224fb4143bb308cbdbc096aba774
Author: Stephan Bergmann 
Date:   Tue Dec 17 11:06:22 2013 +0100

Typo

Change-Id: Ie781105ce7be8a617b4893fe77f6aa1467fd0e49

diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 3112597..e0cfffb 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -456,7 +456,7 @@
UNO type functions are generated 
lightweight, that
means only the name and typeclass are given and 
everything else is
retrieved from the type library dynamically. The 
default is that UNO
-   type functions provides enough type information for 
boostrapping C++.
+   type functions provides enough type information for 
bootstrapping C++.
'-L' should be the default for external components.
   
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source sw/CppunitTest_sw_filters_test.mk sw/qa

[Miklos Vajna]

 starmath/source/parse.cxx |   38 +++---
 sw/CppunitTest_sw_filters_test.mk |1 
 sw/qa/core/data/rtf/pass/fdo61638.rtf |   31 +++
 3 files changed, 54 insertions(+), 16 deletions(-)

New commits:
commit 4d2be4e7fa811db504a0fade72514b514ac84c96
Author: Miklos Vajna 
Date:   Tue Dec 17 10:07:10 2013 +0100

fdo#61638 SmParser::NextToken: don't crash on ending dot

Change-Id: Ia9c168e52a99286910c9e63e0e052671c5259ba8
(cherry picked from commit cdd59ee13b1dca7e3d269bf1a3c555903eee96ee)

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5a79bbb..98b579a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -872,24 +872,30 @@ void SmParser::NextToken()
 break;
 case '.':
 {
-// for compatibility with SO5.2
-// texts like .34 ...56 ... h ...78..90
-// will be treated as numbers
-m_aCurToken.eType = TNUMBER;
-m_aCurToken.cMathChar = '\0';
-m_aCurToken.nGroup   = 0;
-m_aCurToken.nLevel= 5;
-
-sal_Int32 nTxtStart = m_nBufferIndex;
-sal_Unicode cChar;
-do
+// Only one character? Then it can't be a number.
+if (m_nBufferIndex < m_aBufferString.getLength() - 1)
 {
-cChar = m_aBufferString[ ++m_nBufferIndex ];
+// for compatibility with SO5.2
+// texts like .34 ...56 ... h ...78..90
+// will be treated as numbers
+m_aCurToken.eType = TNUMBER;
+m_aCurToken.cMathChar = '\0';
+m_aCurToken.nGroup   = 0;
+m_aCurToken.nLevel= 5;
+
+sal_Int32 nTxtStart = m_nBufferIndex;
+sal_Unicode cChar;
+do
+{
+cChar = m_aBufferString[ ++m_nBufferIndex ];
+}
+while ( cChar == '.' || rtl::isAsciiDigit( cChar ) 
);
+
+m_aCurToken.aText = m_aBufferString.copy( 
nTxtStart, m_nBufferIndex - nTxtStart );
+aRes.EndPos = m_nBufferIndex;
 }
-while ( cChar == '.' || rtl::isAsciiDigit( cChar ) );
-
-m_aCurToken.aText = m_aBufferString.copy( nTxtStart, 
m_nBufferIndex - nTxtStart );
-aRes.EndPos = m_nBufferIndex;
+else
+bHandled = false;
 }
 break;
 case '/':
diff --git a/sw/CppunitTest_sw_filters_test.mk 
b/sw/CppunitTest_sw_filters_test.mk
index 0cc65fd..1e96a5c 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 sax/source/expatwrap/expwrap \
 sax/source/fastparser/fastsax \
 sfx2/util/sfx \
+   starmath/util/sm \
 svtools/util/svt \
 sw/util/msword \
 sw/util/sw \
diff --git a/sw/qa/core/data/rtf/pass/fdo61638.rtf 
b/sw/qa/core/data/rtf/pass/fdo61638.rtf
new file mode 100644
index 000..e85245b
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo61638.rtf
@@ -0,0 +1,31 @@
+{\rtf1
+{\mmath
+{\*\moMathPara 
+{\*\moMath 
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 =}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 b}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 c}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 +}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 
\hich\af34\dbch\af31505\loch\f34 
+{\mr\mscr0\msty2 d}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \i\f34\insrsid7877010 .}
+}
+}
+}
+{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid7877010 \par }
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source

[Cédric Bosdonnat]

 sfx2/source/doc/objserv.cxx  |5 +
 sfx2/source/doc/sfxbasemodel.cxx |   12 +++-
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit b95f4fad1acc01857cdc83af23506a4bce6c4ccd
Author: Cédric Bosdonnat 
Date:   Fri Dec 13 10:36:32 2013 +0100

Fixed the update to working copy and back after (cancel) checkout: fdo#64533

After Checkout, simply set medium name and update the medium: at least
we are sure it works in more situations than the other function we used.

After cancel checkout, call SID_RELOAD to actually revert any local
change.

Change-Id: I3dc296a74726770c4f47d9653c382108f7baccad
(cherry picked from commit a68e0e334df02c1ca47601575523b23c6db13470)
Reviewed-on: https://gerrit.libreoffice.org/7068
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index a6f445a..fb29227 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -897,6 +897,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 if (  QueryBox( NULL, SfxResId( RID_QUERY_CANCELCHECKOUT ) 
).Execute( ) == RET_YES )
 {
 CancelCheckOut( );
+
+// Reload the document as we may still have local changes
+SfxViewFrame *pFrame = GetFrame();
+if ( pFrame )
+pFrame->GetDispatcher()->Execute(SID_RELOAD);
 }
 break;
 }
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 44f9f92..70e9c3d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2519,7 +2519,8 @@ void SAL_CALL SfxBaseModel::checkOut(  ) throw ( 
RuntimeException )
 OUString sURL;
 aResult >>= sURL;
 
-m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL 
);
+m_pData->m_pObjectShell->GetMedium( )->SetName( sURL );
+m_pData->m_pObjectShell->GetMedium( )->GetMedium_Impl( );
 m_pData->m_xDocumentProperties->setTitle( getTitle( ) );
 Sequence< beans::PropertyValue > aSequence ;
 TransformItems( SID_OPENDOC, *pMedium->GetItemSet(), aSequence );
@@ -2550,14 +2551,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut(  ) throw ( 
RuntimeException )
 OUString sURL;
 aResult >>= sURL;
 
-m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL 
);
-m_pData->m_xDocumentProperties->setTitle( getTitle( ) );
-Sequence< beans::PropertyValue > aSequence ;
-TransformItems( SID_OPENDOC, *pMedium->GetItemSet(), aSequence );
-attachResource( sURL, aSequence );
-
-// Reload the CMIS properties
-loadCmisProperties( );
+m_pData->m_pObjectShell->GetMedium( )->SetName( sURL );
 }
 catch ( const Exception & e )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - svx/source sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Caolán McNamara]

 svx/source/gallery2/galmisc.cxx |   20 ++-
 sw/UIConfig_swriter.mk  |1 
 sw/source/ui/config/optload.cxx |   11 +---
 sw/source/ui/inc/optload.hxx|5 -
 sw/uiconfig/swriter/ui/captiondialog.ui |   81 
 5 files changed, 104 insertions(+), 14 deletions(-)

New commits:
commit 2e4360815b08e1b5bd7233509d033b5a49b7c61e
Author: Caolán McNamara 
Date:   Tue Dec 17 10:21:49 2013 +

fix caption dialog

Change-Id: I499f47b116ff6957bbbc20b91224fe95593d1da1

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 441cc43..2787065 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/bulletsandnumbering \
sw/uiconfig/swriter/ui/businessdatapage \
sw/uiconfig/swriter/ui/cannotsavelabeldialog \
+   sw/uiconfig/swriter/ui/captiondialog \
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/cardformatpage \
sw/uiconfig/swriter/ui/cardmediumpage \
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 8196d48..3eef208 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -312,15 +312,12 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
 return 0;
 }
 
-SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) :
-SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
+SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet)
+: SfxSingleTabDialog(pParent, rSet, "CaptionDialog",
+"modules/swriter/ui/captiondialog.ui")
 {
 // create TabPage
-SetTabPage((SwCaptionOptPage*) SwCaptionOptPage::Create(this, rSet));
-}
-
-SwCaptionOptDlg::~SwCaptionOptDlg()
-{
+setTabPage(SwCaptionOptPage::Create(get_content_area(), rSet));
 }
 
 SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle )
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 7825ab5..0ee5023 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -69,11 +69,10 @@ public:
 virtual voidReset( const SfxItemSet& rSet );
 };
 
-class SwCaptionOptDlg : public SfxNoLayoutSingleTabDialog
+class SwCaptionOptDlg : public SfxSingleTabDialog
 {
 public:
- SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet);
-~SwCaptionOptDlg();
+SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet);
 };
 
 class CaptionComboBox : public SwComboBox
diff --git a/sw/uiconfig/swriter/ui/captiondialog.ui 
b/sw/uiconfig/swriter/ui/captiondialog.ui
new file mode 100644
index 000..0b6e2d2
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/captiondialog.ui
@@ -0,0 +1,81 @@
+
+
+  
+  
+False
+6
+Caption
+dialog
+
+  
+False
+vertical
+12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+
+  
+
+
+  ok
+  cancel
+  help
+
+  
+
commit c2f0845931b7cb1007d54173c2633c44123a137c
Author: Caolán McNamara 
Date:   Tue Dec 17 10:23:30 2013 +

avoid negative offsets to OUString::copy

Change-Id: I0a62f8a38694a4a7662fe376aaabc35dca817d33

diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b1214d5..fca950f 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -199,10 +199,22 @@ OUString GetReducedString( const INetURLObject& rURL, 
sal_Int32 nMaxLen )
 
 if( aPath.getLength() > nMaxLen )
 {
-aReduced = aPath.copy( 0, nMaxLen - aName.getLength() - 4 );
-aReduced += "...";
-aReduced += OUString(aDelimiter);
-aReduced += aName;
+sal_Int32 nPathPrefixLen = nMaxLen - aName.getLength() - 4;
+
+if (nPathPrefixLen >= 0)
+{
+aReduced = aPath.copy(0, nPathPrefixLen);
+aReduced

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - svx/source sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Caolán McNamara]

 svx/source/gallery2/galmisc.cxx |   20 ++-
 sw/UIConfig_swriter.mk  |1 
 sw/source/ui/config/optload.cxx |   11 +---
 sw/source/ui/inc/optload.hxx|5 -
 sw/uiconfig/swriter/ui/captiondialog.ui |   81 
 5 files changed, 104 insertions(+), 14 deletions(-)

New commits:
commit 21bfcac22b53b163e1912d8b13fe4d4a4202f445
Author: Caolán McNamara 
Date:   Tue Dec 17 10:21:49 2013 +

fix caption dialog

Change-Id: I499f47b116ff6957bbbc20b91224fe95593d1da1
(cherry picked from commit 2e4360815b08e1b5bd7233509d033b5a49b7c61e)

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 5b3a755..928f46b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/bulletsandnumbering \
sw/uiconfig/swriter/ui/businessdatapage \
sw/uiconfig/swriter/ui/cannotsavelabeldialog \
+   sw/uiconfig/swriter/ui/captiondialog \
sw/uiconfig/swriter/ui/captionoptions \
sw/uiconfig/swriter/ui/cardformatpage \
sw/uiconfig/swriter/ui/cardmediumpage \
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 62be5df..4a6d5b2 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -312,15 +312,12 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl)
 return 0;
 }
 
-SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) :
-SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
+SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet)
+: SfxSingleTabDialog(pParent, rSet, "CaptionDialog",
+"modules/swriter/ui/captiondialog.ui")
 {
 // create TabPage
-SetTabPage((SwCaptionOptPage*) SwCaptionOptPage::Create(this, rSet));
-}
-
-SwCaptionOptDlg::~SwCaptionOptDlg()
-{
+setTabPage(SwCaptionOptPage::Create(get_content_area(), rSet));
 }
 
 SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle )
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 7825ab5..0ee5023 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -69,11 +69,10 @@ public:
 virtual voidReset( const SfxItemSet& rSet );
 };
 
-class SwCaptionOptDlg : public SfxNoLayoutSingleTabDialog
+class SwCaptionOptDlg : public SfxSingleTabDialog
 {
 public:
- SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet);
-~SwCaptionOptDlg();
+SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet);
 };
 
 class CaptionComboBox : public SwComboBox
diff --git a/sw/uiconfig/swriter/ui/captiondialog.ui 
b/sw/uiconfig/swriter/ui/captiondialog.ui
new file mode 100644
index 000..0b6e2d2
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/captiondialog.ui
@@ -0,0 +1,81 @@
+
+
+  
+  
+False
+6
+Caption
+dialog
+
+  
+False
+vertical
+12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+
+  
+
+
+  ok
+  cancel
+  help
+
+  
+
commit cd6a7ec9623e68e0fd301fe74e6b03962508ab9e
Author: Caolán McNamara 
Date:   Tue Dec 17 10:23:30 2013 +

avoid negative offsets to OUString::copy

Change-Id: I0a62f8a38694a4a7662fe376aaabc35dca817d33
(cherry picked from commit c2f0845931b7cb1007d54173c2633c44123a137c)

diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index b1214d5..fca950f 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -199,10 +199,22 @@ OUString GetReducedString( const INetURLObject& rURL, 
sal_Int32 nMaxLen )
 
 if( aPath.getLength() > nMaxLen )
 {
-aReduced = aPath.copy( 0, nMaxLen - aName.getLength() - 4 );
-aReduced += "...";
-aReduced += OUString(aDelimiter);
-aReduced += aName;
+sal_Int32 nPathPrefixLen = nMaxLen - aName.getLength(

[Libreoffice-commits] core.git: codemaker/source

[Caolán McNamara]

 codemaker/source/cppumaker/cppuoptions.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 944a086d9223a84e1ae8d7839433fccaff361b79
Author: Caolán McNamara 
Date:   Tue Dec 17 10:26:21 2013 +

if there is one typo, its guaranteed to duplicated somewhere

Change-Id: Ia81069afa47fa5790b973247c68bead7de87d718

diff --git a/codemaker/source/cppumaker/cppuoptions.cxx 
b/codemaker/source/cppumaker/cppuoptions.cxx
index 3e70b68..1308803 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -327,7 +327,7 @@ OString CppuOptions::prepareHelp()
 help += "-L = UNO type functions are generated lightweight, 
that means only\n";
 help += " the name and typeclass are given and everything 
else is retrieved\n";
 help += " from the type library dynamically. The default 
is that UNO type\n";
-help += " functions provides enough type information for 
boostrapping C++.\n";
+help += " functions provides enough type information for 
bootstrapping C++.\n";
 help += " '-L' should be the default for external 
components.\n";
 help += "-C = UNO type functions are generated comprehensive 
that means all\n";
 help += " necessary information is available for bridging 
the type in UNO.\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: registry and extension problems on master 4.3 Linux 64bit

[Alex Thurgood]

Le 16/12/2013 09:59, Stephan Bergmann a écrit :

Hi Stephan,
> 
> When does that output appear?  When starting instdir/program/soffice?

Yes, when starting from console with instdir/program/soffice


> What is your autogen.input?

--with-help
--enable-dbgutil
--enable-vlc
--disable-gstreamer-0-10
--enable-ext-mariadb-connector
--with-system-mariadb
--enable-bundle-mariadb
--without-system-mysql-cppconn
--enable-ext-diagram
--enable-extra-gallery
--enable-extra-template
--enable-ext-google-docs
--enable-ext-nlpsolver
--enable-extra-sample
--enable-ext-wiki-publisher
--enable-ext-barcode



Alex

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

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.cxx |   33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

New commits:
commit 64dc8acbf13eff6d52056a9464bba550651dce95
Author: Miklos Vajna 
Date:   Tue Dec 17 11:31:07 2013 +0100

DocxSdrExport: there is no DML syntax for watermarks

At least what we wrote previously is not accepted by Word and even Word
2013 writes watermarks as VML-only.

This fixes testWatermark in CppunitTest_sw_ooxmlexport when DML export is
enabled in non-experimental mode.

Change-Id: I231014dd7ad60b5a4b0d79e76cdc3386641af032

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 57affcf..8b6a2bd 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -351,20 +351,31 @@ void DocxSdrExport::Impl::writeDMLDrawing(const 
SdrObject* pSdrObject, const SwF
 
 void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const 
SwFrmFmt& rFrmFmt,const Point& rNdTopLeft, int nAnchorId)
 {
-m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, 
FSEND);
+// Depending on the shape type, we actually don't write the shape as DML.
+OUString sShapeType;
+sal_uInt32 nMirrorFlags = 0;
+uno::Reference 
xShape(const_cast(sdrObj)->getUnoShape(), uno::UNO_QUERY_THROW);
+MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType(xShape, 
nMirrorFlags, sShapeType);
 
-const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj);
-m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Choice,
-   XML_Requires, (pObjGroup ? "wpg" : 
"wps"),
-   FSEND);
-m_pImpl->writeDMLDrawing(sdrObj, &rFrmFmt, nAnchorId);
-m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice);
+if (eShapeType != ESCHER_ShpInst_TextPlainText)
+{
+m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, 
FSEND);
+
+const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj);
+m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Choice,
+   XML_Requires, (pObjGroup ? 
"wpg" : "wps"),
+   FSEND);
+m_pImpl->writeDMLDrawing(sdrObj, &rFrmFmt, nAnchorId);
+m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice);
 
-m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
-writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
-m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback);
+m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
+writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
+m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback);
 
-m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
+m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent);
+}
+else
+writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
 }
 
 void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const Size& size)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/hsqldb/HUser.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit edbbc471bcd9db9b366c32e9d16d965460cd3960
Author: Lionel Elie Mamane 
Date:   Tue Dec 17 12:14:15 2013 +0100

HSQLDB: correct syntax of change password from MySQL to HSQLDB

Change-Id: Iacf60c456912f2e38c7a082e48c45164e79c1097

diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx 
b/connectivity/source/drivers/hsqldb/HUser.cxx
index 0dfcd2c..e1c2a75 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -272,10 +272,13 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& 
/*oldPassword*/, const
 
 Reference xMeta = m_xConnection->getMetaData();
 
-OUString sAlterPwd = "SET PASSWORD FOR " +
-::dbtools::quoteName(xMeta->getIdentifierQuoteString(), m_Name) +
-"@\"%\" = PASSWORD('" + newPassword + "')";
+if( m_Name != xMeta->getUserName() )
+{
+::dbtools::throwGenericSQLException("HSQLDB can only change password 
of the current user.", *this);
+}
 
+OUString sAlterPwd = "SET PASSWORD " +
+::dbtools::quoteName(xMeta->getIdentifierQuoteString(), newPassword);
 
 Reference xStmt = m_xConnection->createStatement();
 if ( xStmt.is() )
commit 9203ae338fdbcaf614be8436172e05a24fd7d754
Author: Lionel Elie Mamane 
Date:   Tue Dec 17 12:00:46 2013 +0100

HSQLDB: quote usernames

Change-Id: I8384920bc55dafb2cc6581fe82f38d4e2659cc3d

diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx 
b/connectivity/source/drivers/hsqldb/HUser.cxx
index 297591e..0dfcd2c 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -229,7 +229,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& 
objName, sal_Int32 obj
 Reference xMeta = m_xConnection->getMetaData();
 OUString sGrant = "GRANT " +  sPrivs +
 " ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
-" TO " + m_Name;
+" TO " + ::dbtools::quoteName(xMeta->getIdentifierQuoteString(), 
m_Name);
 
 Reference xStmt = m_xConnection->createStatement();
 if(xStmt.is())
@@ -255,7 +255,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& 
objName, sal_Int32 ob
 Reference xMeta = m_xConnection->getMetaData();
 OUString sGrant = "REVOKE " + sPrivs +
 " ON " + 
::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation) +
-" FROM " + m_Name;
+" FROM " + ::dbtools::quoteName(xMeta->getIdentifierQuoteString(), 
m_Name);
 
 Reference xStmt = m_xConnection->createStatement();
 if(xStmt.is())
@@ -269,8 +269,12 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& 
/*oldPassword*/, const
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
+
+Reference xMeta = m_xConnection->getMetaData();
+
 OUString sAlterPwd = "SET PASSWORD FOR " +
-m_Name + "@\"%\" = PASSWORD('" + newPassword + "')";
+::dbtools::quoteName(xMeta->getIdentifierQuoteString(), m_Name) +
+"@\"%\" = PASSWORD('" + newPassword + "')";
 
 
 Reference xStmt = m_xConnection->createStatement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Caolán McNamara]

 cui/source/dialogs/cuigaldlg.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 4e89311f5c863d667ea69d4c074f7409f5563dab
Author: Caolán McNamara 
Date:   Tue Dec 17 11:48:50 2013 +

fix deadlock on pressing cancel in find files for gallery

progress thread blocked on solarmutex
press cancel in main thread which has solarmutex locked
call terminate
call join, which waits for thread to finish, which it can't
because its waiting on the locked solarmutex

so...
just call terminate on cancel. Let the thread get the solarmutex
and do its last round of work, at which point it will exit and post
an event to the main thread to call Cleanup, put the join there
instead and which point we know the progress thread is finished and
has no more interest in the solarmutex.

Change-Id: Ibe3976377288ac76b1b37c875a32e20b8d5daae1

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index be45aed..a81dbd8 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -221,10 +221,8 @@ SearchProgress::SearchProgress( Window* pParent, const 
INetURLObject& rStartURL
 
 void SearchProgress::Terminate()
 {
-if (maSearchThread.is()) {
+if (maSearchThread.is())
 maSearchThread->terminate();
-maSearchThread->join();
-}
 }
 
 // 
@@ -239,7 +237,11 @@ IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
 
 IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
 {
+if (maSearchThread.is())
+maSearchThread->join();
+
 EndDialog( RET_OK );
+
 delete this;
 return 0L;
 }
@@ -353,10 +355,8 @@ TakeProgress::TakeProgress( Window* pWindow ) :
 
 void TakeProgress::Terminate()
 {
-if (maTakeThread.is()) {
+if (maTakeThread.is())
 maTakeThread->terminate();
-maTakeThread->join();
-}
 }
 
 // 
@@ -371,6 +371,9 @@ IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
 
 IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
 {
+if (maTakeThread.is())
+maTakeThread->join();
+
 TPGalleryThemeProperties*   mpBrowser = (TPGalleryThemeProperties*) 
GetParent();
 ::std::vector >   aRemoveEntries( 
mpBrowser->aFoundList.size(), false );
 ::std::vector< OUString >   aRemainingVector;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl sal/workben sdext/source sd/source toolkit/source ucb/source vcl/generic

[Jelle van der Waa]

 sal/osl/unx/system.c  |3 ---
 sal/workben/measure_oustrings.cxx |2 --
 sd/source/ui/dlg/filedlg.cxx  |4 
 sdext/source/pdfimport/pdfparse/pdfparse.cxx  |   12 +++-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |8 ++--
 toolkit/source/awt/vclxtabpagecontainer.cxx   |2 --
 toolkit/source/awt/vclxtabpagemodel.cxx   |2 --
 toolkit/source/awt/vclxwindows.cxx|4 
 ucb/source/ucp/webdav-neon/NeonUri.cxx|7 ---
 ucb/source/ucp/webdav/SerfUri.cxx |4 
 vcl/generic/print/genprnpsp.cxx   |6 --
 11 files changed, 5 insertions(+), 49 deletions(-)

New commits:
commit 417c85bf582e0d1dbabb7b0f16d60a394d537e61
Author: Jelle van der Waa 
Date:   Mon Dec 16 22:27:05 2013 +0100

fdo#72598 Remove SunStudio cruft from code base

Change-Id: I6f75d0df0ddafc892fef0ce1bfdcdd6c70151afc
Reviewed-on: https://gerrit.libreoffice.org/7104
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 23e4f8c..a50996a 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -305,9 +305,6 @@ int osl_isSingleCPU = 0;
 #if defined(_SC_NPROCESSORS_CONF) /* i.e. MACOSX for Intel doesn't have this */
 #if defined(__GNUC__)
 void osl_interlockedCountCheckForSingleCPU(void)  __attribute__((constructor));
-#elif defined(__SUNPRO_C)
-void osl_interlockedCountCheckForSingleCPU(void);
-#pragma init (osl_interlockedCountCheckForSingleCPU)
 #endif
 
 void osl_interlockedCountCheckForSingleCPU(void)
diff --git a/sal/workben/measure_oustrings.cxx 
b/sal/workben/measure_oustrings.cxx
index 2baf92f..8372f49 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -33,8 +33,6 @@ int COUNT = 1000;
 
 #ifdef HAVE_CXX_Ox
 #  define SAL_DECLARE_UTF16(str) u ## str
-#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550)
-#  define SAL_DECLARE_UTF16(str) U ## str
 #elif __SIZEOF_WCHAR_T__ == 2
 #  define SAL_DECLARE_UTF16(str) L ## str
 #endif
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ce3eb29..24afe3c 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -49,10 +49,6 @@
 class SdFileDialog_Imp : public sfx2::FileDialogHelper
 {
 private:
-#if defined __SUNPRO_CC
-using sfx2::FileDialogHelper::Execute;
-#endif
-
 friend class SdOpenSoundFileDialog;
 
 css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess >   
mxControlAccess;
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx 
b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 69aa4d8..ec8b643 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -18,9 +18,7 @@
  */
 
 
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
@@ -38,9 +36,7 @@
 #include 
 
 // disable warnings again because someone along the line has enabled them
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
@@ -681,9 +677,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
 #endif // WIN32
 }
 
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index b4b66a3..7f14192 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -27,9 +27,7 @@
 
 #include 
 
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
@@ -44,9 +42,7 @@
 #include "UTF8.h"
 #endif
 
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 47447d4..12d7af6 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -50,9 +50,7 @@ VCLXTabPageContainer::VCLXTabPageContainer() :
 
 VCLXTabPageContainer::~VCLXTabPageContainer()
 {
-#ifndef __SUNPRO_CC
 OSL_TRACE ("%s", __FUNCTION__);
-#endif
 }
 
 void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) 
throw(RuntimeException)
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx 
b/toolkit/source/awt/vclxtabpagemodel.cxx
index 3f0e0d2..51756ed 100644
--- a/toolkit/source/awt/vclxtabpagemodel.cxx
+++ b/toolkit/source/awt/vclxtabpagemodel.cxx
@@ -34,9 +34,7 @@ VCLXTabPageModel::VCLXTabPageModel()
 
 VCLXTabPageModel::~VCLXTabPageModel()
 {
-#ifndef __SUNPRO_CC
 OSL_TRACE ("%

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=72598

--- Comment #4 from Commit Notification 
 ---
Jelle van der Waa committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=417c85bf582e0d1dbabb7b0f16d60a394d537e61

fdo#72598 Remove SunStudio cruft from code base



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - desktop/test mysqlc/source odk/examples odk/settings sc/source

[Tor Lillqvist]

 desktop/test/deployment/active/active_native.cxx   
|7 +++
 desktop/test/deployment/passive/passive_native.cxx 
|7 +++
 mysqlc/source/mysqlc_services.cxx  
|7 +++
 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
  |8 
 odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx 
|7 +++
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx 
|7 +++
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
 |7 +++
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |7 +++
 odk/examples/DevelopersGuide/examples.html 
|4 ++--
 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h   
|9 +++--
 odk/examples/cpp/complextoolbarcontrols/exports.cxx
|7 +++
 odk/examples/cpp/counter/counter.cxx   
|8 
 odk/examples/cpp/custompanel/ctp_services.cxx  
|8 
 odk/examples/cpp/remoteclient/remoteclient.cxx 
|8 
 odk/settings/component.uno.def 
|1 +
 sc/source/core/tool/formulagroup.cxx   
|2 ++
 16 files changed, 96 insertions(+), 8 deletions(-)

New commits:
commit deb46c8ad376896d191ad96791ae1eebc2ffa3b7
Author: Tor Lillqvist 
Date:   Tue Nov 26 10:08:11 2013 +0200

WaE: unused parameter 'bForceEvaluation'

Change-Id: I402ccfa2e24240347985d9fda7adf4e2c01712fd
(cherry picked from commit b9b8e26aa0ff86b131c9da84f33ee3ce397104d6)

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index 9f386e1..3909bca 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -651,6 +651,8 @@ bool FormulaGroupInterpreter::switchOpenCLDevice(const 
OUString& rDeviceId, bool
 return bSuccess;
 #endif
 }
+#else
+(void) bForceEvaluation;
 #endif
 return false;
 }
commit fbfab3614df6ba2a547d872191bf21a511307f0a
Author: Stephan Bergmann 
Date:   Tue Dec 17 10:53:29 2013 +0100

Keep using component_getImplementationEnvironment in extensions

...instead of relying on the implicit CPPU_CURRENT_LANGUAGE_BINDING_NAME
convention.  Keeping that convention an implementation detail makes it 
easier to
do improvements in the future.  (Theoretically, the bundled extension in 
mysqlc
could be considered internal code and not adapted, but just be safe.)

(cherry picked from commit fa2a7c1c95f78d20ed572091e12700fd4d852835)
Conflicts:
desktop/test/deployment/active/active_native.cxx

Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 2242c6b..b11d4de 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -252,6 +252,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
component_getFactory(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
 extern "C" sal_Bool SAL_CALL component_writeInfo(
 void * pServiceManager, void * pRegistryKey)
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 93af8ab..8714690 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -249,4 +249,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
component_getFactory(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_services.cxx 
b/mysqlc/source/mysqlc_services.cxx
index af1cabe..0ffe9cd 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace connectivity::mysqlc;
 using ::com::sun::star::uno::Reference;
@@ -102,6 +103,12 @@ extern "C" SAL

[Libreoffice-commits] core.git: configure.ac

[Douglas Mencken]

 configure.ac |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 877f7e6eaee9d7da176d02b06dee9847cc332d13
Author: Douglas Mencken 
Date:   Thu Dec 12 08:08:22 2013 -0500

Add check for touch -h to configure.ac

Change-Id: I53c452dac9cef64fce9a3e7e28956efe95fc4c24
Reviewed-on: https://gerrit.libreoffice.org/7046
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/configure.ac b/configure.ac
index a7c8c80..687965c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9948,6 +9948,15 @@ if test $build_os = cygwin; then
 fi
 
 dnl ===
+dnl We need touch with -h option support.
+dnl ===
+AC_PATH_PROG(TOUCH, touch)
+test -z "$TOUCH" && AC_MSG_ERROR([touch is required])
+if ! "$TOUCH" -h /dev/null 2>/dev/null > /dev/null; then
+AC_MSG_ERROR([touch version with -h option support is required to build, 
please install it and make sure it is the one found first in PATH],,)
+fi
+
+dnl ===
 dnl Test which vclplugs have to be built.
 dnl ===
 R=""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk vcl/source

[Caolán McNamara]

 cui/UIConfig_cui.mk  |1 
 cui/source/dialogs/cuigaldlg.cxx |   19 +---
 cui/source/dialogs/gallery.src   |   41 
 cui/source/inc/cuigaldlg.hxx |   13 +-
 cui/source/inc/gallery.hrc   |5 -
 cui/source/inc/helpid.hrc|1 
 cui/uiconfig/ui/gallerysearchprogress.ui |  142 +++
 vcl/source/control/fixed.cxx |   11 ++
 8 files changed, 168 insertions(+), 65 deletions(-)

New commits:
commit bd225bc2b8e0c46a2aa0e7366211452439caa622
Author: Caolán McNamara 
Date:   Tue Dec 17 11:59:11 2013 +

convert gallery search progress dialog to .ui

Change-Id: I77d9530ebc6529d87e2484c8440794e246aab5b9

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8101925..1ae0d83 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/dbregisterpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/formatcellsdialog \
+   cui/uiconfig/ui/gallerysearchprogress \
cui/uiconfig/ui/gallerythemeiddialog \
cui/uiconfig/ui/gallerytitledialog \
cui/uiconfig/ui/hangulhanjaadddialog \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a81dbd8..b49e8a5 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -204,17 +204,16 @@ void SearchThread::ImplSearch( const INetURLObject& 
rStartURL,
 // - SearchProgress -
 // --
 
-SearchProgress::SearchProgress( Window* pParent, const INetURLObject& 
rStartURL ) :
-ModalDialog ( pParent, CUI_RES(RID_SVXDLG_GALLERY_SEARCH_PROGRESS ) ),
-aFtSearchDir( this, CUI_RES( FT_SEARCH_DIR ) ),
-aFLSearchDir   ( this, CUI_RES( FL_SEARCH_DIR ) ),
-aFtSearchType   ( this, CUI_RES( FT_SEARCH_TYPE ) ),
-aFLSearchType  ( this, CUI_RES( FL_SEARCH_TYPE ) ),
-aBtnCancel  ( this, CUI_RES( BTN_CANCEL ) ),
-parent_(pParent), startUrl_(rStartURL)
+SearchProgress::SearchProgress( Window* pParent, const INetURLObject& 
rStartURL )
+: ModalDialog(pParent, "GallerySearchProgress", 
"cui/ui/gallerysearchprogress.ui")
+, parent_(pParent)
+, startUrl_(rStartURL)
 {
-FreeResource();
-aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
+get(m_pFtSearchDir, "dir");
+get(m_pFtSearchType, "file");
+
m_pFtSearchType->set_width_request(m_pFtSearchType->get_preferred_size().Width());
+get(m_pBtnCancel, "cancel");
+m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
 }
 
 // 
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index cba3d94..a80d604 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -219,47 +219,6 @@ TabPage RID_SVXTABPAGE_GALLERYTHEME_FILES
 
 
/**/
 
-ModalDialog RID_SVXDLG_GALLERY_SEARCH_PROGRESS
-{
-HelpId = HID_GALLERY_SEARCH ;
-OutputSize = TRUE ;
-Border = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 124 , 86 ) ;
-Text [ en-US ] = "Find" ;
-Moveable = TRUE ;
-FixedLine FL_SEARCH_DIR
-{
-Pos = MAP_APPFONT ( 6 , 33 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "Directory" ;
-};
-FixedText FT_SEARCH_DIR
-{
-Pos = MAP_APPFONT ( 12 , 44 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 37 , 66 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-FixedLine FL_SEARCH_TYPE
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 112 , 8 ) ;
-Text [ en-US ] = "File type" ;
-};
-FixedText FT_SEARCH_TYPE
-{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-};
-};
-
-/**/
-
 ModalDialog RID_SVXDLG_GALLERY_TAKE_PROGRESS
 {
 HelpId = HID_GALLERY_APPLY ;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 67d2f9e..2e8d829 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -80,12 +80,9 @@ public:
 class SearchProgress : public ModalDialog
 {
 private:
-
-FixedText   aFtSearchDir;
-FixedLine   aFLSearchDir;
-FixedText   aFtSearchType;
-FixedLine   aFLSearchType;
-CancelButtonaBtnCancel;
+FixedText*  m_pFtSearchDir;
+FixedText*  m_pFtSearchType;
+CancelButton*   m_pBtnCancel;
 Window * parent_;
 INetURLObject startUrl_;
 rtl::Reference< SearchThread > maSearchThread;
@@ -101,8 +98,8 @@ public:
 
 virtual short   Execute();
 virtual void

[Libreoffice-commits] core.git: configure.ac

[Douglas Mencken]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa66ae3a739594da13fb78638ef98a2c8cc5ed2e
Author: Douglas Mencken 
Date:   Thu Dec 12 08:48:15 2013 -0500

Bump curl version check to 7.19.4 in configure.ac

Constants CURLPROTO_HTTP, CURLPROTO_HTTPS, ... have been introduced in curl 
7.19.4.
With current requirement (>= 7.13.1), we would get build errors like
  "cmis/src/libcmis/base-session.cxx:841: error: CURLOPT_PROTOCOLS was not 
declared in this scope"
in cases of using curl < 7.19.4.

Change-Id: Ifa6c56fc71715cceb19d30bb2d6f48f0b1dbd7da
Reviewed-on: https://gerrit.libreoffice.org/7050
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/configure.ac b/configure.ac
index 687965c..0c58a9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8675,12 +8675,12 @@ if test "$with_system_curl" = "yes"; then
 curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
 fi
 
-AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
+AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
 
 case $curl_version in
 dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
 dnl so they need to be doubled to end up in the configure script
-7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
+7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
 AC_MSG_RESULT([yes, you have $curl_version])
 ;;
 *)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac ios/CustomTarget_Lo_Xcconfig.mk ios/lo.xcconfig.in

[Tor Lillqvist]

 configure.ac|   13 +++--
 ios/CustomTarget_Lo_Xcconfig.mk |   12 +---
 ios/lo.xcconfig.in  |   12 +++-
 3 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 13b73d94dc2f6fc707e94eb58aee449494128d82
Author: Tor Lillqvist 
Date:   Tue Dec 17 14:13:35 2013 +0200

Pass also Xcode's ARCHS, OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS in 
lo.xcconfig

ARCHS tells Xcode to build the architecture for which the LO code has
been built. The CFLAGS properties make sure the same -D flags are used
as for the LO code.

Change-Id: I3c8af0ff9fba7d0b4eddbc0af9aad44fb385314c

diff --git a/configure.ac b/configure.ac
index 0c58a9c..ab86c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2973,10 +2973,10 @@ if test $_os = iOS; then
 
 if test "$enable_ios_simulator" = yes; then
 if test "$BITNESS_OVERRIDE" = 64; then
-arch=x86_64
+XCODE_ARCHS=x86_64
 versionmin=-mios-simulator-version-min=7.0
 else
-arch=i386
+XCODE_ARCHS=i386
 case $sdkver in
 7.*)
 versionmin=-mios-simulator-version-min=6.1
@@ -2989,10 +2989,10 @@ if test $_os = iOS; then
 else
 platform=iPhoneOS
 if test "$BITNESS_OVERRIDE" = 64; then
-arch=arm64
+XCODE_ARCHS=arm64
 versionmin=-miphoneos-version-min=7.0
 else
-arch=armv7
+XCODE_ARCHS=armv7
 versionmin=-miphoneos-version-min=6.1
 fi
 fi
@@ -3023,8 +3023,8 @@ if test $_os = iOS; then
 
 stdlib="-stdlib=$XCODE_CLANG_CXX_LIBRARY"
 
-CC="`xcrun -find clang` -arch $arch -fvisibility=hidden -isysroot $sysroot 
$lto $versionmin"
-CXX="`xcrun -find clang++` -arch $arch -fvisibility=hidden $stdlib 
-isysroot $sysroot $lto $versionmin"
+CC="`xcrun -find clang` -arch $XCODE_ARCHS -fvisibility=hidden -isysroot 
$sysroot $lto $versionmin"
+CXX="`xcrun -find clang++` -arch $XCODE_ARCHS -fvisibility=hidden $stdlib 
-isysroot $sysroot $lto $versionmin"
 
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
 AR=`xcrun -find ar`
@@ -3035,6 +3035,7 @@ if test $_os = iOS; then
 fi
 
 AC_SUBST(XCODE_CLANG_CXX_LIBRARY)
+AC_SUBST(XCODE_ARCHS)
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk
index b6032da..31a6973 100644
--- a/ios/CustomTarget_Lo_Xcconfig.mk
+++ b/ios/CustomTarget_Lo_Xcconfig.mk
@@ -15,10 +15,16 @@ $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig): 
$(LO_XCCONFIG)
 .PHONY : $(LO_XCCONFIG)
 
 $(LO_XCCONFIG) :
-# Edit in the list of all our (static) libs in the Xcode
-# configuration file.
+# Edit the Xcode configuration file:
+# - the list of all our (static) libs
+# - compiler flags
+#
all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \
-   sed -e "s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|" < $(LO_XCCONFIG) > 
$(LO_XCCONFIG).new && mv $(LO_XCCONFIG).new $(LO_XCCONFIG)
+   \
+   sed -e "s,^\(LINK_LDFLAGS =\).*$$,\1 $$all_libs," \
+   -e "s,^\(OTHER_CFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \
+   -e "s,^\(OTHER_CPLUSPLUSFLAGS =\).*$$,\1 $(gb_GLOBALDEFS)," \
+   < $(LO_XCCONFIG) > $(LO_XCCONFIG).new && mv 
$(LO_XCCONFIG).new $(LO_XCCONFIG)
 
 # When SRCDIR!=BUILDDIR, Xcode is used on the project in the
 # *source* tree (because that is where the source files are). Copy
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index c63e13c..3f654ed 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -6,7 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-// Xcode configuration variables
+// Xcode configuration properties
 
 // To avoid confusion, the LO-specific ones that aren't as such used
 // by Xcode (but only expanded in option values) are prefixed with
@@ -17,11 +17,13 @@ LO_INSTDIR = @INSTDIR@
 LO_SRCDIR = @SRC_ROOT@
 LO_WORKDIR = @WORKDIR@
 
-// The value of this variable is inserted in
-// CustomTarget_MobileLibreOffice_app.mk.
-LINK_LDFLAGS =
-
 // These are actual Xcode-known settings. The corresponding autoconf
 // variables are prefixed with XCODE_ to make it clear in configure.ac
 // what they will be used for.
+ARCHS = @XCODE_ARCHS@
 CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
+
+// These settings are edited in CustomTarget_Lo_Xcconfig.mk.
+LINK_LDFLAGS =
+OTHER_CFLAGS =
+OTHER_CPLUSPLUSFLAGS =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - cmake/CheckCXXSourcefileCompiles.cmake cmake/CheckCXXTypeExists.cmake cmake/CheckCXXTypeExists.cpp.in cmake/have_casts.cpp cmake/have_namesp

[Bernhard Sessler]

 CMakeLists.txt |   27 ++
 cmake/CheckCXXSourcefileCompiles.cmake |   80 
 cmake/CheckCXXTypeExists.cmake |   32 
 cmake/CheckCXXTypeExists.cpp.in|6 +
 cmake/PlatformChecks.cmake |  120 ++
 cmake/Versioning.cmake |   29 +++
 cmake/have_casts.cpp   |6 +
 cmake/have_namespaces.cpp  |   13 +++
 cmake/have_rtti.cpp|9 ++
 cmake/string_compare_signature.cpp |   11 ++
 include/CMakeLists.txt |5 +
 include/config-auto.h.in   |  128 +
 include/cppunit/TestAssert.h   |2 
 src/CMakeLists.txt |1 
 src/cppunit/CMakeLists.txt |   86 ++
 15 files changed, 554 insertions(+), 1 deletion(-)

New commits:
commit 5bccf02b2c4fd4fc3366d600f0eadbaa9f1d0b47
Author: Bernhard Sessler 
Date:   Fri Nov 29 08:44:04 2013 +0100

Add CMake build system for cppunit library

Change-Id: I2a4b0c1469509a7239b425ca133efd0d979f1d82
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7111
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000..7b386ce
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Project setup
+project(cppunit C CXX)
+cmake_minimum_required(VERSION 2.8.7)
+
+# Add project specific CMake module path
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+# Perform platform and compiler feature checks
+include(PlatformChecks)
+
+# Versioning
+include(Versioning)
+
+# Build options
+option(BUILD_SHARED_LIBS "Build cppunit as shared or static library" ON)
+
+if(BUILD_SHARED_LIBS)
+add_definitions(-DCPPUNIT_BUILD_DLL)
+endif()
+
+# Include paths
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
+
+# Subdirectories
+add_subdirectory(include)
+add_subdirectory(src)
diff --git a/cmake/CheckCXXSourcefileCompiles.cmake 
b/cmake/CheckCXXSourcefileCompiles.cmake
new file mode 100644
index 000..254c1f3
--- /dev/null
+++ b/cmake/CheckCXXSourcefileCompiles.cmake
@@ -0,0 +1,80 @@
+# - Check if given C++ source in the specified file compiles and links into an 
executable
+# CHECK_CXX_SOURCEFILE_COMPILES(  [FAIL_REGEX ])
+# - source file to try to compile, must define 'main'
+#  - variable to store whether the source code compiled
+#   - fail if test output matches this regex
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+macro(CHECK_CXX_SOURCEFILE_COMPILES SOURCEFILE VAR)
+  if("${VAR}" MATCHES "^${VAR}$")
+set(_FAIL_REGEX)
+set(_key)
+foreach(arg ${ARGN})
+  if("${arg}" MATCHES "^(FAIL_REGEX)$")
+set(_key "${arg}")
+  elseif(_key)
+list(APPEND _${_key} "${arg}")
+  else()
+message(FATAL_ERROR "Unknown argument:\n  ${arg}\n")
+  endif()
+endforeach()
+
+if(NOT EXISTS ${SOURCEFILE})
+message(FATAL_ERROR "Could not find file ${SOURCEFILE}")
+endif()
+
+set(MACRO_CHECK_FUNCTION_DEFINITIONS
+  "-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
+if(CMAKE_REQUIRED_LIBRARIES)
+  set(CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES
+LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+else()
+  set(CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES)
+endif()
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES
+"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+else()
+  set(CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES)
+endif()
+
+message(STATUS "Performing Test ${VAR}")
+try_compile(${VAR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${SOURCEFILE}
+  COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+  ${CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES}
+  CMAKE_FLAGS 
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+  "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}"
+  OUTPUT_VARIABLE OUTPUT)
+
+foreach(_regex ${_FAIL_REGEX})
+  if("${OUTPUT}" MATCHES "${_regex}")
+set(${VAR} 0)
+  endif()
+endforeach()
+
+if(${VAR})
+  set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
+  message(STATUS "Performing Test ${VAR} - Success")
+  file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+"Performing C++ SOURCE FILE Test ${VAR} succeded with the following 
output:\n"
+"${OUTPUT}\n"
+"Source file was:\n${SOURCEFILE}\n")
+else()
+  message(STATUS "Performing Te

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - cmake/ExportTargets.cmake CMakeLists.txt cppunitConfig.cmake.in cppunitConfigVersion.cmake.in src/cppunit

[Bernhard Sessler]

 CMakeLists.txt|5 -
 cmake/ExportTargets.cmake |   21 +
 cppunitConfig.cmake.in|   27 +++
 cppunitConfigVersion.cmake.in |   10 ++
 src/cppunit/CMakeLists.txt|1 +
 5 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 0c417c4a933ec390da1f315079abbfacd2be3806
Author: Bernhard Sessler 
Date:   Wed Dec 4 12:45:19 2013 +0100

cmake: Use target export feature

This eliminates the need for a "Findcppunit.cmake" script in projects
needing the cppunit library. The project configuration files are
installed along with the library itself and provide information about
where to find the library and how to use it.
A prominent example of this method are the Qt5 libraries, which are
shipping CMake project configuration files by default.

Change-Id: I9db4f07d4a56361215eb68d9080955fede8eb205
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7112
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b386ce..a43fe1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ include(Versioning)
 # Build options
 option(BUILD_SHARED_LIBS "Build cppunit as shared or static library" ON)
 
-if(BUILD_SHARED_LIBS)
+if(BUILD_SHARED_LIBS AND WIN32)
 add_definitions(-DCPPUNIT_BUILD_DLL)
 endif()
 
@@ -25,3 +25,6 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
 # Subdirectories
 add_subdirectory(include)
 add_subdirectory(src)
+
+# Export targets
+include(ExportTargets)
diff --git a/cmake/ExportTargets.cmake b/cmake/ExportTargets.cmake
new file mode 100644
index 000..4affeb4
--- /dev/null
+++ b/cmake/ExportTargets.cmake
@@ -0,0 +1,21 @@
+# Export targets
+if(WIN32 AND NOT CYGWIN)
+set(INSTALL_CMAKE_DIR CMake)
+else()
+set(INSTALL_CMAKE_DIR lib/cmake/cppunit)
+endif()
+
+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR
+"${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}"
+"${CMAKE_INSTALL_PREFIX}/include")
+configure_file(cppunitConfig.cmake.in
+"${PROJECT_BINARY_DIR}/cppunitConfig.cmake" @ONLY)
+configure_file(cppunitConfigVersion.cmake.in
+"${PROJECT_BINARY_DIR}/cppunitConfigVersion.cmake" @ONLY)
+
+install(FILES
+"${PROJECT_BINARY_DIR}/cppunitConfig.cmake"
+"${PROJECT_BINARY_DIR}/cppunitConfigVersion.cmake"
+DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+
+install(EXPORT cppunitLibraryDepends DESTINATION "${INSTALL_CMAKE_DIR}")
diff --git a/cppunitConfig.cmake.in b/cppunitConfig.cmake.in
new file mode 100644
index 000..a83550a
--- /dev/null
+++ b/cppunitConfig.cmake.in
@@ -0,0 +1,27 @@
+# - CMake config file for cppunit
+# It defines the following variables
+#  CPPUNIT_INCLUDE_DIRS - include directories for cppunit
+#  CPPUNIT_LIBRARY  - the cppunit base library
+#  CPPUNIT_LIBRARIES- all of the cppunit libraries to link against
+#  CPPUNIT_FOUND- the cppunit library has been found
+
+if(NOT TARGET cppunit AND NOT cppunit_BINARY_DIR)
+# Compute paths
+get_filename_component(CPPUNIT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(CPPUNIT_INCLUDE_DIR
+"${CPPUNIT_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@"
+ABSOLUTE)
+
+# Add the targets and dependencies
+include("${CPPUNIT_CMAKE_DIR}/cppunitLibraryDepends.cmake")
+
+get_target_property(_cppunit_lib_type cppunit TYPE)
+if(${_cppunit_lib_type} EQUAL SHARED_LIBRARY AND WIN32)
+add_definitions(-DCPPUNIT_DLL)
+endif()
+
+set(CPPUNIT_FOUND TRUE)
+set(CPPUNIT_LIBRARY cppunit)
+set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})
+message(STATUS "Found cppunit - version: @CPPUNIT_VERSION@")
+endif()
diff --git a/cppunitConfigVersion.cmake.in b/cppunitConfigVersion.cmake.in
new file mode 100644
index 000..eb9fb87
--- /dev/null
+++ b/cppunitConfigVersion.cmake.in
@@ -0,0 +1,10 @@
+set(PACKAGE_VERSION "@CPPUNIT_VERSION@")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+set(PACKAGE_VERSION_COMPATIBLE TRUE)
+if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+set(PACKAGE_VERSION_EXACT TRUE)
+endif()
+endif()
diff --git a/src/cppunit/CMakeLists.txt b/src/cppunit/CMakeLists.txt
index 27a1e18..6dbb6dd 100644
--- a/src/cppunit/CMakeLists.txt
+++ b/src/cppunit/CMakeLists.txt
@@ -81,6 +81,7 @@ endif()
 
 # Create install target
 install(TARGETS cppunit
+EXPORT cppunitLibraryDepends
 LIBRARY DESTINATION lib
 ARCHIVE DESTINATION lib
 RUNTIME DESTINATION bin)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - 2 commits - cmake/have_default_template_args.cpp CMakeLists.txt cmake/PlatformChecks.cmake doc/CMakeLists.txt doc/Doxyfile.in include/config

[Bernhard Sessler]

 CMakeLists.txt|7 
 cmake/PlatformChecks.cmake|6 
 cmake/have_default_template_args.cpp  |   16 
 doc/CMakeLists.txt|   40 ++
 doc/Doxyfile.in   |  558 +-
 include/config-auto.h.in  |3 
 include/cppunit/Portability.h |   22 -
 include/cppunit/config/config-bcb5.h  |   47 --
 include/cppunit/config/config-evc4.h  |   57 ---
 include/cppunit/config/config-msvc6.h |   64 ---
 10 files changed, 362 insertions(+), 458 deletions(-)

New commits:
commit 8a91ac7749d7d2bb4e9b5790dc7474d82f88bee2
Author: Bernhard Sessler 
Date:   Wed Dec 4 16:37:58 2013 +0100

doc: Add support for generating the API documentation

Change-Id: I06db2d8a32f32c28047c7cf883f945d9bb7eb779
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7114
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a43fe1b..97baafe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,8 @@ include(PlatformChecks)
 include(Versioning)
 
 # Build options
-option(BUILD_SHARED_LIBS "Build cppunit as shared or static library" ON)
+option(BUILD_SHARED_LIBS"Build cppunit as shared or static library"
ON)
+option(CPPUNIT_BUILD_APIDOC "Adds a build target for generating the API 
documentation" OFF)
 
 if(BUILD_SHARED_LIBS AND WIN32)
 add_definitions(-DCPPUNIT_BUILD_DLL)
@@ -26,5 +27,9 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
 add_subdirectory(include)
 add_subdirectory(src)
 
+if(CPPUNIT_BUILD_APIDOC)
+add_subdirectory(doc)
+endif()
+
 # Export targets
 include(ExportTargets)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 000..08864b8
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Find required executables
+find_package(LATEX)
+find_package(Doxygen REQUIRED)
+
+# Add build options
+option(CPPUNIT_BUILD_APIDOC_ALWAYS "Always builds the documentation when 
building"OFF)
+option(CPPUNIT_INSTALL_APIDOC  "Installs the doxygen-generated 
documentation" OFF)
+if(LATEX_COMPILER)
+option(CPPUNIT_BUILD_APIDOC_LATEX "Generate LaTex API documentation"   
   OFF)
+endif()
+
+if(CPPUNIT_BUILD_APIDOC_LATEX)
+set(_CPPUNIT_GENERATE_LATEX "YES" CACHE INTERNAL "Variable for Doxyfile")
+else()
+set(_CPPUNIT_GENERATE_LATEX "NO" CACHE INTERNAL "Variable for Doxyfile")
+endif()
+
+if(DOXYGEN_DOT_FOUND)
+set(_CPPUNIT_USE_DOT "YES" CACHE INTERNAL "Variable for using the Graphviz 
dot tool")
+else()
+set(_CPPUNIT_USE_DOT "NO" CACHE INTERNAL "Variable for using the Graphviz 
dot tool")
+endif()
+
+# Setup config files
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
+   "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+
+if(CPPUNIT_BUILD_APIDOC_ALWAYS)
+set(_cppunit_apidoc_all "ALL")
+endif()
+
+add_custom_target(apidoc ${_cppunit_apidoc_all}
+COMMAND ${DOXYGEN_EXECUTABLE}
+${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+WORKING_DIRECTORY   ${cppunit_SOURCE_DIR}
+COMMENT "Generating HTML documentation")
+
+if(CPPUNIT_INSTALL_APIDOC)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cppunit DESTINATION 
share/doc)
+endif()
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 4398a64..f33e683 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -11,201 +11,201 @@
 # General configuration options
 #---
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project. 
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
 
 PROJECT_NAME  = CppUnit
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER= "Version @VERSION@"
+PROJECT_NUMBER= "Version @CPPUNIT_VERSION@"
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY  = .
+OUTPUT_DIRECTORY  = @CMAKE_CURRENT_BINARY_DIR@/cppunit
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-#

Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345

[Robinson Tryon]

Hi everyone,

Here are the final tallies from the voting:
https://wiki.documentfoundation.org/QA/Meetings/2013/December_16#PENDING_ITEM:_Bugzilla_Migration_etc.

blo (1)
libo (2)
lbz (3)
lob (3)
lo (6)
lobz (7)

-

Separated by just a single vote, lo and lobz are (unsurprisingly) the
favorites :-)

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

[Libreoffice-commits] core.git: Branch 'feature/datastreams' - 0 commits -

[Unknown]

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Cor Nouws  changed:

   What|Removed |Added

 Depends on||72788

--- Comment #38 from Cor Nouws  ---
add Bug 72788 - Clear direct formatting over more paragraphs freezes
LibreOffice

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345

[Joren DC]

Robinson Tryon schreef op 17/12/13 13:41:
> Hi everyone,
>
> Here are the final tallies from the voting:
> https://wiki.documentfoundation.org/QA/Meetings/2013/December_16#PENDING_ITEM:_Bugzilla_Migration_etc.
>
> blo (1)
> libo (2)
> lbz (3)
> lob (3)
> lo (6)
> lobz (7)
>
> -
>
> Separated by just a single vote, lo and lobz are (unsurprisingly) the
> favorites :-)
What about lbz, which is a combination of our 2 top-votes (lo and lobz)?
lbz was also one of the choises, but it looks like a golden midway
between the top votes :)?

Just my 2 cents

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

SEO Packages $99/Month- Year End Offer

[Krishna]

size="4">Hello, 


 

This is Krishna  
from SEO INFOTECH SOLUTUION wanting to let
you know that we are a Leading SEO & Web Development Company and one of  
the

very few companies which offer organic SEO Services with a full range of
supporting services. 

 

We aim to get  
your website higher rankings in major search

engines such as Google, Yahoo and Microsoft Bing. We constantly monitor your
website content for relevant keywords and block unwanted content being  
searched

and improve the visibility of your website in the internet. Implement a long
term SEO strategy for your website to appear Organic Search 

 

size="4">Results.


 

As part of our  
search optimization, we will correct
technical issues with your website to make it more search engine friendly.  
The
cost for search optimization for the site will be $99 a month We reduced  
this

charge keeping in mind the year end business target. 

 

We provide very  
detailed weekly reports that will allow you

to track our progress and our activities. 

 

If you are  
really interested to sign up with our discount
year end offer to garb the market, then please do let me know about the  
Website

name and keywords to start.

 

We are always  
open to discuss about the opportunity ahead. 


 

Thanks

Krishna  
Ganatayat


Business  
Development Manager 


Skype:  
dmi-tech23


Ph: 91:  
912-441-9800,+13106264717
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Makefile.in

[Stephan Bergmann]

 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 16b48021e12641fbba4320f70e06ae0462f1995f
Author: Stephan Bergmann 
Date:   Tue Dec 17 14:06:42 2013 +0100

Fix cross-compilation "make distclean"

diff --git a/Makefile.in b/Makefile.in
index cc8a982..4ac5c46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,6 +148,7 @@ distclean : clean compilerplugins-clean
 $(BUILDDIR)/aclocal.m4 \
 $(BUILDDIR)/autom4te.cache \
 $(BUILDDIR)/config.log \
+$(BUILDDIR)/config.Build.log \
 $(BUILDDIR)/config.status \
 $(BUILDDIR)/config_build.mk \
 $(BUILDDIR)/config_host.mk \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/shared

[Tor Lillqvist]

 ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h |   19 --
 1 file changed, 19 deletions(-)

New commits:
commit f4502a2f7f36c8dba9f76176cc761dd66b1a0e16
Author: Tor Lillqvist 
Date:   Tue Dec 17 15:10:03 2013 +0200

These get defined through lo.xcconfig now

Change-Id: I4d574b728aa0a60808bcfdd36c503476c226599a

diff --git a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h 
b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
index eac726c..9a12cd2 100644
--- a/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
+++ b/ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
@@ -26,28 +26,9 @@ static const BOOL
 #define LOG_RECT(RECT,NAME)  NSLog(@"%@: w:%d, h:%d, origin:(%d,%d)",NAME, 
(int) RECT.size.width, (int) RECT.size.height, (int) RECT.origin.x, (int) 
RECT.origin.y)
 #define IGNORE_ARG(X) ((void) X)
 
-#define ARM
-#define ARM32
-#define BOOST_DETAIL_NO_CONTAINER_FWD
 #define CPPU_ENV gcc3
-#define DBG_UTIL
-#define DISABLE_DYNLOADING
-#define DISABLE_SCRIPTING
-#define ENABLE_READONLY_INSTALLSET
-#define IOS
-#define LIBO_INTERNAL_ONLY
-#define NO_PTHREAD_PRIORITY
 #define OSL_DEBUG_LEVEL 1
-#define SAL_LOG_INFO
-#define SAL_LOG_WARN
-#define SUPD 410
-#define UNIX
-#define UNX
-#define _DEBUG
-#define _PTHREADS
-#define _REENTRANT
 #define RTL_USING
-#define SYSTEM_ZLIB
 #define HAVE_GCC_VISIBILITY_FEATURE
 
 #import "time.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

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

New commits:
commit 46fcde38cff5f99f98b8e2ca98e6908d647b0423
Author: Miklos Vajna 
Date:   Tue Dec 17 14:02:01 2013 +0100

DocxExport::OutputDML: fix export of shapes in headers

This is triggered by testVMLData in CppunitTest_sw_ooxmlexport when DML 
export
is enabled in non-experimental mode.

Change-Id: I5e157f75909d05fc18d9a8790839030f4056860d

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 051d841..7d5f63b 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -335,7 +335,7 @@ void DocxExport::OutputDML(uno::Reference& 
xShape)
 {
 uno::Reference xServiceInfo(xShape, 
uno::UNO_QUERY_THROW);
 bool bGroupShape = 
xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");
-oox::drawingml::ShapeExport aExport((bGroupShape ? XML_wpg : XML_wps), 
m_pDocumentFS, 0, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX, 
m_pAttrOutput);
+oox::drawingml::ShapeExport aExport((bGroupShape ? XML_wpg : XML_wps), 
m_pAttrOutput->GetSerializer(), 0, m_pFilter, 
oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
 aExport.WriteShape(xShape);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05fa566b17902f76343952fb8355d576208fd097
Author: Tor Lillqvist 
Date:   Tue Dec 17 15:31:24 2013 +0200

Touch a plain file and not /dev/null to avoid problem on Cygwin at least

Touch the "warn" file that we use to save warnings detected during
configury.

Change-Id: I44ad9a878f7768af6046337c0465e00061306dda

diff --git a/configure.ac b/configure.ac
index ab86c34..897aac8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9953,7 +9953,7 @@ dnl We need touch with -h option support.
 dnl ===
 AC_PATH_PROG(TOUCH, touch)
 test -z "$TOUCH" && AC_MSG_ERROR([touch is required])
-if ! "$TOUCH" -h /dev/null 2>/dev/null > /dev/null; then
+if ! "$TOUCH" -h warn 2>/dev/null > /dev/null; then
 AC_MSG_ERROR([touch version with -h option support is required to build, 
please install it and make sure it is the one found first in PATH],,)
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 236c0762c14cace93deae4175073519ef67e4b48
Author: Tor Lillqvist 
Date:   Tue Dec 17 15:41:54 2013 +0200

touch -h requires the file to exist, funnily enough

Change-Id: I38639236f9e7cc2ec8f4e4f9adc708822bc2f73d

diff --git a/configure.ac b/configure.ac
index 897aac8..69fb9eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9953,6 +9953,7 @@ dnl We need touch with -h option support.
 dnl ===
 AC_PATH_PROG(TOUCH, touch)
 test -z "$TOUCH" && AC_MSG_ERROR([touch is required])
+touch warn
 if ! "$TOUCH" -h warn 2>/dev/null > /dev/null; then
 AC_MSG_ERROR([touch version with -h option support is required to build, 
please install it and make sure it is the one found first in PATH],,)
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: Branch 'feature/cmake' - cmake/PlatformChecks.cmake include/config-auto.h.in src/cppunit

[Bernhard Sessler]

 cmake/PlatformChecks.cmake|2 ++
 include/config-auto.h.in  |3 +++
 src/cppunit/PlugInManager.cpp |   15 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit f8cd3430163bde5e8ade2a2245437710b2ec048d
Author: Bernhard Sessler 
Date:   Thu Dec 12 10:17:31 2013 +0100

src: Fix build with Borland C++ compiler

Change-Id: I0a182186c396f2e45bec76c83506f765f2462b3c
Signed-off-by: Bernhard Sessler 
Reviewed-on: https://gerrit.libreoffice.org/7115
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/cmake/PlatformChecks.cmake b/cmake/PlatformChecks.cmake
index 5d20bfe..d446586 100644
--- a/cmake/PlatformChecks.cmake
+++ b/cmake/PlatformChecks.cmake
@@ -121,6 +121,8 @@ if(CPPUNIT_HAVE_TYPEINFO)
   CPPUNIT_HAVE_RTTI)
 endif()
 
+set(CPPUNIT_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P} CACHE INTERNAL "Size of a 
void pointer")
+
 if(_unsupported_compiler)
 message(FATAL_ERROR "Your compiler does not support all features required 
to build cppunit!")
 endif()
diff --git a/include/config-auto.h.in b/include/config-auto.h.in
index 7d7c0ae..1f877ee 100644
--- a/include/config-auto.h.in
+++ b/include/config-auto.h.in
@@ -87,6 +87,9 @@
 /* Define if you have the  header file. */
 #cmakedefine CPPUNIT_HAVE_UNISTD_H 1
 
+/* The size of a void pointer */
+#cmakedefine CPPUNIT_SIZEOF_VOID_P @CPPUNIT_SIZEOF_VOID_P@
+
 /* Name of package */
 #cmakedefine CPPUNIT_PACKAGE "@CPPUNIT_PACKAGE@"
 
diff --git a/src/cppunit/PlugInManager.cpp b/src/cppunit/PlugInManager.cpp
index 4f8b371..aec7713 100644
--- a/src/cppunit/PlugInManager.cpp
+++ b/src/cppunit/PlugInManager.cpp
@@ -1,6 +1,10 @@
 #include 
 #include 
-#include 
+#include 
+
+#ifdef CPPUNIT_HAVE_STDINT_H
+#include 
+#endif
 
 #if !defined(CPPUNIT_NO_TESTPLUGIN)
 #include 
@@ -8,6 +12,15 @@
 #include 
 #include 
 
+#if !defined(CPPUNIT_HAVE_STDINT_H)
+#   if (CPPUNIT_SIZEOF_VOID_P == 4)
+typedef unsigned long int uintptr_t;
+#   elif (CPPUNIT_SIZEOF_VOID_P == 8)
+typedef unsigned long long uintptr_t;
+#   else
+#   error "Unsupported compiler"
+#   endif
+#endif
 
 CPPUNIT_NS_BEGIN
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util tools/inc vcl/unx

[Andre Fischer]

 instsetoo_native/util/makefile.mk |6 ++--
 tools/inc/tools/prex.h|9 --
 vcl/unx/generic/app/i18n_xkb.cxx  |   54 +++---
 3 files changed, 15 insertions(+), 54 deletions(-)

New commits:
commit 9d4445e4ca17b09ddc6c6fe774dc064884b0193a
Author: Andre Fischer 
Date:   Tue Dec 17 13:49:43 2013 +

123532: Added list of known package formats.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 27b5bc3..d995239 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -90,10 +90,12 @@ help .PHONY :
 @echo "patch-checkcheck if patch can be created (part of 
patch-create)"
 @echo 
 @echo "Most targets (all except aoo_srcrelease and updatepack) accept 
suffixes"
-@echo "add _ to build a target for one language only"
+@echo "append _ to build a target for one language only"
 @echo "the default set of languages is alllangiso=$(alllangiso)"
-@echo "add . to build a target for one package format 
only"
+@echo "append . to build a target for one package 
format only"
 @echo "the default set of package formats is archive and 
PKGFORMAT=$(PKGFORMAT)"
+@echo "known package formats are: "
+@echo "archive, bsd, deb, dmg, installed, msi, native, osx, pkg, 
portable, rpm"
 
 
 LOCALPYFILES=  \
commit ed609e7d76aa27d82818a405afd1c58fe5136d1e
Author: Herbert Dürr 
Date:   Tue Dec 17 12:31:19 2013 +

#i123865# enable XKB for all X11-based display targets

diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index 3204ddb..846d7aa 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -39,20 +39,13 @@
 extern "C" {
 #endif
 
-#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really 
check for xfree86 or for X11R6.1 and higher
-#define __XKeyboardExtension__ 1
-#else
-#define __XKeyboardExtension__ 0
-#endif
-
 #include 
 #include 
 #include 
 #include 
 #include 
-#if __XKeyboardExtension__
 #include 
-#endif
+
 typedef unsigned long Pixel;
 
 #undef  DestroyAll
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index 50be5437..951eb88 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -31,16 +31,10 @@
 #include "unx/saldata.hxx"
 #include "unx/i18n_xkb.hxx"
 
-SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
-#if __XKeyboardExtension__
-pDisplay
-#endif
-)
-: mbUseExtension( (sal_Bool)__XKeyboardExtension__ ),
-  mnDefaultGroup( 0 )
+SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay)
+:   mbUseExtension( true ),
+,   mnDefaultGroup( 0 )
 {
-#if __XKeyboardExtension__
-
 mpDisplay = pDisplay;
 
 // allow user to set the default keyboard group idx or to disable the usage
@@ -89,19 +83,11 @@ pDisplay
 XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord );
 mnGroup = aStateRecord.group;
 }
-
-#endif // __XKeyboardExtension__
 }
 
 void
-SalI18N_KeyboardExtension::Dispatch( XEvent*
-#if __XKeyboardExtension__
-pEvent
-#endif
-)
+SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent)
 {
-#if __XKeyboardExtension__
-
 // must the event be handled?
 if (   !mbUseExtension
 || (pEvent->type != mnEventBase) )
@@ -119,41 +105,21 @@ pEvent
 
 default:
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
 fprintf(stderr, "Got unrequested XkbAnyEvent %#x/%i\n",
-static_cast(nXKBType), 
static_cast(nXKBType) );
-#endif
+static_cast(nXKBType), 
static_cast(nXKBType) );
+#endif
 break;
 }
-#endif // __XKeyboardExtension__
 }
 
-#if __XKeyboardExtension__
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
- sal_uInt32 nShiftState,
-   sal_uInt32 nGroup ) const
-#else
-sal_uInt32
-SalI18N_KeyboardExtension::LookupKeysymInGroup( 
sal_uInt32,sal_uInt32,sal_uInt32 ) const
-#endif
+sal_uInt32 SalI18N_KeyboardExtension::LookupKeysymInGroup( sal_uInt32 nKeyCode,
+sal_uInt32 nShiftState, sal_uInt32 nGroup ) const
 {
-#if __XKeyboardExtension__
-
-if ( !mbUseExtension )
-return NoSymbol;
-
 nShiftState &= ShiftMask;
 
-KeySym  nKeySymbol;
-nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, nShiftState 
);
+KeySym nKeySymbol = XkbKeycodeToKeysym( mpDisplay, nKeyCode, nGroup, 
nShiftState );
 return nKeySymbol;
-
-#else
-
-return NoSymbol;
-
-#endif // __XKeyboardExtension__
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/CppunitTest_sc_opencl_test.mk

[Andrzej J . R . Hunt]

 sc/CppunitTest_sc_opencl_test.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f43e3ec83f745e657a8a5db66015967bdd8912da
Author: Andrzej J.R. Hunt 
Date:   Sun Dec 1 12:10:20 2013 +

OCppunitTest_sc_opencl_test: only depend on scopencl if ENABLE_OPENCL.

scopencl is only built when ENABLE_OPENCL is true, but the unit test
should still run successfully using the fallback mechanism without
scopencl (i.e. when --disable-opencl is used).

Change-Id: I4b44148f1f59ad8b3d9c78c2fd0e1cbe2030db37
(cherry picked from commit 5aa37dd9eb9b6f44c2a91f0e41bae42754ba733b)

diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index d808e44..ef5792c 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
 salhelper \
 sax \
 sc \
-scopencl \
+$(if $(ENABLE_OPENCL),scopencl) \
 scqahelper \
 sfx \
 sot \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sw/source

[Miklos Vajna]

 oox/source/export/shapes.cxx   |7 ++-
 sw/source/filter/ww8/docxexport.cxx|8 ++--
 sw/source/filter/ww8/docxsdrexport.cxx |   11 ---
 3 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 1279f9c835d188be72a21779377cb03841d6bc54
Author: Miklos Vajna 
Date:   Tue Dec 17 16:08:29 2013 +0100

DOCX drawingml export: give drawinglayer pictures the correct namespace

This is triggered by testVMLData in CppunitTest_sw_ooxmlexport when DML 
export
is enabled in non-experimental mode.

Change-Id: Id636b1ab701ff49da1b05b720fcb2173360584ba

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6a793b7..b2b39a4 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -446,7 +446,12 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< 
XShape > xShape, const
 
 FSHelperPtr pFS = GetFS();
 
-pFS->startElementNS( mnXmlNamespace, XML_pic, FSEND );
+if (GetDocumentType() != DOCUMENT_DOCX)
+pFS->startElementNS( mnXmlNamespace, XML_pic, FSEND );
+else
+pFS->startElementNS( mnXmlNamespace, XML_pic,
+ FSNS(XML_xmlns, XML_pic), 
"http://schemas.openxmlformats.org/drawingml/2006/picture";,
+ FSEND );
 
 pFS->startElementNS( mnXmlNamespace, XML_nvPicPr, FSEND );
 
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 7d5f63b..d8463a1 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -334,8 +334,12 @@ OString DocxExport::OutputChart( uno::Reference< 
frame::XModel >& xModel, sal_In
 void DocxExport::OutputDML(uno::Reference& xShape)
 {
 uno::Reference xServiceInfo(xShape, 
uno::UNO_QUERY_THROW);
-bool bGroupShape = 
xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");
-oox::drawingml::ShapeExport aExport((bGroupShape ? XML_wpg : XML_wps), 
m_pAttrOutput->GetSerializer(), 0, m_pFilter, 
oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
+sal_Int32 nNamespace = XML_wps;
+if (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"))
+nNamespace = XML_wpg;
+else if 
(xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
+nNamespace = XML_pic;
+oox::drawingml::ShapeExport aExport(nNamespace, 
m_pAttrOutput->GetSerializer(), 0, m_pFilter, 
oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
 aExport.WriteShape(xShape);
 }
 
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 8b6a2bd..f04d653 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -332,15 +332,20 @@ void DocxSdrExport::Impl::writeDMLDrawing(const 
SdrObject* pSdrObject, const SwF
 sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
 pFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef);
 
+uno::Reference 
xShape(const_cast(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW);
+uno::Reference xServiceInfo(xShape, 
uno::UNO_QUERY_THROW);
+const char* pNamespace = 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape";;
+if (xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"))
+pNamespace = 
"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";;
+else if 
(xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
+pNamespace = 
"http://schemas.openxmlformats.org/drawingml/2006/picture";;
 pFS->startElementNS(XML_a, XML_graphic,
 FSNS(XML_xmlns, XML_a), 
"http://schemas.openxmlformats.org/drawingml/2006/main";,
 FSEND);
-const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, pSdrObject);
 pFS->startElementNS(XML_a, XML_graphicData,
-XML_uri, (pObjGroup ? 
"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"; : 
"http://schemas.microsoft.com/office/word/2010/wordprocessingShape";),
+XML_uri, pNamespace,
 FSEND);
 
-uno::Reference 
xShape(const_cast(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW);
 m_rExport.OutputDML(xShape);
 
 pFS->endElementNS(XML_a, XML_graphicData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d1e734739cb4e8deaf0dc5d412fbe8d6745e1b1
Author: Miklos Vajna 
Date:   Tue Dec 17 16:36:16 2013 +0100

CppunitTest_sw_ooxmlexport: handle mc namespace in assertions

Change-Id: I17c8e5b4716652585d5612a4796140e7f54aaddb

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index aede328..8759f61 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -134,6 +134,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const 
OString& rXPath)
 xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc);
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("w"), 
BAD_CAST("http://schemas.openxmlformats.org/wordprocessingml/2006/main";));
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("v"), 
BAD_CAST("urn:schemas-microsoft-com:vml"));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("mc"), 
BAD_CAST("http://schemas.openxmlformats.org/markup-compatibility/2006";));
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
 return pXmlXpathObj->nodesetval;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sax/CppunitTest_sax.mk sax/qa sax/source

[Stephan Bergmann]

 sax/CppunitTest_sax.mk|   10 +-
 sax/qa/cppunit/test_converter.cxx |   17 -
 sax/source/tools/converter.cxx|   10 +++---
 3 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit acb9da3d4a0d04be447d942da2ea197aa12349e3
Author: Stephan Bergmann 
Date:   Tue Dec 17 16:51:35 2013 +0100

Fix naming

Change-Id: Ia7c62d57c56a27e097dbe252b6c6cac8fba7ace5

diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index 0747522..62624b9 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -7,16 +7,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,sax_cpputest))
+$(eval $(call gb_CppunitTest_CppunitTest,sax))
 
-$(eval $(call gb_CppunitTest_use_api,sax_cpputest,\
+$(eval $(call gb_CppunitTest_use_api,sax,\
 offapi \
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_external,sax_cpputest,boost_headers))
+$(eval $(call gb_CppunitTest_use_external,sax,boost_headers))
 
-$(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \
+$(eval $(call gb_CppunitTest_use_libraries,sax, \
 sax \
 sal \
 comphelper \
@@ -24,7 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_cpputest, \
$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sax_cpputest, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sax, \
 sax/qa/cppunit/test_converter \
 ))
 
commit 695671eb18674ea58103093b9cf31a31afe8d2fd
Author: Stephan Bergmann 
Date:   Tue Dec 17 16:46:17 2013 +0100

Avoid inaccurate floating-point computations

...otherwise at least my --disable-dbgutil --disable-debug Linux x86_64 
build
failed the CppunitTest_sax_cpputest with 899 vs. 900 nanoseconds.

Change-Id: I05e0febf413f9f9e01227a0cc4e0f46a5243fe61

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index b5c9934..3ebe40c 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1122,9 +1122,13 @@ bool Converter::convertDuration(util::Duration& 
rDuration,
 {
 if (-1 != nTemp)
 {
-const sal_Int32 nDigits = std::min(nPos 
- nStart, 9);
-OSL_ENSURE(nDigits > 0, "bad code monkey: negative 
digits");
-
nNanoSeconds=static_cast(nTemp)*(10.0/pow(10.0,nDigits));
+nNanoSeconds = nTemp;
+sal_Int32 nDigits = nPos - nStart;
+assert(nDigits >= 0 && nDigits <= 9);
+for (; nDigits < 9; ++nDigits)
+{
+nNanoSeconds *= 10;
+}
 nTemp=-1;
 if ('S' == string[nPos])
 {
commit 0b2bc82f3cef534d8cab60d8c48a4113abce38cd
Author: Stephan Bergmann 
Date:   Tue Dec 17 16:45:39 2013 +0100

Improve CPPUNIT_ASSERTs

Change-Id: I971602ce562ae0e11be5ac7b4d1eefbd342b625c

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 7145e5e..cbc3ae0 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -86,14 +86,6 @@ void ConverterTest::tearDown()
 {
 }
 
-static bool eqDuration(util::Duration a, util::Duration b) {
-return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days
-&& a.Hours == b.Hours && a.Minutes == b.Minutes
-&& a.Seconds == b.Seconds
-&& a.NanoSeconds == b.NanoSeconds
-&& a.Negative == b.Negative;
-}
-
 static void doTest(util::Duration const & rid, char const*const pis,
 char const*const i_pos = 0)
 {
@@ -104,7 +96,14 @@ static void doTest(util::Duration const & rid, char 
const*const pis,
 bool bSuccess = Converter::convertDuration(od, is);
 SAL_INFO("sax.cppunit","" << (od.Negative ? "-" : "+")  << " " << od.Years 
<< "Y " << od.Months << "M " << od.Days << "D " << od.Hours << "H " << 
od.Minutes << "M " << od.Seconds << "S " << od.NanoSeconds << "n");
 CPPUNIT_ASSERT(bSuccess);
-CPPUNIT_ASSERT(eqDuration(rid, od));
+CPPUNIT_ASSERT_EQUAL(rid.Years, od.Years);
+CPPUNIT_ASSERT_EQUAL(rid.Months, od.Months);
+CPPUNIT_ASSERT_EQUAL(rid.Days, od.Days);
+CPPUNIT_ASSERT_EQUAL(rid.Hours, od.Hours);
+CPPUNIT_ASSERT_EQUAL(rid.Minutes, od.Minutes);
+CPPUNIT_ASSERT_EQUAL(rid.Seconds, od.Seconds);
+CPPUNIT_ASSERT_EQUAL(rid.NanoSeconds, od.NanoSeconds);
+CPPUNIT_ASSERT_EQUAL(rid.Negative, od.Negative);
 OUStringBuffer buf;
 Converter::convertDuration(buf, od);
 SAL_INFO("sax.cppunit","" << buf.toString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/bin vcl/aqua vcl/inc vcl/os2 vcl/unx vcl/win

[Andre Fischer]

 solenv/bin/patch_tool.pl|   28 
 vcl/aqua/source/gdi/salgdi.cxx  |6 +++---
 vcl/aqua/source/gdi/salprn.cxx  |2 +-
 vcl/aqua/source/window/salframe.cxx |4 ++--
 vcl/inc/aqua/salframe.h |2 +-
 vcl/inc/aqua/salgdi.h   |2 +-
 vcl/inc/os2/salgdi.h|2 +-
 vcl/inc/win/salgdi.h|2 +-
 vcl/os2/source/gdi/salgdi.cxx   |9 ++---
 vcl/unx/generic/gdi/salgdi3.cxx |6 ++
 vcl/win/source/gdi/salgdi.cxx   |2 +-
 11 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 1d5583df9bdad2b61f05dd504b30944851fe64a7
Author: Andre Fischer 
Date:   Tue Dec 17 15:47:29 2013 +

123531: Create log path before using it.

diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index c82806c..f7cc82d 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -2203,9 +2203,9 @@ sub UpdateReleasesXML($$)
 sub main ()
 {
 my $context = ProcessCommandline();
-installer::logger::starttime();
-$installer::logger::Global->add_timestamp("starting logging");
-#installer::logger::SetupSimpleLogging(undef);
+#installer::logger::starttime();
+#$installer::logger::Global->add_timestamp("starting logging");
+installer::logger::SetupSimpleLogging(undef);
 
 die "ERROR: list file is not defined, please use --lst-file option"
 unless defined $context->{'lst-file'};
@@ -,15 +,19 @@ sub main ()
 
 if ($context->{'command'} =~ /create|check/)
 {
-$installer::logger::Lang->set_filename(
-File::Spec->catfile(
-$context->{'output-path'},
-$context->{'product-name'},
-"msp",
-$context->{'source-version-dash'} . "_" . 
$context->{'target-version-dash'},
-$context->{'language'},
-"log",
-"patch-creation.log"));
+my $filename = File::Spec->catfile(
+$context->{'output-path'},
+$context->{'product-name'},
+"msp",
+$context->{'source-version-dash'} . "_" . 
$context->{'target-version-dash'},
+$context->{'language'},
+"log",
+"patch-creation.log");
+my $dirname = dirname($filename);
+File::Path::make_path($dirname) unless -d $dirname;
+printf("directing output to $filename\n");
+
+$installer::logger::Lang->set_filename($filename);
 $installer::logger::Lang->copy_lines_from($installer::logger::Global);
 $installer::logger::Lang->set_forward(undef);
 $installer::logger::Info->set_forward($installer::logger::Lang);
commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436
Author: Herbert Dürr 
Date:   Tue Dec 17 15:01:25 2013 +

#i123840# normalize SalFrame resolution type to sal_Int32

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index a45ae9f..76f13a6 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -430,13 +430,13 @@ void AquaSalGraphics::initResolution( NSWindow* )
 mfFakeDPIScale = 1.0;
 }
 
-void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 {
 if( !mnRealDPIY )
 initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 
-rDPIX = static_cast(mfFakeDPIScale * mnRealDPIX);
-rDPIY = static_cast(mfFakeDPIScale * mnRealDPIY);
+rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
 }
 
 void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 0a652c6..6bb3a057 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -407,7 +407,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
 {
 if( mpPrintInfo )
 {
-long nDPIX = 72, nDPIY = 72;
+sal_Int32 nDPIX = 72, nDPIY = 72;
 mpGraphics->GetResolution( nDPIX, nDPIY );
 const double fXScaling = static_cast(nDPIX)/72.0,
  fYScaling = static_cast(nDPIY)/72.0;
diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 63c0447..715a6fd 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1219,7 +1219,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const 
Font& rDefault )
 return aResult;
 }
 
-void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
+void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY )
 {
 if( ! mpGraphics )
 {
@@ -1264,7 +1264,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings 
)
 
 // get the system font settings
 Font aAppFont = aStyleSettings.GetAppFont();
-long nDPIX = 72, nDPIY = 72;
+sal_Int32 nDPIX = 72,

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |   26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

New commits:
commit fd8ea88e152f24c76bdf162b46557fd96fb26733
Author: Michael Meeks 
Date:   Tue Dec 17 16:10:46 2013 +

turn server into a variable, and switch back to one that works.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 23d0c30..2b5f85f 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -1,5 +1,9 @@
 #!/usr/bin/perl -w
 
+# Please take the time to check that the script still runs
+# before changing this to something else.
+my $bugserver = "bugs.freedesktop.org";
+
 # config for eliding top bug contributors who are
 # not (yet) libreoffice hackers.
 my %sadly_non_libreoffice = (
@@ -119,7 +123,7 @@ sub crunch_bugstat_lines(@)
 my %closed_stats;
 
 while ((my $line = shift @lines) && $region ne 'end') {
-#  print "$region -> $line";
+   print "$region -> $line";
if ($region eq 'header' && $line =~ /Top .* modules<\/h2>/) {
$region = 'top-modules';
 
@@ -169,7 +173,7 @@ sub crunch_bugstat_lines(@)
 sub build_overall_bugstats()
 {
 print STDERR "Querying overall / top bug stats\n";
-my $url = 
'https://bugs.libreoffice.org/page.cgi?id=weekly-bug-summary.html';
+my $url = "https://$bugserver/page.cgi?id=weekly-bug-summary.html";;
 
 print STDERR "  + $url\n";
 crunch_bugstat_lines(get_url($url));
@@ -190,7 +194,7 @@ build_overall_bugstats();
 print STDERR "Querying for open MABs:\n";
 for my $ver (reverse sort keys %bug_to_ver) {
 my $bug = $bug_to_ver{$ver};
-my $base_url = "https://bugs.libreoffice.org/showdependencytree.cgi?id="; . 
$bug;
+my $base_url = "https://$bugserver/showdependencytree.cgi?id="; . $bug;
 my $all = get_deps($base_url);
 my $open = get_deps($base_url . "&hide_resolved=1");
 $percent = sprintf("%2d", (($open * 100.0) / $all));
@@ -202,14 +206,14 @@ for my $ver (reverse sort keys %bug_to_ver) {
 my ($reg_all, $reg_open);
 
 print STDERR "Querying for regressions:\n";
-my 
$regression_query="https://bugs.libreoffice.org/buglist.cgi?columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&keywords=regression%2C%20&keywords_type=allwords&list_id=267671&product=LibreOffice&query_format=advanced&order=bug_id&limit=0";;
-my 
$regression_open_query="https://bugs.libreoffice.org/buglist.cgi?keywords=regression%2C%20&keywords_type=allwords&list_id=267687&columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&resolution=---&query_based_on=Regressions&query_format=advanced&product=LibreOffice&known_name=Regressions&limit=0";;
+my 
$regression_query="https://$bugserver/buglist.cgi?columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&keywords=regression%2C%20&keywords_type=allwords&list_id=267671&product=LibreOffice&query_format=advanced&order=bug_id&limit=0";;
+my 
$regression_open_query="https://$bugserver/buglist.cgi?keywords=regression%2C%20&keywords_type=allwords&list_id=267687&columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&resolution=---&query_based_on=Regressions&query_format=advanced&product=LibreOffice&known_name=Regressions&limit=0";;
 $reg_all = get_query($regression_query);
 $reg_open = get_query($regression_open_query);
 
 print STDERR "Querying for bibisection:\n";
-my $bibisect_query = 
"https://bugs.libreoffice.org/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267679&o1=substring&resolution=---&resolution=FIXED&resolution=INVALID&resolution=WONTFIX&resolution=DUPLICATE&resolution=WORKSFORME&resolution=MOVED&resolution=NOTABUG&resolution=NOTOURBUG&query_based_on=BibisectedAll&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&product=LibreOffice&known_name=BibisectedAll&limit=0";;
-my $bibisect_open_query = 
"https://bugs.libreoffice.org/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267685&o1=substring&resolution=---&query_based_on=Bibisected&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&product=LibreOffice&known_name=Bibisected&limit=0";;
+my $bibisect_query = 
"https://$bugserver/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267679&o1=substring&resolution=---&resolution=FIXED&resolution=INVALID&resolution=WONTFIX&resolution=DUPLICATE&resolution=WORKSFORME&resolution=MOVED&resolution=NOTABUG&resolution=NOTOURBUG&query_based_on=BibisectedAll&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&product=LibreOffice&known_name=BibisectedAll&limit=0";;
+my $bibisect_open_query = 
"https://$bugserver/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267685&o1=substring&resolution=---&query_based_on=Bibisected&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&prod

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 202cb2f9b4ce49e87eefad99b8505ba5daf560ea
Author: Michael Meeks 
Date:   Tue Dec 17 16:14:36 2013 +

turn off debug.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 2b5f85f..14c95d8 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -123,7 +123,7 @@ sub crunch_bugstat_lines(@)
 my %closed_stats;
 
 while ((my $line = shift @lines) && $region ne 'end') {
-   print "$region -> $line";
+#  print "$region -> $line";
if ($region eq 'header' && $line =~ /Top .* modules<\/h2>/) {
$region = 'top-modules';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sax/source

[Stephan Bergmann]

 sax/source/tools/converter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 71448690d7c5904df45bf98243c5bb05a99245e5
Author: Stephan Bergmann 
Date:   Tue Dec 17 17:20:42 2013 +0100

readUnsignedNumberMaxDigits can read more than maxDigits chars

...so that is what the std::min was good for that the previous commit 
erroneously removed.

Change-Id: I0cb08ab79f85ce4b919232845994c9b8bae35646

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 3ebe40c..fda7cb4 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1123,8 +1123,8 @@ bool Converter::convertDuration(util::Duration& rDuration,
 if (-1 != nTemp)
 {
 nNanoSeconds = nTemp;
-sal_Int32 nDigits = nPos - nStart;
-assert(nDigits >= 0 && nDigits <= 9);
+sal_Int32 nDigits = std::min(nPos - 
nStart, 9);
+assert(nDigits >= 0);
 for (; nDigits < 9; ++nDigits)
 {
 nNanoSeconds *= 10;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sax/source

[Stephan Bergmann]

 sax/source/tools/converter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9bcc9c5c10841dcdfa9ff5814344ce667678df3
Author: Stephan Bergmann 
Date:   Tue Dec 17 17:29:58 2013 +0100

...and nDigits > 9 is harmless in following for loop and need not be capped

Change-Id: I30c4005e5983f5007edfed692b74f07b31899755

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index fda7cb4..8b0b616 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1123,7 +1123,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
 if (-1 != nTemp)
 {
 nNanoSeconds = nTemp;
-sal_Int32 nDigits = std::min(nPos - 
nStart, 9);
+sal_Int32 nDigits = nPos - nStart;
 assert(nDigits >= 0);
 for (; nDigits < 9; ++nDigits)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source desktop/source extensions/source filter/source forms/source framework/inc framework/source i18npool/inc include/comphelper include/cppuhelper include/fr

[Stephan Bergmann]

 UnoControls/inc/basecontrol.hxx   |4 
 UnoControls/source/controls/progressmonitor.cxx   |1 +
 UnoControls/source/controls/statusindicator.cxx   |1 +
 dbaccess/source/core/dataaccess/documenteventexecutor.hxx |4 
 dbaccess/source/ui/inc/dbexchange.hxx |4 
 dbaccess/source/ui/uno/ColumnControl.hxx  |4 
 dbaccess/source/ui/uno/dbinteraction.hxx  |4 
 desktop/source/offacc/acceptor.hxx|4 
 extensions/source/resource/ResourceIndexAccess.hxx|3 +++
 filter/source/config/cache/lateinitlistener.hxx   |3 +++
 filter/source/xsltdialog/xmlfiltertabdialog.cxx   |1 +
 forms/source/inc/InterfaceContainer.hxx   |4 
 framework/inc/classes/menumanager.hxx |4 
 framework/source/inc/dispatch/windowcommanddispatch.hxx   |4 
 i18npool/inc/cclass_unicode.hxx   |4 
 include/comphelper/proxyaggregation.hxx   |4 
 include/cppuhelper/implbase1.hxx  |1 -
 include/framework/preventduplicateinteraction.hxx |4 
 include/oox/drawingml/chart/converterbase.hxx |1 +
 include/svtools/openfiledroptargetlistener.hxx|4 
 include/toolkit/controls/geometrycontrolmodel.hxx |3 +++
 oox/source/core/filterbase.cxx|1 +
 oox/source/crypto/DocumentDecryption.cxx  |1 +
 oox/source/ppt/pptimport.cxx  |3 +++
 oox/source/ppt/timenode.cxx   |1 +
 package/source/xstor/owriteablestream.hxx |4 
 package/source/xstor/xstorage.hxx |4 
 package/source/zipapi/XUnbufferedStream.hxx   |4 
 sd/source/ui/presenter/PresenterTextView.hxx  |4 
 sdext/source/presenter/PresenterTimer.cxx |2 ++
 sdext/source/presenter/PresenterTimer.hxx |4 
 sfx2/source/appl/imestatuswindow.hxx  |1 +
 toolkit/source/controls/grid/sortablegriddatamodel.hxx|4 
 writerfilter/source/dmapper/DomainMapper.cxx  |1 +
 xmlsecurity/source/framework/encryptionengine.hxx |4 
 35 files changed, 103 insertions(+), 1 deletion(-)

New commits:
commit 8233226fe4614d5cebe474a0d1b026084e023e4c
Author: Stephan Bergmann 
Date:   Tue Dec 17 16:15:48 2013 +0100

No need for implbase1.hxx to include XComponentContext.hpp

...which it did unlike all the other implbaseN.hxx.  Required lots of 
downstream clean-up,
of course.

Change-Id: Ib720e7a0a43410dcd7e6338b84a3973dfbb20866

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 2ae330f..4c3452a 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -88,6 +88,10 @@
 
 #include "multiplexer.hxx"
 
+namespace com { namespace sun { namespace star { namespace uno {
+class XComponentContext;
+} } } }
+
 
//
 //  "namespaces"
 
//
diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index dad73a8..091d9f6 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/UnoControls/source/controls/statusindicator.cxx 
b/UnoControls/source/controls/statusindicator.cxx
index 2e8d819..d84600e 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include "progressbar.hxx"
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx 
b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 9670cb4..97024ae 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -27,6 +27,10 @@
 
 #include 
 
+namespace com { namespace sun { namespace star { namespace uno {
+class XComponentContext;
+} } } }
+
 namespace dbaccess
 {
 
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx 
b/dbaccess/source/ui/inc/dbexchange.hxx
index f194213..3454344 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -31,6 +31,10 @@
 
 #include 
 
+namespace com { namespace sun { namespace star { namespace uno {
+class XComponentContext;
+} } } }
+
 namespace dbaui
 {
 
diff --git a/dbaccess/s

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83beb458b05630ed2ed5a9fed5097e2122bbcd49
Author: Christian Lohmaier 
Date:   Tue Dec 17 15:50:01 2013 +0100

Updated core
Project: translations  dbe7e598c32822da31e0555913f7ec7ff17bf36d

diff --git a/translations b/translations
index 8fcaf6e..dbe7e59 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8fcaf6efc077442b39e0f3f210e02a603ef7c9c8
+Subproject commit dbe7e598c32822da31e0555913f7ec7ff17bf36d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sax/source

[Stephan Bergmann]

 sax/source/tools/converter.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 5bffe4dffd7496057c1fd70e46af800396f5b346
Author: Stephan Bergmann 
Date:   Tue Dec 17 16:46:17 2013 +0100

Avoid inaccurate floating-point computations

...otherwise at least my --disable-dbgutil --disable-debug Linux x86_64 
build
failed the CppunitTest_sax_cpputest with 899 vs. 900 nanoseconds.

(cherry picked from commit 695671eb18674ea58103093b9cf31a31afe8d2fd,
incorporating follow-up fixes 71448690d7c5904df45bf98243c5bb05a99245e5
"readUnsignedNumberMaxDigits can read more than maxDigits chars" and
b9bcc9c5c10841dcdfa9ff5814344ce667678df3 "...and nDigits > 9 is harmless in
following for loop and need not be capped")

Change-Id: I05e0febf413f9f9e01227a0cc4e0f46a5243fe61

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 8823965..02131ed 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1122,9 +1122,13 @@ bool Converter::convertDuration(util::Duration& 
rDuration,
 {
 if (-1 != nTemp)
 {
-const sal_Int32 nDigits = std::min(nPos 
- nStart, 9);
-OSL_ENSURE(nDigits > 0, "bad code monkey: negative 
digits");
-
nNanoSeconds=static_cast(nTemp)*(10.0/pow(10.0,nDigits));
+nNanoSeconds = nTemp;
+sal_Int32 nDigits = nPos - nStart;
+assert(nDigits >= 0);
+for (; nDigits < 9; ++nDigits)
+{
+nNanoSeconds *= 10;
+}
 nTemp=-1;
 if ('S' == string[nPos])
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype

[David Tardon]

 bin/get-bugzilla-attachments-by-mimetype |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21a36be1721d364a24eabebee48d782c2c1055c5
Author: David Tardon 
Date:   Tue Dec 17 18:08:43 2013 +0100

add more graphics apps to launchpad list

Change-Id: I8f80b4aa07fd923aea4f50fd50d4ce68230cde06

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index f611827..5f061c6 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -247,7 +247,7 @@ def get_launchpad_bugs(prefix):
 
 #since searching bugs having attachments with specific mimetypes is not 
available in launchpad API
 #we're iterating over all bugs of the most interesting source packages
-for pkg in ["libreoffice", "openoffice.org", "abiword", "gnumeric", 
"koffice", "calligra"]:
+for pkg in ["libreoffice", "openoffice.org", "abiword", "gnumeric", 
"koffice", "calligra", "inkscape", "sk1"]:
 srcpkg = ubuntu.getSourcePackage(name=pkg)
 pkgbugs = srcpkg.searchTasks(status=["New", "Fix Committed", 
"Invalid", "Won't Fix", "Confirmed", "Triaged", "In Progress", "Incomplete", 
"Incomplete (with response)", "Incomplete (without response)", "Fix Released", 
"Opinion", "Expired"])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.2.0.1' created by Christian Lohmaier 
 at 2013-12-17 17:15 -0800

Tag libreoffice-4.2.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSsIa5AAoJEPQ0oe+v7q6jWVEP/ivMPhyX0hTnw8+3gjakiLem
RgW0vcz4mUYxqlvzOMIWbBWhe7FLSSmHdaBnJnnTz2XqIwvekdejI4Gdn0C8DRnk
LIfx2rHcwB9B++6LEhHyMeOM+wgSOX016f39ACrPQ1qHCCCO2zS2gfLlUXK8ngyv
dZXItP/z8F2pNKlI+k+Otp4x5z7Jax0mD9OY3nWHWq6hRW9g2nor6N+28xYyk86o
nqQ0ChTi8datIwqJO1TBKZV95YJ5QgVYI4iFs57kwYOHZLLmnqCd2Hu3l+sOG7eY
MJNzZnLhkK8OUggp5EzKrM9DC0WN3oG2Uw/uDxS6WT47QEt3d0cPN/UPfg73LOH5
pKGIMlY9dd54kbh8y4q/oG3KswiuZggPsyoVRw9mh1Um8exh97iDB1PWDD58wppw
PXuHdWl4AW6EqNNwnKxvW01MOknUIjjmAVqrLZ9YIAo7atOAYl1o0N8AahQK8DyM
v/tRfV7R1u5zZz5HliuzUWnMwVHiCNXT2JM19woZHaJl0j9GPB6MhIrqOMxPBJEJ
oswt9a31E9zo54+3WHCeWoOJEEXqaaCrXiNaI5LQ6CLhrILUckcLAIxmq9PQQ3nU
O2Pdzvig/AfI19w3VZZzP2GmGZzDLZ12bYeoxWfEQCNh9sCVKV9i/X9T4HpLVLBx
cx5QIrw4qq+NXh5V4RrM
=q1xu
-END PGP SIGNATURE-

Changes since libreoffice-4-2-branch-point-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.2.0.1' created by Christian Lohmaier 
 at 2013-12-17 17:15 -0800

Tag libreoffice-4.2.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSsIbGAAoJEPQ0oe+v7q6jjUUQAMNLrl0EAkJ/VS50V2knwyvw
LDTYwYJs/cegUZuMvx0MY59gmUyl8uvJ6bQ3idRZaaO/JGC+GUI1Oq5MKPaFhOph
RgoEZU++pgFEJrCFo0fRw1z01WKRgNesmLqMO0e4vE8RMfHrDhjJIozVLPIqSQm/
+oeKr9uQ0P3e6hXbvVT0etB69/WmjL4+B250JptuJBsL6UzZtclgDg9bJYCTwVkB
56lBzd7TdwIokw49uxz+1XPOGa54AQJ9RrkhkrJboVft0/xR1fBKGZy1ogk47k37
7OFua5jL+AukyBTFhzwG+FvPsWf5NNaYTNlrg7XdihA5M6kuml/HjhPm/0l3YWnP
z4mHfrD6KWAggZXKjm/ivhGyaEr7Lr77me1/dUTyBm0SRigMI8LQeZ55HBfoBgnU
RCPnqK6BIeCWEUFHVjFhSx5WHMCqMsubNINVJ+IV2tBn/XPfjhl/N0nGzf5PSa/+
cTsZaZoz4SkkBjqlkm/N/PMJuumwUJpSWzuQeaEHJLS/8ER5tQp5Tbyr93uvB7F8
OgP7BWKovA5ZC3GlBZ3VQ0TwdN2Ll+YibfOJfsHUWDpAyGv89CDwBFdkuul0a5qw
tfZPf+UuEsD3EdWYBoHqqWkfSQTVmaLs+jjJyHmiizT/qeHVWeD4pL8y/pcFl8V8
ApWonL3arZaswUBv3xa3
=Hbir
-END PGP SIGNATURE-

Changes since libreoffice-4-2-milestone-5-62:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.2.0.1' created by Christian Lohmaier 
 at 2013-12-17 17:15 -0800

Tag libreoffice-4.2.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSsIa+AAoJEPQ0oe+v7q6j23wP/2jPpr84wA3KBYgIIZIlmF9y
eqmlXqQVFkohjgLV9KVhSTE4/Fp5U21m4sr6scrJYwlqyPauupvE+Jput5Mas7o5
F80FnnI4lnnCbbdbv40vPTaMGw3flAMkJA3gUbEFdoJhORgF4MiF13NRdRFsTIJk
vvvSwfAqUD/gDDJsxw3agbRdjyHW49eA/QgQ1GhP9SXBJJ0ncjZjx0/t+OOsPE5W
H+F7/ib/7wp5w7yzdsIY5DRKr8A8O/fVUHVQE1V14EQ7rT1UZnQs9HC6h/1GNZhk
tp+ZfYG/ty6YsrsFs/M7YeaCYrT6rsksdkB41YmkkpRiLVU8nnWXRkGatVxRPhx9
FChw1CpxjOFI3mvFyVXBILHpRy7T90nXm9WZ8hniFHmUMf9NjbGjkD9Scal424Na
QyrPyUS02PPPAHl08OBZKyPsUEUAn0vpzYhXhkTp7EpKhW7ZqkDQMoUHkqag06DF
ly68KPi5/ckgwHrxK1C9NLlDj3JLX7Ub7+8lGROv/dTC3uk2BvICLPkX0/DMcKXi
XgeO1ZClpisDATcmJ9gX5Xo2CNGtd/YM1QF++J/Va/pCB6v/0P8qNZrO5jrUCtyd
GqvAvtJHrLNbe2yYfqYm5GdWe+VfVzJs7MamC9p47CdSKn9RZKjg1hINIdrdehRh
/EhdiSd6lAuZKw7xN6BO
=BBGp
-END PGP SIGNATURE-

Changes since libreoffice-4-2-branch-point-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.0.1'

[Christian Lohmaier]

Tag 'libreoffice-4.2.0.1' created by Christian Lohmaier 
 at 2013-12-17 17:15 -0800

Tag libreoffice-4.2.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSsIbCAAoJEPQ0oe+v7q6j2XUQALJbQkjd+v2272nxaJSKQK6N
HYS4iVCVHzwkC+bN8sTOl6kvvBOrPRwjJJK4nKO3gOfR8blQEXfRwcEEzSt6vysE
dMY9a+1acTZzSHGs/5E1TlCmB37foYsMo8eyAQpvOisWlDRbPA93xGXELful9NLx
xROEOU6plGQ9+LKDiCa6zBx9JH1eyDd7T6sDletmJhu1aVZM5i9L47z1U1NZgmWb
4dmDySmiEmU6XyVH7TCqX3je9hT6OVEN1f9fbeyds4pQD+ixQZ73lnczyKrICKy7
uJGJTh+7csSeKvZIfoO8T4mhhEhLVfTPpOcCZxxlGllzvmceAJHrjGP0/1t17Vhc
3VOxN83GUVJHUH1K7HhizlceINHtfm4f0N+ONs2XBAYyfRSJ33xQxAL0+uHEuS8g
XqyumoFYxSkuAuBJ4NkQ7XxjoL4b0EV5VWGTphQC4q3DSacph9yRHVedGAgVS6ss
QldzUvKCcEzhm8WhpvxLTINN93GVz0grzrcXLKSFlDCsNqxBETcy/okUMWp8tcJr
5pl4E1kMRPIk7y4fwQsVecJNiEDINU1hgBkK7514/LhJPxRO6btPqxa44BcRB601
Uua/Rxj9B8k9FZFPVjbn6qU9uhDn2HFci2geDpS/9/7DP1N3VeSXRiG1enZIJR1o
B0VW59FqDBJexFc/fJzq
=FsDS
-END PGP SIGNATURE-

Changes since libreoffice-4-2-branch-point-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b62c77d363aea607e35f65c06e9692a662195391
Author: Christian Lohmaier 
Date:   Tue Dec 17 18:19:01 2013 +0100

bump product version to 4.2.0.1.0+

Change-Id: If10fcf86ef07ce3f62bdc27783246a69d03f9004

diff --git a/configure.ac b/configure.ac
index 176a7c8..8c08b1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - sax/source svx/source sw/source

[Michael Stahl]

 sax/source/tools/converter.cxx   |   10 +++---
 svx/source/accessibility/ChildrenManagerImpl.cxx |2 +-
 svx/source/unodraw/unoshtxt.cxx  |   20 ++--
 sw/source/core/access/accframe.cxx   |7 +++
 4 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit 64575a5b91b0fae6283b9ad8b1356e76caa34b45
Author: Michael Stahl 
Date:   Tue Dec 17 17:29:49 2013 +0100

sax: avoid usage of double for parsing nanoseconds here too

Change-Id: Iddf93a116cb333db6465a915dae692c33a60241a

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 8b0b616..62e5b48 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1645,9 +1645,13 @@ static bool lcl_parseDateTime(
 }
 if (bSuccess)
 {
-const sal_Int32 nDigits = std::min(nPos - nStart, 
9);
-OSL_ENSURE(nDigits > 0, "bad code monkey");
-
nNanoSeconds=static_cast(nTemp)*(10.0/pow(10.0,nDigits));
+sal_Int32 nDigits = std::min(nPos - nStart, 9);
+assert(nDigits > 0);
+for (; nDigits < 9; ++nDigits)
+{
+nTemp *= 10;
+}
+nNanoSeconds = nTemp;
 }
 }
 
commit 77378cde59bd9eb986f1ac8b071a5e853bc6805c
Author: Michael Stahl 
Date:   Mon Dec 16 21:59:25 2013 +0100

SvxTextEditSourceImpl::Notify(): attempt to fix chart2_unoapi crash

Apparently SvxTextEditSourceImpl::mpView is not properly invalidated
when the instance it points to is deleted; the SvxTextEditSourceImpl
is registered as listener so try to handle this in Notify(); not sure
if there isn't something that ought to have cleaned this up...

Crash running with SAL_FORCE_IACCESSIBLE2=1:

svxcorelo.dll!SdrPaintView::FindPaintWindow(const OutputDevice & rOut) Line 
70
svxcorelo.dll!SvxTextEditSourceImpl::GetVisArea() Line 923
svxcorelo.dll!SvxTextEditSource::GetVisArea() Line 1113

svxlo.dll!accessibility::AccessibleTextHelper_Impl::UpdateVisibleChildren(bool 
bBroadcastEvents) Line 868
svxlo.dll!accessibility::AccessibleTextHelper_Impl::ProcessQueue() Line 1376
svxlo.dll!accessibility::AccessibleTextHelper_Impl::Notify(SfxBroadcaster & 
__formal, const SfxHint & rHint) Line 1530
svllo.dll!SfxBroadcaster::Broadcast(const SfxHint & rHint) Line 48
svxcorelo.dll!SvxTextEditSourceImpl::NotifyHdl(EENotify * aNotify) Line 1021
svxcorelo.dll!SvxTextEditSourceImpl::LinkStubNotifyHdl(void * pThis, void * 
pCaller) Line 1013
tllo.dll!Link::Call(void * pCaller) Line 123
editenglo.dll!Outliner::ImplBlockInsertionCallbacks(unsigned char b) Line 
2098
editenglo.dll!Outliner::Clear() Line 2036
svxcorelo.dll!SdrOutlinerCache::disposeOutliner(SdrOutliner * pOutliner) 
Line 91
svxcorelo.dll!SdrModel::disposeOutliner(SdrOutliner * pOutliner) Line 1960
svxcorelo.dll!SvxTextEditSourceImpl::dispose() Line 489
svxcorelo.dll!SvxTextEditSourceImpl::Notify(SfxBroadcaster & __formal, 
const SfxHint & rHint) Line 458
svllo.dll!SfxBroadcaster::Broadcast(const SfxHint & rHint) Line 48
svxcorelo.dll!SdrModel::~SdrModel() Line 270
chartcorelo.dll!chart::DrawModelWrapper::~DrawModelWrapper() Line 191
chartcorelo.dll!chart::DrawModelWrapper::`vector deleting 
destructor'(unsigned int)

chartcorelo.dll!boost::checked_delete(chart::DrawModelWrapper
 * x) Line 34

chartcorelo.dll!boost::detail::sp_counted_impl_p::dispose()
 Line 78
chartcorelo.dll!boost::detail::sp_counted_base::release() Line 104
chartcorelo.dll!boost::detail::shared_count::~shared_count() Line 381

chartcorelo.dll!boost::shared_ptr::~shared_ptr()
chartcorelo.dll!boost::shared_ptr::reset() Line 626
chartcorelo.dll!chart::ChartView::~ChartView() Line 202
chartcorelo.dll!chart::ChartView::`scalar deleting destructor'(unsigned int)
cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 204

chartcorelo.dll!cppu::WeakImplHelper10::release()
 Line 115

chartcorelo.dll!com::sun::star::uno::Reference::~Reference()
 Line 106
chartcorelo.dll!chart::ChartModel::~ChartModel() Line 188
chartcorelo.dll!chart::ChartModel::`vector deleting destructor'(unsigned 
int)
cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 204

Change-Id: Ife6d6275eae74750858a7a7f57153c76a1a228a4

diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index da2a481..30d364f 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -333,15 +333,31 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* 
pNewModel )
 
 //
 
-void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
+void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua vcl/inc vcl/os2 vcl/source vcl/unx vcl/win

[Herbert Dürr]

 vcl/aqua/source/gdi/salgdi.cxx  |   32 
 vcl/inc/aqua/salgdi.h   |   14 +++---
 vcl/inc/os2/salgdi.h|   12 ++--
 vcl/inc/salgdi.hxx  |   20 ++--
 vcl/inc/unx/pspgraphics.h   |   10 +-
 vcl/inc/unx/salgdi.h|   12 ++--
 vcl/inc/win/salgdi.h|   10 +-
 vcl/os2/source/gdi/salgdi.cxx   |   16 
 vcl/os2/source/gdi/salgdi2.cxx  |2 +-
 vcl/source/gdi/salgdilayout.cxx |   10 +-
 vcl/unx/generic/gdi/pspgraphics.cxx |   13 ++---
 vcl/unx/generic/gdi/salgdi.cxx  |   14 +++---
 vcl/unx/headless/svpgdi.cxx |   12 ++--
 vcl/unx/headless/svpgdi.hxx |   10 +-
 vcl/unx/headless/svppspgraphics.cxx |   14 ++
 vcl/unx/headless/svppspgraphics.hxx |   10 +-
 vcl/win/source/gdi/salgdi.cxx   |8 
 vcl/win/source/gdi/salgdi2.cxx  |2 +-
 18 files changed, 109 insertions(+), 112 deletions(-)

New commits:
commit 03f5dce97331acc1a5e832f956d711a5dc0aac0e
Author: Herbert Dürr 
Date:   Tue Dec 17 16:47:23 2013 +

#i123840# normalize SalGraphics point count argument types to sal_uInt32

The old mixture of sal_uInt32, ULONG, sal_uLong, sal_uIntPtr gets
consolidated. 4e9 points are more than enough for a SalGraphics.

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 76f13a6..48f2ec3 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -744,13 +744,13 @@ void AquaSalGraphics::drawRect( long nX, long nY, long 
nWidth, long nHeight )
 
 // ---
 
-static void getBoundRect( sal_uLong nPoints, const SalPoint *pPtAry, long &rX, 
long& rY, long& rWidth, long& rHeight )
+static void getBoundRect( sal_uInt32 nPoints, const SalPoint* pPtAry, long 
&rX, long& rY, long& rWidth, long& rHeight )
 {
 long nX1 = pPtAry->mnX;
 long nX2 = nX1;
 long nY1 = pPtAry->mnY;
 long nY2 = nY1;
-for( sal_uLong n = 1; n < nPoints; n++ )
+for( sal_uInt32 n = 1; n < nPoints; ++n )
 {
 if( pPtAry[n].mnX < nX1 )
 nX1 = pPtAry[n].mnX;
@@ -774,7 +774,7 @@ static inline void alignLinePoint( const SalPoint* i_pIn, 
float& o_fX, float& o_
 o_fY = static_cast(i_pIn->mnY ) + 0.5;
 }
 
-void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry 
)
 {
 if( nPoints < 1 )
 return;
@@ -790,7 +790,7 @@ void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, 
const SalPoint *pPtAry )
 alignLinePoint( pPtAry, fX, fY );
 CGContextMoveToPoint( mrContext, fX, fY );
 pPtAry++;
-for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 {
 alignLinePoint( pPtAry, fX, fY );
 CGContextAddLineToPoint( mrContext, fX, fY );
@@ -802,7 +802,7 @@ void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, 
const SalPoint *pPtAry )
 
 // ---
 
-void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry )
+void AquaSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
 {
 if( nPoints <= 1 )
 return;
@@ -830,7 +830,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const 
SalPoint *pPtAry )
 alignLinePoint( pPtAry, fX, fY );
 CGContextMoveToPoint( mrContext, fX, fY );
 pPtAry++;
-for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 {
 alignLinePoint( pPtAry, fX, fY );
 CGContextAddLineToPoint( mrContext, fX, fY );
@@ -840,7 +840,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const 
SalPoint *pPtAry )
 {
 CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
 pPtAry++;
-for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ )
+for( sal_uInt32 nPoint = 1; nPoint < nPoints; ++nPoint, ++pPtAry )
 CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY );
 }
 
@@ -850,7 +850,7 @@ void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const 
SalPoint *pPtAry )
 
 // ---
 
-void AquaSalGraphics::drawPolyPolygon( sal_uLong nPolyCount, const sal_uLong 
*pPoints, PCONSTSALPOINT  *ppPtAry )
+void AquaSalGraphics::drawPolyPolygon( sal_uInt32 nPolyCount, const 
sal_uInt32* pPoints, PCONSTSALPOINT* ppPtAry )
 {
 if( nPolyCount <= 0 )
 return;
@@ -897,7 +897,7 @@ void AquaSalGraphics::drawPolyPolygon( sal_uLong 
nPolyCount, const sal_uLong *pP
 {
 f

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ed/609e7d76aa27d82818a405afd1c58fe5136d1e

[Caolán McNamara]

 ed/609e7d76aa27d82818a405afd1c58fe5136d1e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 21bb62e8b75dc6f385088b54d41d2067fc2510f0
Author: Caolán McNamara 
Date:   Tue Dec 17 20:03:29 2013 +

Notes added by 'git notes add'

diff --git a/ed/609e7d76aa27d82818a405afd1c58fe5136d1e 
b/ed/609e7d76aa27d82818a405afd1c58fe5136d1e
new file mode 100644
index 000..f6b94a2
--- /dev/null
+++ b/ed/609e7d76aa27d82818a405afd1c58fe5136d1e
@@ -0,0 +1 @@
+prefer: 59c08b6f768ee8b797ec51a03d1d22c7bf6138bb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/4445e4ca17b09ddc6c6fe774dc064884b0193a

[Caolán McNamara]

 9d/4445e4ca17b09ddc6c6fe774dc064884b0193a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2313b4847f398f159da91237eb5963355bf85e81
Author: Caolán McNamara 
Date:   Tue Dec 17 20:03:46 2013 +

Notes added by 'git notes add'

diff --git a/9d/4445e4ca17b09ddc6c6fe774dc064884b0193a 
b/9d/4445e4ca17b09ddc6c6fe774dc064884b0193a
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/9d/4445e4ca17b09ddc6c6fe774dc064884b0193a
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1d/5583df9bdad2b61f05dd504b30944851fe64a7

[Caolán McNamara]

 1d/5583df9bdad2b61f05dd504b30944851fe64a7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6ce6933bc9472eba15dec40dbacb1c1e76a52177
Author: Caolán McNamara 
Date:   Tue Dec 17 20:11:54 2013 +

Notes added by 'git notes add'

diff --git a/1d/5583df9bdad2b61f05dd504b30944851fe64a7 
b/1d/5583df9bdad2b61f05dd504b30944851fe64a7
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/1d/5583df9bdad2b61f05dd504b30944851fe64a7
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/quartz vcl/win

[Herbert Dürr]

 vcl/inc/win/salgdi.h  |2 +-
 vcl/quartz/salgdicommon.cxx   |4 ++--
 vcl/win/source/gdi/salgdi.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 802ca8cd36c4b08c629a956a4ed774e70e6c0060
Author: Herbert Dürr 
Date:   Tue Dec 17 15:01:25 2013 +

Related: #i123840# normalize SalFrame resolution type to sal_Int32

(cherry picked from commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436)

Conflicts:
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salprn.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/aqua/salframe.h
vcl/inc/aqua/salgdi.h
vcl/inc/os2/salgdi.h
vcl/os2/source/gdi/salgdi.cxx
vcl/unx/generic/gdi/salgdi3.cxx

Change-Id: I86f2902d765422b4b850619c72119ad4e03452d7

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index f29fd94..13a9a64 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -277,7 +277,7 @@ public:
 // public SalGraphics methods, the interface to the independent vcl part
 
 // get device resolution
-virtual voidGetResolution( long& rDPIX, long& rDPIY );
+virtual voidGetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY 
);
 // get the depth of the device
 virtual sal_uInt16  GetBitCount() const;
 // get the width of the device
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index a204d74..75fea3f 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1229,8 +1229,8 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, 
sal_Int32& rDPIY )
 initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 }
 
-rDPIX = static_cast(mfFakeDPIScale * mnRealDPIX);
-rDPIY = static_cast(mfFakeDPIScale * mnRealDPIY);
+rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
 }
 
 #endif
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index e3a660f..920648c 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -778,7 +778,7 @@ WinSalGraphics::~WinSalGraphics()
 
 // ---
 
-void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 {
 rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
 rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8a/7cfd2bded9a531a034222c71ba3eda9df7d436

[Caolán McNamara]

 8a/7cfd2bded9a531a034222c71ba3eda9df7d436 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f2133ac4a0d10eb0c20d929c413c53479c3c3bf8
Author: Caolán McNamara 
Date:   Tue Dec 17 20:15:01 2013 +

Notes added by 'git notes add'

diff --git a/8a/7cfd2bded9a531a034222c71ba3eda9df7d436 
b/8a/7cfd2bded9a531a034222c71ba3eda9df7d436
new file mode 100644
index 000..5e34d34
--- /dev/null
+++ b/8a/7cfd2bded9a531a034222c71ba3eda9df7d436
@@ -0,0 +1 @@
+merged as: 802ca8cd36c4b08c629a956a4ed774e70e6c0060
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source

[Jacobo Aragunde Pérez]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |5 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   86 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |2 
 writerfilter/source/dmapper/DomainMapper.cxx |   21 ++
 writerfilter/source/dmapper/PropertyIds.cxx  |3 
 writerfilter/source/dmapper/PropertyIds.hxx  |3 
 6 files changed, 95 insertions(+), 25 deletions(-)

New commits:
commit 25dc9aaf693ba1e4aac75659f0762f5169c10f28
Author: Jacobo Aragunde Pérez 
Date:   Tue Dec 17 14:12:57 2013 +0100

ooxml: preserve font theme color shade property

Change-Id: I40fa3f172f98b319a97a855231b854651be2d784

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9cbaaf6..e8279c0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2062,6 +2062,8 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
"theme-preservation.docx")
 
 // check theme font color value has been preserved
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeColor", "accent3");
+OUString sThemeShade = getXPath(pXmlDocument, 
"/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeShade");
+CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), 0xbf);
 
 // check the themeFontLang values in settings file
 xmlDocPtr pXmlSettings = parseExport("word/settings.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7d32238..ff041dc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6216,6 +6216,15 @@ void DocxAttributeOutput::CharGrabBag( const 
SfxGrabBagItem& rItem )
 m_pColorAttrList->add( FSNS( XML_w, XML_themeColor ),
OUStringToOString( str, 
RTL_TEXTENCODING_UTF8 ) );
 }
+else if ( i->first == "CharThemeColorShade" )
+{
+i->second >>= str;
+if( !m_pColorAttrList )
+m_pColorAttrList = m_pSerializer->createAttrList();
+
+m_pColorAttrList->add( FSNS( XML_w, XML_themeShade ),
+   OUStringToOString( str, 
RTL_TEXTENCODING_UTF8 ) );
+}
 else if( i->first == "CharThemeFontNameCs"   ||
 i->first == "CharThemeFontNameAscii" ||
 i->first == "CharThemeFontNameEastAsia" ||
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 357faa3..1ee9e2d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3110,6 +3110,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 
m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_ORIGINAL_COLOR, aIter->Value, 
true, CHAR_GRAB_BAG);
 else if (aIter->Name == "themeColor")
 m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_COLOR, 
aIter->Value, true, CHAR_GRAB_BAG);
+else if (aIter->Name == "themeShade")
+
m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_COLOR_SHADE, aIter->Value, 
true, CHAR_GRAB_BAG);
 }
 if (m_pImpl->m_aInteropGrabBagName == "TempColorPropsGrabBag")
 {
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index a38b19c..8916ff8 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -357,6 +357,7 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_CHAR_THEME_FONT_NAME_EAST_ASIA:   sName = 
"CharThemeFontNameEastAsia"; break;
 case PROP_CHAR_THEME_COLOR  :   sName = 
"CharThemeColor"; break;
 case PROP_CHAR_THEME_ORIGINAL_COLOR :   sName = 
"CharThemeOriginalColor"; break;
+case PROP_CHAR_THEME_COLOR_SHADE:   sName = 
"CharThemeColorShade"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index e804686..8f1fa11 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -328,6 +328,7 @@ enum PropertyIds
 ,PROP_CHAR_THEME_FONT_NAME_EAST_ASIA
 ,PROP_CHAR_THEME_COLOR
 ,PROP_CHAR_THEME_ORIGINAL_COLOR
+,PROP_CHAR_THEME_COLOR_SHADE
 };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
commit 3d126bcf1febe68919eab42c5cd2cd0d7db2f66b
Author: Jacobo Aragunde Pérez 
Date:   Tue Dec 17 13:19:16 2013 +0100

ooxml: preserve font theme color property

The property is called w:themeColor and it belongs to the w:color tag
i

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source

[Caolán McNamara]

 svx/source/fmcomp/dbaexchange.cxx |   11 ++-
 1 file changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 444a8dd8752fe5e2cee58c5e51b7da7a4f5ff9f8
Author: Caolán McNamara 
Date:   Mon Dec 16 12:34:56 2013 +

fix out of range access

this is broken since 6e4a21ff22345a24e4d530725814c436a1bdd49a
the original commit in 2001.

I imagine the idea was to strip a trailing sal_Unicode(11) from the
end of the string and then recalculate if the string is empty, but
seeing as it has chugged away for the last 12+ years like this I'm
relunctant to change it to what it might have originally been
intended to do and instead just remove the stuff which was never
executed.

Change-Id: I73d5108ece8e716d78a4898117e0ee2d51822015

diff --git a/svx/source/fmcomp/dbaexchange.cxx 
b/svx/source/fmcomp/dbaexchange.cxx
index e5a974d..ff0e74f 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -464,15 +464,8 @@ namespace svx
 break;
 }
 
-sal_Int32 nDescriptorLen = m_sCompatibleObjectDescription.getLength();
-if (nDescriptorLen)
-{
-if (m_sCompatibleObjectDescription[nDescriptorLen] == 11)
-m_sCompatibleObjectDescription = 
m_sCompatibleObjectDescription.copy(0, nDescriptorLen - 1);
-
-if (nDescriptorLen)
-AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE);
-}
+if (!m_sCompatibleObjectDescription.isEmpty())
+AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE);
 }
 
 // 
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-group-interpreter-3-backport' - 0 commits -

[Unknown]

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

[Libreoffice-commits] core.git: Changes to 'private/kohei/calc-data-stream'

[Kohei Yoshida]

New branch 'private/kohei/calc-data-stream' available with the following 
commits:
commit ce007dd13e2073ae4409885f7b332217213876f7
Author: Kohei Yoshida 
Date:   Tue Dec 17 15:14:08 2013 -0500

Re-organize it a bit.

Change-Id: Idbd8c62a51e2de9df0396c2f18b8b25f0ad8ebf2

commit 9fbfd35b8efe5e2c27fb6031ca2860a8b1c6bbf5
Author: Kohei Yoshida 
Date:   Tue Dec 17 14:21:07 2013 -0500

Check the parse result and handle an error case.

Change-Id: Ie61f8c274754669a15e12a6f1517dacb7645c752

commit 7448d1754fb2b205a393577bdcc58344d2f57250
Author: Kohei Yoshida 
Date:   Tue Dec 17 14:09:25 2013 -0500

Ensure that the initial data range has only one row.

Change-Id: I97731ba02bab0ab44f19ab9cae2563ee0f71fef2

commit ce5e5596ab9cde1fb7a234433bd0edc90ba6907d
Author: Kohei Yoshida 
Date:   Tue Dec 17 11:41:10 2013 -0500

Set sensible default values in the UI.

Change-Id: Ibafbeae0becaca4f0b217b6a5a78bee048fceea0

commit f018eafc9fa96aa28be858e7626d749989d61e3d
Author: Kohei Yoshida 
Date:   Tue Dec 17 11:36:18 2013 -0500

Add sc::DocumentStreamAccess class.

To provide the DataStream class with a fast way to manipulate document
content without altering broadcaster positions or unnecessary broadcasting.

Change-Id: Ib329313b8668c9a1698ea05372de6269d089859c

commit 49a44d8b98597a7738a0067910254d9743e27280
Author: Kohei Yoshida 
Date:   Tue Dec 17 10:19:57 2013 -0500

Put these new classes in sc namespace.

Change-Id: Id75c63521def501a4c8c55d4cd45b66a010a9580

commit 1f135b166f27fffba06c666aa94f1f25e54e9709
Author: Kohei Yoshida 
Date:   Tue Dec 17 00:05:22 2013 -0500

Try to consolidate all broadcast calls into one place. Still WIP.

Change-Id: I7b75307de3ae91726facb67ea8d3fb6999e1f9c7

commit 99118c7249cbea25840f2f8ab007641dedf74398
Author: Kohei Yoshida 
Date:   Thu Dec 12 16:09:11 2013 +0100

Try to reduce the amount of repainting during streaming.

commit 638d9ffcb899d9da19ef582013b9de68924f7359
Author: Kohei Yoshida 
Date:   Mon Dec 16 15:04:09 2013 -0500

Check IsRefMode() before accessing the ref range.

Else you'd end up with wrong ref range values.  Also in
selectAllAccessibleChildren(), the code is probably meant to select
all sheet, rather than setting the top-left reference position twice
in a row.

Change-Id: I895896418476ffea0862e8df4e03f6efc4c91dd2

commit 88bdd4ca5544072768c54d1c9c6c602d52fb8515
Author: Kohei Yoshida 
Date:   Mon Dec 16 15:03:25 2013 -0500

Make this non-inline (for easier debugging).

Change-Id: I2b7a84c56b8130c6566eb971ba6ba0c3ee487c86

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

[Libreoffice-commits] core.git: UnoControls/source

[Caolán McNamara]

 UnoControls/source/inc/progressmonitor.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 669c282fea83c44d545fa8c1bfe03fa45568c35b
Author: Caolán McNamara 
Date:   Tue Dec 17 20:28:11 2013 +

embedded nulls in literals

these used to be used with OUString::createFromAscii so a blank
string is fine here

Change-Id: I744d2be5471fad2675741f908e1ad78f0d5eefbc

diff --git a/UnoControls/source/inc/progressmonitor.hxx 
b/UnoControls/source/inc/progressmonitor.hxx
index 48bc2b9..759ea6d 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -75,8 +75,8 @@ namespace unocontrols{
 #define CONTROLNAME_BUTTON  "Button"   
 //  -||-
 #define CONTROLNAME_PROGRESSBAR "ProgressBar"  
 //  -||-
 #define DEFAULT_BUTTONLABEL "Abbrechen"
-#define PROGRESSMONITOR_DEFAULT_TOPIC   "\0"
-#define PROGRESSMONITOR_DEFAULT_TEXT"\0"
+#define PROGRESSMONITOR_DEFAULT_TOPIC   ""
+#define PROGRESSMONITOR_DEFAULT_TEXT""
 #define PROGRESSMONITOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 
0xC0, 0xC0, 0xC0 )// lighgray
 #define PROGRESSMONITOR_LINECOLOR_BRIGHTTRGB_COLORDATA( 0x00, 
0xFF, 0xFF, 0xFF )// white
 #define PROGRESSMONITOR_LINECOLOR_SHADOWTRGB_COLORDATA( 0x00, 
0x00, 0x00, 0x00 )// black
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 0 commits -

[Unknown]

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

[Libreoffice-commits] core.git: include/unotest sw/qa unotest/source

[Miklos Vajna]

 include/unotest/filters-test.hxx|   18 ++-
 sw/qa/core/exportdata/rtf/pass/abi10201.rtf |3 +
 sw/qa/core/filters-test.cxx |   43 +++-
 sw/qa/extras/rtfexport/data/abi10201.rtf|3 -
 sw/qa/extras/rtfexport/rtfexport.cxx|5 ---
 unotest/source/cpp/filters-test.cxx |   21 -
 6 files changed, 74 insertions(+), 19 deletions(-)

New commits:
commit 73a808f6b300fddcaab1d3c916d92785a1801d63
Author: Miklos Vajna 
Date:   Tue Dec 17 18:17:33 2013 +0100

test::FiltersTest: add support for export tests

For now, this is only implemented for the Writer RTF filter.

Change-Id: I0c7ae5b0e544bd4738652a38474f4d262ce65661

diff --git a/include/unotest/filters-test.hxx b/include/unotest/filters-test.hxx
index 64e368c..3bcdf07 100644
--- a/include/unotest/filters-test.hxx
+++ b/include/unotest/filters-test.hxx
@@ -43,7 +43,9 @@ public:
 //Clipboard id for SfxFilter
 unsigned int nClipboardID = 0,
 //additional filter version for SfxFilter
-unsigned int nFilterVersion = 0);
+unsigned int nFilterVersion = 0,
+//export or import?
+bool bExport = false);
 
 virtual bool load(
 const OUString &rFilter,
@@ -53,6 +55,17 @@ public:
 unsigned int nClipboardID,
 unsigned int nFilterVersion) = 0;
 
+virtual bool save(
+const OUString &/*rFilter*/,
+const OUString &/*rURL*/,
+const OUString &/*rUserData*/,
+unsigned int /*nFilterFlags*/,
+unsigned int /*nClipboardID*/,
+unsigned int /*nFilterVersion*/)
+{
+return true;
+}
+
 protected:
 ~FiltersTest() {}
 
@@ -63,7 +76,8 @@ protected:
 const OUString &rUserData,
 unsigned int nFilterFlags,
 unsigned int nClipboardID,
-unsigned int nFilterVersion);
+unsigned int nFilterVersion,
+bool bExport);
 };
 
 }
diff --git a/sw/qa/core/exportdata/rtf/fail/.gitignore 
b/sw/qa/core/exportdata/rtf/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/core/exportdata/rtf/indeterminate/.gitignore 
b/sw/qa/core/exportdata/rtf/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sw/qa/extras/rtfexport/data/abi10201.rtf 
b/sw/qa/core/exportdata/rtf/pass/abi10201.rtf
similarity index 100%
rename from sw/qa/extras/rtfexport/data/abi10201.rtf
rename to sw/qa/core/exportdata/rtf/pass/abi10201.rtf
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index b47abb4..7c811a4 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 
 #include "init.hxx"
 #include "iodetect.hxx"
@@ -45,6 +46,9 @@ public:
 virtual bool load( const OUString &rFilter, const OUString &rURL,
 const OUString &rUserData, unsigned int nFilterFlags,
 unsigned int nClipboardID, unsigned int nFilterVersion);
+virtual bool save( const OUString &rFilter, const OUString &rURL,
+const OUString &rUserData, unsigned int nFilterFlags,
+unsigned int nClipboardID, unsigned int nFilterVersion) SAL_OVERRIDE;
 virtual void setUp();
 
 // Ensure CVEs remain unbroken
@@ -55,6 +59,9 @@ public:
 CPPUNIT_TEST_SUITE_END();
 
 private:
+bool filter( const OUString &rFilter, const OUString &rURL,
+const OUString &rUserData, unsigned int nFilterFlags,
+unsigned int nClipboardID, unsigned int nFilterVersion, bool bExport);
 uno::Reference m_xWriterComponent;
 };
 
@@ -62,6 +69,20 @@ bool SwFiltersTest::load(const OUString &rFilter, const 
OUString &rURL,
 const OUString &rUserData, unsigned int nFilterFlags,
 unsigned int nClipboardID, unsigned int nFilterVersion)
 {
+return filter(rFilter, rURL, rUserData, nFilterFlags, nClipboardID, 
nFilterVersion, false);
+}
+
+bool SwFiltersTest::save(const OUString &rFilter, const OUString &rURL,
+const OUString &rUserData, unsigned int nFilterFlags,
+unsigned int nClipboardID, unsigned int nFilterVersion)
+{
+return filter(rFilter, rURL, rUserData, nFilterFlags, nClipboardID, 
nFilterVersion, true);
+}
+
+bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
+const OUString &rUserData, unsigned int nFilterFlags,
+unsigned int nClipboardID, unsigned int nFilterVersion, bool bExport)
+{
 SfxFilter* pFilter = new SfxFilter(
 rFilter, OUString(), nFilterFlags,
 nClipboardID, OUString(), 0, OUString(),
@@ -79,9 +100,21 @@ bool SwFiltersTest::load(const OUString &rFilter, const 
OUString &rURL,
 }
 
 bool bLoaded = xDocShRef->DoLoad(pSrcMed);
+if (!bExport)
+{
+if (xDocShRef.Is())
+xDocShRef->DoClose();
+return bLoaded;
+}
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+SfxMedium aDstMed(aTempFile.GetURL(), STREAM_STD_WRITE);
+aDstMed.S

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - UnoControls/source

[Caolán McNamara]

 UnoControls/source/inc/progressmonitor.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f9171206e80b1ff3e3917e2f448ff2b2a43a0b2e
Author: Caolán McNamara 
Date:   Tue Dec 17 20:28:11 2013 +

embedded nulls in literals

these used to be used with OUString::createFromAscii so a blank
string is fine here

Change-Id: I744d2be5471fad2675741f908e1ad78f0d5eefbc
(cherry picked from commit 669c282fea83c44d545fa8c1bfe03fa45568c35b)

diff --git a/UnoControls/source/inc/progressmonitor.hxx 
b/UnoControls/source/inc/progressmonitor.hxx
index 48bc2b9..759ea6d 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -75,8 +75,8 @@ namespace unocontrols{
 #define CONTROLNAME_BUTTON  "Button"   
 //  -||-
 #define CONTROLNAME_PROGRESSBAR "ProgressBar"  
 //  -||-
 #define DEFAULT_BUTTONLABEL "Abbrechen"
-#define PROGRESSMONITOR_DEFAULT_TOPIC   "\0"
-#define PROGRESSMONITOR_DEFAULT_TEXT"\0"
+#define PROGRESSMONITOR_DEFAULT_TOPIC   ""
+#define PROGRESSMONITOR_DEFAULT_TEXT""
 #define PROGRESSMONITOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 
0xC0, 0xC0, 0xC0 )// lighgray
 #define PROGRESSMONITOR_LINECOLOR_BRIGHTTRGB_COLORDATA( 0x00, 
0xFF, 0xFF, 0xFF )// white
 #define PROGRESSMONITOR_LINECOLOR_SHADOWTRGB_COLORDATA( 0x00, 
0x00, 0x00, 0x00 )// black
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac ios/qa solenv/doc solenv/Executable_concat-deps.mk solenv/gbuild

[Matúš Kukan]

 config_host.mk.in |1 -
 configure.ac  |6 --
 ios/qa/sc/Makefile|2 +-
 solenv/Executable_concat-deps.mk  |5 -
 solenv/doc/gbuild/solenv/gbuild/gbuild.mk |1 -
 solenv/gbuild/gbuild.mk   |1 -
 solenv/gbuild/platform/IOS_ARM_GCC.mk |3 ---
 solenv/gbuild/platform/macosx.mk  |3 ---
 solenv/gbuild/platform/mingw.mk   |1 -
 solenv/gbuild/platform/solaris.mk |1 -
 solenv/gbuild/platform/unxgcc.mk  |1 -
 11 files changed, 1 insertion(+), 24 deletions(-)

New commits:
commit 975f62aeaa0c88cca1b7926ff34df1d7afb577c4
Author: Matúš Kukan 
Date:   Mon Sep 23 16:28:20 2013 +0200

gbuild: remove obsolete SOLARLIB

Change-Id: I6fcf5ff3a8f543079c3c8d37a728eb0ba6e0587e

diff --git a/config_host.mk.in b/config_host.mk.in
index 2263d40..09442b5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -468,7 +468,6 @@ export SDKDIRNAME=@SDKDIRNAME@
 export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@
 export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
 export SOLARINC=@SOLARINC@
-export SOLARLIB=@SOLARLIB@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
 export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
 export SRCDIR=@SRC_ROOT@
diff --git a/configure.ac b/configure.ac
index 69fb9eb..534894a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4293,7 +4293,6 @@ mingw*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-
 ;;
 
 *netbsd*)
@@ -4356,8 +4355,6 @@ openbsd*)
 ;;
 esac
 SOLARINC="$SOLARINC -I/usr/local/include"
-SOLARLIB="$SOLARLIB -L/usr/local/lib"
-
 ;;
 
 solaris*)
@@ -4392,8 +4389,6 @@ solaris*)
 ;;
 esac
 SOLARINC="$SOLARINC -I/usr/local/include"
-SOLARLIB="$SOLARLIB -L$COMPATH/lib"
-SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
 ;;
 
 *)
@@ -12660,7 +12655,6 @@ AC_SUBST(WIN_TOUCH)
 AC_SUBST(BUILD_TYPE)
 
 AC_SUBST(SOLARINC)
-AC_SUBST(SOLARLIB)
 
 PathFormat "$PERL"
 PERL="$formatted_path"
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 26cb10c..c493ae8 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a 
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno 
lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno 
lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, 
$(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 
-lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo 
-ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse 
-lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo 
-lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc 
-lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es 
-llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg 
-lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore 
-lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 
-lucbhelper4gcc3 -lucpfile1 -lunoxm
 llo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest 
-lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix 
-framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a 
$(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno 
lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno 
lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, 
-lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data 
-lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh 
-ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo 
-lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 
-li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo 
-llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others 
-lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo 
-lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo 
-ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 
-lunoxmllo -luno_cp
 puhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo 
-lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix 
-framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP) stuff
 
diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk
index f376c7c..a69b757 100644
--- a/solenv/Executable_concat-deps.mk
+++ b/solenv/Executable_concat-deps.mk
@@ -9,11 +9,6 @@
 
 

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/datastream.cxx |  118 +--
 sc/source/ui/inc/datastream.hxx  |4 -
 2 files changed, 62 insertions(+), 60 deletions(-)

New commits:
commit d7ee2b36e9911ba8d0fcfe018750a011f8b7e86f
Author: Kohei Yoshida 
Date:   Tue Dec 17 16:11:52 2013 -0500

Only keep track of current row position, not a whole range.

Change-Id: I8ad56284b9c5422d102c7e8688e5b1e4c37ae877

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 423ce07..f053371 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -188,9 +188,9 @@ DataStream* DataStream::Set(ScDocShell *pShell, const 
OUString& rURL, const OUSt
 sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[nLinkPos];
 if (rRange.isEmpty())
 {
-if ( (pBase->ISA(ScAreaLink) && dynamic_cast
+if ( (pBase->ISA(ScAreaLink) && static_cast
 (&(*pBase))->GetDestArea().aStart == aDestArea.aStart)
-|| (pBase->ISA(DataStream) && dynamic_cast
+|| (pBase->ISA(DataStream) && static_cast
 (&(*pBase))->GetRange().aStart == aDestArea.aStart) )
 {
 aDestArea.Move(0, 1, 0);
@@ -200,9 +200,9 @@ DataStream* DataStream::Set(ScDocShell *pShell, const 
OUString& rURL, const OUSt
 else
 ++nLinkPos;
 }
-else if ( (pBase->ISA(ScAreaLink) && dynamic_cast
+else if ( (pBase->ISA(ScAreaLink) && static_cast
 (&(*pBase))->GetDestArea().aStart == aDestArea.aStart)
-|| (pBase->ISA(DataStream) && dynamic_cast
+|| (pBase->ISA(DataStream) && static_cast
 (&(*pBase))->GetRange().aStart == aDestArea.aStart) )
 {
 pLinkManager->Remove( pBase );
@@ -225,7 +225,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString& 
rURL, const ScRange&
 mbRunning(false),
 mpLines(0),
 mnLinesCount(0),
-mnRepaintCounter(0)
+mnRepaintCounter(0),
+mnCurRow(0)
 {
 mxThread = new datastreams::CallerThread( this );
 mxThread->launch();
@@ -270,6 +271,14 @@ OString DataStream::ConsumeLine()
 return mpLines->at(mnLinesCount++);
 }
 
+ScRange DataStream::GetRange() const
+{
+ScRange aRange = maStartRange;
+if (mpEndRange)
+aRange.aEnd = mpEndRange->aEnd;
+return aRange;
+}
+
 void DataStream::Decode(const OUString& rURL, const ScRange& rRange,
 sal_Int32 nLimit, const OUString& rMove, const sal_uInt32 nSettings)
 {
@@ -288,15 +297,17 @@ void DataStream::Decode(const OUString& rURL, const 
ScRange& rRange,
 else if (msMove == "MOVE_DOWN")
 meMove = MOVE_DOWN;
 
-maRange = rRange;
-if (maRange.aStart.Row() != maRange.aEnd.Row())
+mnCurRow = rRange.aStart.Row();
+
+ScRange aRange = rRange;
+if (aRange.aStart.Row() != aRange.aEnd.Row())
 // We only allow this range to be one row tall.
-maRange.aEnd.SetRow(maRange.aStart.Row());
+aRange.aEnd.SetRow(aRange.aStart.Row());
 
-maStartRange = maRange;
-if (nLimit && maRange.aStart.Row() + nLimit - 1 < MAXROW)
+maStartRange = aRange;
+if (nLimit && aRange.aStart.Row() + nLimit - 1 < MAXROW)
 {
-mpEndRange.reset( new ScRange(maRange) );
+mpEndRange.reset(new ScRange(aRange));
 mpEndRange->Move(0, nLimit-1, 0);
 }
 }
@@ -331,7 +342,7 @@ void DataStream::Repaint()
 {
 SCROW nEndRow = mpEndRange ? mpEndRange->aEnd.Row() : MAXROW;
 ScRange aRange(maStartRange.aStart);
-aRange.aEnd = ScAddress(maRange.aEnd.Col(), nEndRow, maRange.aStart.Tab());
+aRange.aEnd = ScAddress(maStartRange.aEnd.Col(), nEndRow, 
maStartRange.aStart.Tab());
 
 mpDocShell->PostPaint(aRange, PAINT_GRID);
 mnRepaintCounter = 0;
@@ -345,25 +356,22 @@ void DataStream::Broadcast()
 
 void DataStream::MoveData()
 {
+if (!mpEndRange)
+return;
+
 switch (meMove)
 {
 case RANGE_DOWN:
-if (maRange.aStart == mpEndRange->aStart)
+if (mnCurRow == mpEndRange->aStart.Row())
 meMove = MOVE_UP;
 break;
 case MOVE_UP:
-if (!mpEndRange)
-break;
-
 // Remove the top row and shift the remaining rows upward. Then
 // insert a new row at the end row position.
 mpDoc->DeleteRow(maStartRange);
 mpDoc->InsertRow(*mpEndRange);
 break;
 case MOVE_DOWN:
-if (!mpEndRange)
-break;
-
 // Remove the end row and shift the remaining rows downward by
 // inserting a new row at the top row.
 mpDoc->DeleteRow(*mpEndRange);
@@ -408,53 +416,47 @@ void DataStream::Text2Doc()
 {
 sal_Unicode cSep(',');
 sal_Unicode cStr('"');
-SCCOL nStartCol = maRange.aStart.Col();
-SCROW nStartRow 

Re: Add "display as Icon" option in OLE Object

[terryphi]

Yes, please do this!

Also, can you please add an object to 'link as text' so that it shows up as
a hyperlink?



--
View this message in context: 
http://nabble.documentfoundation.org/Add-display-as-Icon-option-in-OLE-Object-tp4075195p4088599.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

Re: Add "display as Icon" option in OLE Object

[Olivier Hallot]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

you reached this very old bug:

https://bugs.freedesktop.org/show_bug.cgi?id=31363

regards

Em 24-09-2013 09:45, Shraddha Gujarathi escreveu:
> Hi,
> 
> 
> I am inserting OLE object in Libreoffice but instead of icon I can see
> the file content, how can I add icon to OLE object???
> steps :
> 1. Open LibreOffice calc goto Insert/Object/OLE Object
> 2. Select 'Create from File.' option attach a file (.pdf, .doc, .xls)
> link to file
> 
> As in MS Office when we insert OLe object we get option of "Display as
> Icon" where we can select default icon or image from system.. but
> when I insert OLE object in LibreOffice I can not see "Display as Icon"
> option...how can I add this
> 
> What will be the steps for add code for the same?
> 
> 
> 
> Thanks & Regards
> 
> -- 
> 
> /*Shraddha Gujarathi*/
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJSsM0pAAoJEJp3R7nH3vLx4EYH/RqFtNf01XdG6lymRfbWAOSy
13wqwBNQ3LvSasnK3hRTdvD0UDzIU4ylpdFmXaTgcD7kwT7fi/EBTKvKFeGAmxEi
z5VOBPcj97/Uf0ZNpPusdcNWEpldxKFbNL51M1E1Y2uMFs5k0ZUgGqG8eLpiamHo
E8lkPhQiKSaQp1CNAJXLfz5VGMLYT2V8u+xYX8pidKkA7UmODPWlSCB48r++KuEG
dPoa36DQBeItA/OjkEoh9Zm2wZw4gaDBOdVGNoW5Jx+kghhrxkK+85pc+yx9wnLC
EqL5zYGu+igHxXcCBn6OrIeB2BI/ft+OEogMi7xI9YMk93piWWjEYBDX/D5j/bY=
=nHDh
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source xmloff/source

[Michael Stahl]

 sw/source/core/layout/atrfrm.cxx  |6 +-
 sw/source/filter/xml/xmlexpit.cxx |2 +-
 xmloff/source/style/xmlbahdl.cxx  |5 +++--
 xmloff/source/style/xmlbahdl.hxx  |4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 22355042a6fc7aecf3caab69b3fa3be1430b697f
Author: Michael Stahl 
Date:   Tue Dec 17 23:44:38 2013 +0100

fdo#72452: ODF import/export: fix handling of style:page-number

Class XMLNumberWithAutoInsteadZeroPropHdl (which appears to be used only
for this attribute) needs to be adapted to the change that
"PageNumberOffset" value 0 is no longer invalid; use "void" value for
invalid instead, which appears more appropriate anyway.

Unfortunately the type of style:page-number is positiveInteger so
writing 0 would be invalid; write "auto" instead for now.

Change-Id: I9621ea201fd928087b863c562607c3d77a3b0269

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index eb540b4..2434150 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -710,7 +710,11 @@ bool SwFmtPageDesc::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 case MID_PAGEDESC_PAGENUMOFFSET:
 {
 sal_Int16 nOffset = 0;
-if(rVal >>= nOffset)
+if (!rVal.hasValue())
+{
+SetNumOffset(boost::none);
+}
+else if (rVal >>= nOffset)
 SetNumOffset( nOffset );
 else
 bRet = false;
diff --git a/sw/source/filter/xml/xmlexpit.cxx 
b/sw/source/filter/xml/xmlexpit.cxx
index abe355d..b1e5182 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -1005,7 +1005,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
 {
 ::boost::optional oNumOffset = 
pPageDesc->GetNumOffset();
-if (oNumOffset)
+if (oNumOffset && oNumOffset.get() > 0)
 {
 // #i114163# positiveInteger only!
 sal_Int32 const number(oNumOffset.get());
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 3397e47..0a797e5 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -879,7 +879,7 @@ bool XMLNumberWithAutoInsteadZeroPropHdl::importXML(
 lcl_xmloff_setAny( rValue, nValue, 2 );
 else if( rStrImpValue == GetXMLToken( XML_AUTO ) )
 {
-rValue <<= (sal_Int16)nValue;
+rValue.clear(); // void
 bRet = true;
 }
 return bRet;
@@ -891,7 +891,8 @@ bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML( 
OUString& rStrExpValue, con
 sal_Int32 nValue = 0;
 lcl_xmloff_getAny( rValue, nValue, 2 );
 
-if( 0 == nValue )
+// FIXME: 0 is not a valid value - write "auto" instead
+if (0 == nValue || !rValue.hasValue())
 rStrExpValue = GetXMLToken( XML_AUTO );
 else
 {
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 58c6dc1..8b57ccb 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -306,8 +306,8 @@ public:
 
 /**
 PropertyHandler for the XML-data-type: XML_TYPE_NUMBER16_AUTO
-Reads/writes numeric properties with special handling for the value zero
-(i.e., a value 0 property will be written as "auto")
+Reads/writes numeric properties with special handling for "void" value
+(i.e., void property will be written as "auto")
 */
 class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 72452, which changed state.

Bug 72452 Summary: Other: Page Number begins at 0
https://bugs.freedesktop.org/show_bug.cgi?id=72452

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa

[Michael Stahl]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8272ffb8ed00f211a8fbda71136d695b42249b70
Author: Michael Stahl 
Date:   Wed Dec 18 00:20:02 2013 +0100

fix integral ambiguity

Change-Id: Idf022c8a4cd78c525a5c40ec8fe7a1e304b9aecc

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e8279c0..bc7c87e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2063,7 +2063,7 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, 
"theme-preservation.docx")
 // check theme font color value has been preserved
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeColor", "accent3");
 OUString sThemeShade = getXPath(pXmlDocument, 
"/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeShade");
-CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), 0xbf);
+CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), sal_Int32(0xbf));
 
 // check the themeFontLang values in settings file
 xmlDocPtr pXmlSettings = parseExport("word/settings.xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenglShapeFactory.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68424f8994f4fa19920322d7f3f0a8f0313b0998
Author: Markus Mohrhard 
Date:   Wed Dec 18 01:38:28 2013 +0100

fix weird issue on windows with OPTIONAL being defined somewhere

WTF! Who had the glorious idea to provide a define for OPTIONAL 
when we use it internally as well

Change-Id: I257f82b62978c73c84faa34c8b341d77c017425e

diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx 
b/chart2/source/view/main/OpenglShapeFactory.cxx
index dc0f776..70bc1b5 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include "OpenglShapeFactory.hxx"
 #include "DummyXShape.hxx"
 #include "ViewDefines.hxx"
@@ -46,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

I need some help to improve the crash testing

[Markus Mohrhard]

Hey,

as you might now we have our crash testing script running on a VM and I
added support for testing the export part. However I now need your help in
classifying the file formats.

W need the information which format is imported into which application.
That determines the export formats that we use.

Additionally I need from the people doing the work on fixing crashes and
looking through validation errors the formats that we should use in the
export testing. Currently I have ods, xls and xlsx for calc, odt, rtf, doc
and docx for writer.

Please write me the format and the name of the export filter as needed by
storeToURL. I'll add that to the script and will hopefully soon be able to
provide results for a first full scale import/export testing run.

Regards,
Markus

Btw. you should state if you need validation for your formats. For
everything except for odf and ooxml I would also need the linux tool that
can validate the files.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Disabling unit tests, redux

[Keith Curtis]

I don't even know the names of the various modules I'm working in and
prefer to let the smart system figure it out ;-) make build-nocheck works
great and things run so much faster on my little laptop. Thank you. I put
this info in the wiki to save questions in the future.

-Keith

On Mon, Dec 16, 2013 at 1:33 AM, Khaled Hosny  wrote:

> On Mon, Dec 16, 2013 at 12:56:59AM -0500, Keith Curtis wrote:
> > It appears when making changes to individual C++ files that my computer
> > spends about 90% of the build time running unit tests.
>
> It seems that ‘make foo.build’ will not run the tests, at least this is
> what I “discovered” few days ago.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basctl/source canvas/source cppcanvas/source cui/source filter/source include/sal include/vcl sc/source svtools/source svx/source vcl/inc vcl/source

[Norbert Thiebaud]

 basctl/source/basicide/moduldl2.cxx |2 
 canvas/source/opengl/ogl_canvashelper.cxx   |8 
 canvas/source/vcl/textlayout.cxx|6 
 cppcanvas/source/mtfrenderer/textaction.cxx |3 
 cui/source/customize/acccfg.cxx |2 
 filter/source/graphicfilter/eps/eps.cxx |2 
 include/sal/log-areas.dox   |1 
 include/vcl/outdev.hxx  |   30 +-
 sc/source/ui/cctrl/checklistmenu.cxx|3 
 svtools/source/control/headbar.cxx  |2 
 svtools/source/control/tabbar.cxx   |4 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |8 
 vcl/inc/outfont.hxx |   35 +--
 vcl/source/control/button.cxx   |2 
 vcl/source/control/tabctrl.cxx  |4 
 vcl/source/filter/wmf/winmtf.cxx|2 
 vcl/source/gdi/cvtsvm.cxx   |4 
 vcl/source/gdi/outdev3.cxx  |  175 
 vcl/source/gdi/pdfwriter_impl.cxx   |4 
 vcl/source/window/toolbox.cxx   |4 
 20 files changed, 199 insertions(+), 102 deletions(-)

New commits:
commit 4c539fac018dfd44cd8db52161a8cb930c627da7
Author: Norbert Thiebaud 
Date:   Tue Dec 17 05:18:35 2013 -0600

vcl get rid of xub_StrLen and STRING_LEN in outdev3

a new log section (sal.rtl.xub) is used to display alert in case of
suspicious len == 0x (aka STRING_LEN)

Change-Id: I3ed2aa7896e12592be9e003580dd6c8eda4add5e
Reviewed-on: https://gerrit.libreoffice.org/7117
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Norbert Thiebaud 

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index f4d5bad..b52eea9 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -150,7 +150,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& 
rDev, const SvViewDa
 && xDlgLibContainer->isLibraryReadOnly(aLibName));
 }
 if (bReadOnly)
-rDev.DrawCtrlText(rPos, GetText(), 0, STRING_LEN, TEXT_DRAW_DISABLE);
+rDev.DrawCtrlText(rPos, GetText(), 0, -1, TEXT_DRAW_DISABLE);
 else
 rDev.DrawText(rPos, GetText());
 }
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index 3d4bd55..6ee3dab 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -787,8 +787,8 @@ namespace oglcanvas
 aVDev.GetTextOutlines(rAct.maPolyPolys,
   rTxt.Text,
   0,
-  (xub_StrLen)rTxt.StartPosition,
-  (xub_StrLen)rTxt.Length,
+  rTxt.StartPosition,
+  rTxt.Length,
   true,
   0,
   pDXArray.get() );
@@ -799,8 +799,8 @@ namespace oglcanvas
 aVDev.GetTextOutlines(rAct.maPolyPolys,
   rTxt.Text,
   0,
-  (xub_StrLen)rTxt.StartPosition,
-  (xub_StrLen)rTxt.Length );
+  rTxt.StartPosition,
+  rTxt.Length );
 }
 
 // own copy, for thread safety
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index d8a0b14..2913485 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -128,9 +128,9 @@ namespace vclcanvas
 if (aVDev.GetTextOutlines(
 aOutlines,
 maText.Text,
-::canvas::tools::numeric_cast(maText.StartPosition),
-::canvas::tools::numeric_cast(maText.StartPosition),
-::canvas::tools::numeric_cast(maText.Length),
+maText.StartPosition,
+maText.StartPosition,
+maText.Length,
 sal_False,
 0,
 aOffsets.get()))
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx 
b/cppcanvas/source/mtfrenderer/textaction.cxx
index 65d1843..b231c21 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -200,8 +200,7 @@ namespace cppcanvas
 ::boost::scoped_array< sal_Int32 > pCharWidths( new 
sal_Int32[nLen] );
 
 rVDev.GetTextArray( rText, pCharWidths.get(),
-sta

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - RepositoryExternal.mk sc/inc sc/Library_sc.mk sc/Library_scqahelper.mk sc/source

[Kohei Yoshida]

 RepositoryExternal.mk|4 
 sc/Library_sc.mk |6 +
 sc/Library_scqahelper.mk |8 +
 sc/inc/documentstreamaccess.hxx  |   24 
 sc/inc/mtvelements.hxx   |2 
 sc/source/core/data/documentstreamaccess.cxx |   97 ++
 sc/source/core/data/mtvelements.cxx  |6 +
 sc/source/ui/docshell/datastream.cxx |  143 ++-
 sc/source/ui/inc/datastream.hxx  |6 -
 9 files changed, 222 insertions(+), 74 deletions(-)

New commits:
commit b5818b58b3906a3b5dc8c8ee18218dc72ae4b5fd
Author: Kohei Yoshida 
Date:   Tue Dec 17 21:18:46 2013 -0500

Use orcus csv parser to streamd data which has much less overhead.

Also, use DocumentStreamAccess to modify ScDocument's content.

Change-Id: I516260cff1f2315267afcff05e36e620798a1aed

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b44927e..babfe54 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2624,6 +2624,10 @@ endef
 
 define gb_LinkTarget__use_orcus-parser
 $(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
 $(call gb_LinkTarget_add_libs,$(1),\
$(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.6$(gb_StaticLibrary_PLAINEXT)
 \
 )
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index b60af82..01a4ab9 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -45,6 +45,12 @@ $(eval $(call gb_Library_use_externals,sc,\
 mdds_headers \
 ))
 
+ifeq ($(SYSTEM_LIBORCUS),YES)
+$(eval $(call gb_Library_use_externals,sc,orcus))
+else
+$(eval $(call gb_Library_use_externals,sc,orcus-parser))
+endif
+
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Library_use_libraries,sc,tubes))
 
diff --git a/sc/Library_scqahelper.mk b/sc/Library_scqahelper.mk
index 37b1d54..cbdc99d 100644
--- a/sc/Library_scqahelper.mk
+++ b/sc/Library_scqahelper.mk
@@ -18,11 +18,15 @@ $(eval $(call gb_Library_set_include,scqahelper,\
 $(eval $(call gb_Library_use_externals,scqahelper, \
boost_headers \
mdds_headers \
-   orcus \
-   orcus-parser \
cppunit \
 ))
 
+ifeq ($(SYSTEM_LIBORCUS),YES)
+$(eval $(call gb_Library_use_externals,scqahelper,orcus))
+else
+$(eval $(call gb_Library_use_externals,scqahelper,orcus-parser))
+endif
+
 $(eval $(call gb_Library_add_defs,scqahelper,\
-DSCQAHELPER_DLLIMPLEMENTATION \
 ))
diff --git a/sc/inc/documentstreamaccess.hxx b/sc/inc/documentstreamaccess.hxx
index 1450f21..74f8914 100644
--- a/sc/inc/documentstreamaccess.hxx
+++ b/sc/inc/documentstreamaccess.hxx
@@ -10,7 +10,11 @@
 #ifndef SC_DOCUMENTSTREAMACCESS_HXX
 #define SC_DOCUMENTSTREAMACCESS_HXX
 
+#include 
+
 class ScDocument;
+class ScAddress;
+class ScRange;
 
 namespace sc {
 
@@ -28,6 +32,26 @@ class DocumentStreamAccess
 
 public:
 DocumentStreamAccess( ScDocument& rDoc );
+
+void setStringCell( const ScAddress& rPos, const OUString& rStr );
+
+/**
+ * Clear its internal state, and more importantly all the block position
+ * hints currently held.
+ */
+void reset();
+
+/**
+ * Pop the top row inside specified range, shift all the other rows up by
+ * one, then set the bottom row empty.
+ */
+void shiftRangeUp( const ScRange& rRange );
+
+/**
+ * Top the bottom row inside specified range, shift all the other rows
+ * above downward by one by inserting an empty row at the top.
+ */
+void shiftRangeDown( const ScRange& rRange );
 };
 
 }
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index e5efbf1..0fcafde 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -145,6 +145,8 @@ public:
 ColumnBlockPositionSet(ScDocument& rDoc);
 
 ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol);
+
+void clear();
 };
 
 ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos, 
size_t nOffset );
diff --git a/sc/source/core/data/documentstreamaccess.cxx 
b/sc/source/core/data/documentstreamaccess.cxx
index 2d427af..81ca160 100644
--- a/sc/source/core/data/documentstreamaccess.cxx
+++ b/sc/source/core/data/documentstreamaccess.cxx
@@ -9,19 +9,114 @@
 
 #include "documentstreamaccess.hxx"
 #include "document.hxx"
+#include "table.hxx"
+#include "column.hxx"
+#include "mtvelements.hxx"
+
+#include "svl/sharedstringpool.hxx"
 
 namespace sc {
 
 struct DocumentStreamAccessImpl
 {
 ScDocument& mrDoc;
+ColumnBlockPositionSet maBlockPosSet;
 
-DocumentStreamAccessImpl( ScDocument& rDoc ) : mrDoc(rDoc) {}
+DocumentStreamAccessImpl( ScDocument& rDoc ) :
+mrDoc(rDoc),
+maBlockPosSet(rDoc)
+{}
 };
 
 DocumentStreamAccess::DocumentStreamAccess( ScDocument& rDoc ) :
 mpImpl(new DocumentStreamAccessImpl(rDoc)) {}
 
+void DocumentStr

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/documentstreamaccess.hxx  |1 +
 sc/source/core/data/documentstreamaccess.cxx |   21 +
 sc/source/ui/docshell/datastream.cxx |   14 ++
 3 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit e6bb2672d64e759e0ca782fffa0af9156733c9e6
Author: Kohei Yoshida 
Date:   Tue Dec 17 21:51:43 2013 -0500

Detect numbers which are to be inserted as numeric cells.

Also, disable automatic scrolling.

Change-Id: I2f3facfd91b9b4e3f86b9685a546a094180bf1ee

diff --git a/sc/inc/documentstreamaccess.hxx b/sc/inc/documentstreamaccess.hxx
index 74f8914..9fa2d78 100644
--- a/sc/inc/documentstreamaccess.hxx
+++ b/sc/inc/documentstreamaccess.hxx
@@ -33,6 +33,7 @@ class DocumentStreamAccess
 public:
 DocumentStreamAccess( ScDocument& rDoc );
 
+void setNumericCell( const ScAddress& rPos, double fVal );
 void setStringCell( const ScAddress& rPos, const OUString& rStr );
 
 /**
diff --git a/sc/source/core/data/documentstreamaccess.cxx 
b/sc/source/core/data/documentstreamaccess.cxx
index 81ca160..bf3efe3 100644
--- a/sc/source/core/data/documentstreamaccess.cxx
+++ b/sc/source/core/data/documentstreamaccess.cxx
@@ -31,6 +31,27 @@ struct DocumentStreamAccessImpl
 DocumentStreamAccess::DocumentStreamAccess( ScDocument& rDoc ) :
 mpImpl(new DocumentStreamAccessImpl(rDoc)) {}
 
+void DocumentStreamAccess::setNumericCell( const ScAddress& rPos, double fVal )
+{
+ScTable* pTab = mpImpl->mrDoc.FetchTable(rPos.Tab());
+if (!pTab)
+return;
+
+ColumnBlockPosition* pBlockPos =
+mpImpl->maBlockPosSet.getBlockPosition(rPos.Tab(), rPos.Col());
+
+if (!pBlockPos)
+return;
+
+// Set the numeric value.
+CellStoreType& rCells = pTab->aCol[rPos.Col()].maCells;
+pBlockPos->miCellPos = rCells.set(pBlockPos->miCellPos, rPos.Row(), fVal);
+
+// Be sure to set the corresponding text attribute to the default value.
+CellTextAttrStoreType& rAttrs = pTab->aCol[rPos.Col()].maCellTextAttrs;
+pBlockPos->miCellTextAttrPos = rAttrs.set(pBlockPos->miCellTextAttrPos, 
rPos.Row(), CellTextAttr());
+}
+
 void DocumentStreamAccess::setStringCell( const ScAddress& rPos, const 
OUString& rStr )
 {
 ScTable* pTab = mpImpl->mrDoc.FetchTable(rPos.Tab());
diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index a798b84..af60412e 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -438,7 +439,12 @@ public:
 {
 if (maPos.Col() <= mnEndCol)
 {
-mrDoc.setStringCell(maPos, OUString(p, n, RTL_TEXTENCODING_UTF8));
+OUString aStr(p, n, RTL_TEXTENCODING_UTF8);
+double fVal;
+if (ScStringUtil::parseSimpleNumber(aStr, '.', ',', fVal))
+mrDoc.setNumericCell(maPos, fVal);
+else
+mrDoc.setStringCell(maPos, aStr);
 }
 maPos.IncCol();
 }
@@ -511,11 +517,11 @@ bool DataStream::ImportData()
 if (meMove == RANGE_DOWN)
 {
 ++mnCurRow;
-mpDocShell->GetViewData()->GetView()->AlignToCursor(
-maStartRange.aStart.Col(), mnCurRow, SC_FOLLOW_JUMP);
+//  mpDocShell->GetViewData()->GetView()->AlignToCursor(
+//  maStartRange.aStart.Col(), mnCurRow, SC_FOLLOW_JUMP);
 }
 
-if (mnRepaintCounter > 100)
+if (mnRepaintCounter > 200)
 Repaint();
 
 return mbRunning;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/filter/xml/xmlcelli.cxx   |   20 ++
 sc/source/ui/docshell/datastream.cxx|   62 +---
 sc/source/ui/inc/datastream.hxx |   22 +++
 sc/source/ui/inc/datastreamdlg.hxx  |6 +--
 sc/source/ui/miscdlgs/datastreamdlg.cxx |   45 ---
 5 files changed, 97 insertions(+), 58 deletions(-)

New commits:
commit 4df058058a72d73ad032ef31fedb766c0ce03458
Author: Kohei Yoshida 
Date:   Tue Dec 17 22:38:37 2013 -0500

Pass enum values around rather than OUString ones.

Ditto with the range type.

Change-Id: Iab37d50b6d58d76c60872f49f13d77ff0c918974

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 1223d3c5..b1d0de3 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1005,13 +1005,19 @@ void ScXMLTableRowCellContext::SetCellRangeSource( 
const ScAddress& rPosition )
 SvtMiscOptions aMiscOptions;
 if (aMiscOptions.IsExperimentalMode() && 
pCellRangeSource->sFilterOptions == "DataStream")
 {
-sc::DataStream::Set( 
dynamic_cast(pDoc->GetDocumentShell())
-, pCellRangeSource->sURL // rURL
-, sRangeStr // rRange
-, sFilterName.toInt32() // nLimit
-, sSourceStr // rMove
-, pCellRangeSource->nRefresh // nSettings
-);
+ScRange aRange;
+sal_uInt16 nRes = aRange.Parse(sRangeStr, pDoc);
+if ((nRes & SCA_VALID) == SCA_VALID)
+{
+sc::DataStream::MoveType eMove = 
sc::DataStream::ToMoveType(sSourceStr);
+sc::DataStream::Set( 
dynamic_cast(pDoc->GetDocumentShell())
+, pCellRangeSource->sURL // rURL
+, aRange
+, sFilterName.toInt32() // nLimit
+, eMove
+, pCellRangeSource->nRefresh // nSettings
+);
+}
 return;
 }
 ScAreaLink* pLink = new ScAreaLink( pDoc->GetDocumentShell(), 
pCellRangeSource->sURL,
diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index af60412e..1bb9cd6 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -178,25 +178,24 @@ void DataStream::MakeToolbarVisible()
 }
 }
 
-DataStream* DataStream::Set(ScDocShell *pShell, const OUString& rURL, const 
OUString& rRange,
-sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings)
+DataStream* DataStream::Set(
+ScDocShell *pShell, const OUString& rURL, const ScRange& rRange,
+sal_Int32 nLimit, MoveType eMove, sal_uInt32 nSettings)
 {
 // Each DataStream needs a destination area in order to be exported.
 // There can be only one ScAreaLink / DataStream per cell.
 // So - if we don't need range (DataStream with mbValuesInLine == false),
 // just find a free cell for now.
 ScRange aDestArea;
-sal_uInt16 nRes = aDestArea.Parse(rRange, pShell->GetDocument());
-if ((nRes & SCA_VALID) != SCA_VALID)
-// Invalid range string.
-return NULL;
+if (rRange.IsValid())
+aDestArea = rRange;
 
 sfx2::LinkManager* pLinkManager = pShell->GetDocument()->GetLinkManager();
 sal_uInt16 nLinkPos = 0;
 while (nLinkPos < pLinkManager->GetLinks().size())
 {
 sfx2::SvBaseLink* pBase = *pLinkManager->GetLinks()[nLinkPos];
-if (rRange.isEmpty())
+if (!rRange.IsValid())
 {
 if ( (pBase->ISA(ScAreaLink) && static_cast
 (&(*pBase))->GetDestArea().aStart == aDestArea.aStart)
@@ -221,13 +220,25 @@ DataStream* DataStream::Set(ScDocShell *pShell, const 
OUString& rURL, const OUSt
 ++nLinkPos;
 }
 
-DataStream* pLink = new DataStream(pShell, rURL, aDestArea, nLimit, rMove, 
nSettings);
+DataStream* pLink = new DataStream(pShell, rURL, aDestArea, nLimit, eMove, 
nSettings);
 pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rURL, NULL, NULL 
);
 return pLink;
 }
 
+DataStream::MoveType DataStream::ToMoveType( const OUString& rMoveStr )
+{
+if (rMoveStr == "RANGE_DOWN")
+return RANGE_DOWN;
+if (rMoveStr == "MOVE_DOWN")
+return MOVE_DOWN;
+if (rMoveStr == "MOVE_UP")
+return MOVE_UP;
+
+return NO_MOVE; // default
+}
+
 DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const 
ScRange& rRange,
-sal_Int32 nLimit, const OUString& rMove, sal_uInt32 nSettings) :
+sal_Int32 nLimit, MoveType eMove, sal_uInt32 nSettings) :
 mpDocShell(pShell),
 mpDoc(mpDocShell->GetDocument()),
 maDocAccess(*mpDoc),
@@ -241,7 +252,7 @@ DataStream::DataStream(ScDocShell *pShell, c

LibreOffice Gerrit News for core on 2013-12-18

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things ! 
+ Convert chart data labels dialog to .ui
  in https://gerrit.libreoffice.org/7124 from Olivier Hallot
  about module chart2
+ Add basic multi-threading for each mimetype
  in https://gerrit.libreoffice.org/7123 from Joren De Cuyper
  about module bin
+ fix sw life cycle related crash in unittest
  in https://gerrit.libreoffice.org/7116 from Norbert Thiebaud
  about module sw
+ fdo#54938: Convert i18npool to use cppu::supportsService
  in https://gerrit.libreoffice.org/7109 from Marcos Souza
  about module i18npool
+ Revert code that push copy of 'rPr' inside 'pPr' in DOCX export
  in https://gerrit.libreoffice.org/7121 from Adam CloudOn
  about module sw
+ fdo#72790 Clear interop grab bag name, once grab bag is cleared. This fix
  in https://gerrit.libreoffice.org/7120 from Nikhil Walvekar
  about module writerfilter
+ convert OUString** in HtmlExport to std::vector
  in https://gerrit.libreoffice.org/7044 from Noel Grandin
  about module sd
+ Do not expose TXTNODE_MAX and cleanup related code/comments
  in https://gerrit.libreoffice.org/7105 from Matteo Casalin
  about module sw
+ fix previous commit
  in https://gerrit.libreoffice.org/7101 from Markus Mohrhard
  about module oox
+ Written Unit test case of chart export.
  in https://gerrit.libreoffice.org/7071 from Pallavi Jadhav
  about module chart2
+ CID#736173: Out-of-bound read
  in https://gerrit.libreoffice.org/6973 from Julien Nabet
  about module filter
+ move from ActionBarSherlock to corresponding android support lib
  in https://gerrit.libreoffice.org/7082 from Christian Lohmaier
  about module android
+ fdo#60698: Merge animcore into sd and slideshow
  in https://gerrit.libreoffice.org/7108 from Marcos Souza
  about module android, animations, build, chart2, include, ios, odk, 
postprocess, sd, slideshow
 End of freshness 



* Merged changes on master for project core changed in the last 25 hours:

+ vcl get rid of xub_StrLen and STRING_LEN in outdev3
  in https://gerrit.libreoffice.org/7117 from Norbert Thiebaud
+ gbuild: remove obsolete SOLARLIB
  in https://gerrit.libreoffice.org/6933 from Matúš Kukan
+ Bump curl version check to 7.19.4 in configure.ac
  in https://gerrit.libreoffice.org/7050 from Douglas Mencken
+ Add check for touch -h to configure.ac
  in https://gerrit.libreoffice.org/7046 from Douglas Mencken
+ Add OSX@PowerPC support to UNO/C++ bridge
  in https://gerrit.libreoffice.org/7072 from Douglas Mencken
+ fdo#72598 Remove SunStudio cruft from code base
  in https://gerrit.libreoffice.org/7104 from Jelle van der Waa
+ gbuild: Fix and check package dependencies.
  in https://gerrit.libreoffice.org/7081 from Matúš Kukan


* Abandoned changes on master for project core changed in the last 25 hours:

+ Revert code that push copy of 'rPr' inside 'pPr' in DOCX export
  in https://gerrit.libreoffice.org/7058 from Adam CloudOn


* Open changes needing tweaks, but being untouched for more than a week:

+ Double toolbar icon size for HiDPI screens.
  in https://gerrit.libreoffice.org/6994 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ Code clean-up/consolidation task.
  in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ fdo#71043 -  Use STACK lint tool to clean code
  in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz
+ new cell-border handling in calc
  in https://gerrit.libreoffice.org/6093 from Viktor Varga
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - comphelper/inc comphelper/source vcl/unx

[Herbert Dürr]

 comphelper/inc/comphelper/locale.hxx |   70 +--
 comphelper/source/misc/locale.cxx|   70 +--
 vcl/unx/generic/app/i18n_xkb.cxx |2 -
 3 files changed, 71 insertions(+), 71 deletions(-)

New commits:
commit 6f80044bc6371f22051f31628ecca7ee28695de3
Author: Herbert Dürr 
Date:   Wed Dec 18 05:49:02 2013 +

#i123859# avoid incomplete Locale class as return value

Some static Locale methods used the Locale class as return value type while 
it was
still incompletely defined. Most compilers allow this, but in general C++ 
doesn't
require them to do so. Using a const reference as return value solves this, 
improves
the C++ compliance and avoids unneeded copy constructions.

diff --git a/comphelper/inc/comphelper/locale.hxx 
b/comphelper/inc/comphelper/locale.hxx
index 5bc9d8a..e227720 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.hxx
@@ -64,41 +64,41 @@ class COMPHELPER_DLLPUBLIC Locale
 static const sal_Unicode SEPERATOR_CV_LINUX;
 
 /** @short some predefined Locale objects. */
-static const Locale EN_US();
-static const Locale EN();
-static const Locale DE_DE();
-static const Locale DE_CH();
-static const Locale DE_AT();
-static const Locale AR();
-static const Locale CA();
-static const Locale CS();
-static const Locale DA();
-static const Locale EL();
-static const Locale ES();
-static const Locale FI();
-static const Locale FR();
-static const Locale HE();
-static const Locale HI_IN();
-static const Locale HU();
-static const Locale IT();
-static const Locale JA();
-static const Locale KO();
-static const Locale NL();
-static const Locale PL();
-static const Locale PT();
-static const Locale PT_BR();
-static const Locale RU();
-static const Locale SK();
-static const Locale SL();
-static const Locale SV();
-static const Locale TH();
-static const Locale TR();
-static const Locale X_DEFAULT();
-static const Locale X_COMMENT();
-static const Locale X_TRANSLATE();
-static const Locale X_NOTRANSLATE();
-static const Locale ZH_CN();
-static const Locale ZH_TW();
+static const Locale& EN_US();
+static const Locale& EN();
+static const Locale& DE_DE();
+static const Locale& DE_CH();
+static const Locale& DE_AT();
+static const Locale& AR();
+static const Locale& CA();
+static const Locale& CS();
+static const Locale& DA();
+static const Locale& EL();
+static const Locale& ES();
+static const Locale& FI();
+static const Locale& FR();
+static const Locale& HE();
+static const Locale& HI_IN();
+static const Locale& HU();
+static const Locale& IT();
+static const Locale& JA();
+static const Locale& KO();
+static const Locale& NL();
+static const Locale& PL();
+static const Locale& PT();
+static const Locale& PT_BR();
+static const Locale& RU();
+static const Locale& SK();
+static const Locale& SL();
+static const Locale& SV();
+static const Locale& TH();
+static const Locale& TR();
+static const Locale& X_DEFAULT();
+static const Locale& X_COMMENT();
+static const Locale& X_TRANSLATE();
+static const Locale& X_NOTRANSLATE();
+static const Locale& ZH_CN();
+static const Locale& ZH_TW();
 
 //---
 // types
diff --git a/comphelper/source/misc/locale.cxx 
b/comphelper/source/misc/locale.cxx
index 301a430..bb98277 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -40,7 +40,7 @@ const sal_Unicode Locale::SEPERATOR_CV   = 
(sal_Unicode)'_';
 const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.';
 
 //---
-const Locale Locale::X_DEFAULT()
+const Locale& Locale::X_DEFAULT()
 {
 static Locale aLocale(
 ::rtl::OUString::createFromAscii("x"),
@@ -49,7 +49,7 @@ const Locale Locale::X_DEFAULT()
 }
 
 //---
-const Locale Locale::EN()
+const Locale& Locale::EN()
 {
 static Locale aLocale(
 ::rtl::OUString::createFromAscii("en"),
@@ -58,7 +58,7 @@ const Locale Locale::EN()
 }
 
 //---
-const Locale Locale::EN_US()
+const Locale& Locale::EN_US()
 {
 static Locale aLocale(
 ::rtl::OUString::createFromAscii("en"),
@@ -67,7 +67,7 @@ const Locale Locale::EN_US()
 }
 
 //---
-const Locale

[Libreoffice-commits] core.git: postprocess/CppunitTest_services.mk

[Matúš Kukan]

 postprocess/CppunitTest_services.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5888cb101f63d271870a7a392bb35b90a8461af0
Author: Matúš Kukan 
Date:   Wed Dec 18 07:24:06 2013 +0100

missing boost_headers external

Change-Id: Ib30dddbc1b105c89c5882f5f857dc20134eca7e6

diff --git a/postprocess/CppunitTest_services.mk 
b/postprocess/CppunitTest_services.mk
index f6da8f6..c80f251 100644
--- a/postprocess/CppunitTest_services.mk
+++ b/postprocess/CppunitTest_services.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,services, 
\
 postprocess/qa/services \
 ))
 
+$(eval $(call gb_CppunitTest_use_externals,services, \
+   boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_use_libraries,services, \
cppu \
sal \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits